[deps]: bump containerization to 0.25.0 (#1161)

Co-authored-by: saehejkang <saehej.kang@gmail.com>
Co-authored-by: Anthony DePasquale <anthony@depasquale.org>

- Bump `containerization` to `0.25.0`
- Updates for parameter changes on containerization
  registry access API.
- Updates for change to containerization
  `cleanUpOrphanedBlobs` function.

Author: saehejkang

Package.resolved

@@ -23,7 +23,7 @@ import PackageDescription
 let releaseVersion = ProcessInfo.processInfo.environment["RELEASE_VERSION"] ?? "0.0.0"
 let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
 let builderShimVersion = "0.7.0"
-let scVersion = "0.24.5"
+let scVersion = "0.25.0"
 
 let package = Package(
     name: "container",

Package.swift

@@ -69,7 +69,7 @@ extension Application {
                     failures.append(image.reference)
                 }
             }
-            let (_, size) = try await ClientImage.cleanupOrphanedBlobs()
+            let (_, size) = try await ClientImage.cleanUpOrphanedBlobs()
             let formatter = ByteCountFormatter()
             let freed = formatter.string(fromByteCount: Int64(size))
 

Sources/ContainerCommands/Image/ImageDelete.swift

@@ -65,7 +65,7 @@ extension Application {
                 }
             }
 
-            let (deletedDigests, size) = try await ClientImage.cleanupOrphanedBlobs()
+            let (deletedDigests, size) = try await ClientImage.cleanUpOrphanedBlobs()
 
             for image in imagesToPrune {
                 print("untagged \(image.reference)")

Sources/ContainerCommands/Image/ImagePrune.swift

@@ -56,9 +56,9 @@ extension Application {
                 }
                 password = String(decoding: passwordData, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
             }
-            let keychain = KeychainHelper(id: Constants.keychainID)
+            let keychain = KeychainHelper(securityDomain: Constants.keychainID)
             if username == "" {
-                username = try keychain.userPrompt(domain: server)
+                username = try keychain.userPrompt(hostname: server)
             }
             if password == "" {
                 password = try keychain.passwordPrompt()
@@ -89,7 +89,7 @@ extension Application {
                 )
             )
             try await client.ping()
-            try keychain.save(domain: server, username: username, password: password)
+            try keychain.save(hostname: server, username: username, password: password)
             print("Login succeeded")
         }
     }

Sources/ContainerCommands/Registry/Login.swift

@@ -32,9 +32,9 @@ extension Application {
         var registry: String
 
         public func run() async throws {
-            let keychain = KeychainHelper(id: Constants.keychainID)
+            let keychain = KeychainHelper(securityDomain: Constants.keychainID)
             let r = Reference.resolveDomain(domain: registry)
-            try keychain.delete(domain: r)
+            try keychain.delete(hostname: r)
         }
     }
 }

Sources/ContainerCommands/Registry/Logout.swift

@@ -96,7 +96,7 @@ extension ImagesHelper {
             routes[ImagesServiceXPCRoute.imageSave.rawValue] = harness.save
             routes[ImagesServiceXPCRoute.imageLoad.rawValue] = harness.load
             routes[ImagesServiceXPCRoute.imageUnpack.rawValue] = harness.unpack
-            routes[ImagesServiceXPCRoute.imageCleanupOrphanedBlobs.rawValue] = harness.cleanupOrphanedBlobs
+            routes[ImagesServiceXPCRoute.imageCleanupOrphanedBlobs.rawValue] = harness.cleanUpOrphanedBlobs
             routes[ImagesServiceXPCRoute.imageDiskUsage.rawValue] = harness.calculateDiskUsage
             routes[ImagesServiceXPCRoute.snapshotDelete.rawValue] = harness.deleteSnapshot
             routes[ImagesServiceXPCRoute.snapshotGet.rawValue] = harness.getSnapshot

Sources/Helpers/Images/ImagesHelper.swift

@@ -321,7 +321,7 @@ extension ClientImage {
         return ImageLoadResult(images: images, rejectedMembers: rejectedMembers)
     }
 
-    public static func cleanupOrphanedBlobs() async throws -> ([String], UInt64) {
+    public static func cleanUpOrphanedBlobs() async throws -> ([String], UInt64) {
         let client = newXPCClient()
         let request = newRequest(.imageCleanupOrphanedBlobs)
         let response = try await client.send(request)

Sources/Services/ContainerAPIService/Client/ClientImage.swift

@@ -493,7 +493,7 @@ public actor ContainersService {
             let client = try state.getClient()
             try await client.stop(options: opts)
             try await self.lock.withLock { context in
-                try await self.cleanup(id: id, context: context)
+                try await self.cleanUp(id: id, context: context)
             }
         case .stopping:
             throw ContainerizationError(
@@ -502,7 +502,7 @@ public actor ContainersService {
             )
         default:
             try await self.lock.withLock { context in
-                try await self.cleanup(id: id, context: context)
+                try await self.cleanUp(id: id, context: context)
             }
         }
     }
@@ -578,15 +578,15 @@ public actor ContainersService {
 
         let options = try getContainerCreationOptions(id: id)
         if options.autoRemove {
-            try await self.cleanup(id: id, context: context)
+            try await self.cleanUp(id: id, context: context)
         }
     }
 
     private static func fullLaunchdServiceLabel(runtimeName: String, instanceId: String) -> String {
         "\(Self.launchdDomainString)/\(Self.machServicePrefix).\(runtimeName).\(instanceId)"
     }
 
-    private func _cleanup(id: String) async throws {
+    private func _cleanUp(id: String) async throws {
         self.log.debug("\(#function)")
 
         // Did the exit container handler win?
@@ -611,8 +611,8 @@ public actor ContainersService {
         self.containers.removeValue(forKey: id)
     }
 
-    private func cleanup(id: String, context: AsyncLock.Context) async throws {
-        try await self._cleanup(id: id)
+    private func cleanUp(id: String, context: AsyncLock.Context) async throws {
+        try await self._cleanUp(id: id)
     }
 
     private func getContainerCreationOptions(id: String) throws -> ContainerCreateOptions {

Sources/Services/ContainerAPIService/Server/Containers/ContainersService.swift

@@ -128,10 +128,10 @@ public actor ImagesService {
         return (images, rejectedMembers)
     }
 
-    public func cleanupOrphanedBlobs() async throws -> ([String], UInt64) {
+    public func cleanUpOrphanedBlobs() async throws -> ([String], UInt64) {
         let images = try await self._list()
         let freedSnapshotBytes = try await self.snapshotStore.clean(keepingSnapshotsFor: images)
-        let (deleted, freedContentBytes) = try await self.imageStore.cleanupOrphanedBlobs()
+        let (deleted, freedContentBytes) = try await self.imageStore.cleanUpOrphanedBlobs()
         return (deleted, freedContentBytes + freedSnapshotBytes)
     }
 
@@ -223,9 +223,9 @@ extension ImagesService {
         if let authentication {
             return try await body(authentication)
         }
-        let keychain = KeychainHelper(id: Constants.keychainID)
+        let keychain = KeychainHelper(securityDomain: Constants.keychainID)
         do {
-            authentication = try keychain.lookup(domain: host)
+            authentication = try keychain.lookup(hostname: host)
         } catch let err as KeychainHelper.Error {
             guard case .keyNotFound = err else {
                 throw ContainerizationError(.internalError, message: "error querying keychain for \(host)", cause: err)