Removing metadataPath parameter from SandboxService

Author: ajemory

Sources/ContainerResource/Container/Bundle.swift

@@ -19,6 +19,8 @@ import ContainerizationError
 import Foundation
 
 public struct BundleMetadata: Codable, Sendable {
+    static let bundleMetadataFileName = "bundle-metadata.json"
+
     public let path: URL
     public let initialFilesystem: Filesystem
     public let kernel: Kernel
@@ -41,6 +43,10 @@ public struct BundleMetadata: Codable, Sendable {
         self.containerRootFilesystem = containerRootFilesystem
         self.options = options
     }
+
+    public var bundleMetadataPath: URL {
+        self.path.appendingPathComponent(Self.bundleMetadataFileName)
+    }
 }
 
 public struct Bundle: Sendable {
@@ -156,18 +162,18 @@ extension Bundle {
     }
 
     public static func writeMetadata(
-        _ metadata: BundleMetadata,
-        to metadataPath: URL
+        _ metadata: BundleMetadata
     ) throws {
         // Ensure the parent directory exists
-        let directory = metadataPath.deletingLastPathComponent()
+        let directory = metadata.bundleMetadataPath.deletingLastPathComponent()
         try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
 
         let data = try JSONEncoder().encode(metadata)
-        try data.write(to: metadataPath)
+        try data.write(to: metadata.bundleMetadataPath)
     }
 
-    public static func readMetadata(from metadataPath: URL) throws -> BundleMetadata {
+    public static func readMetadata(from bundlePath: URL) throws -> BundleMetadata {
+        let metadataPath = bundlePath.appendingPathComponent(BundleMetadata.bundleMetadataFileName)
         guard FileManager.default.fileExists(atPath: metadataPath.path) else {
             throw ContainerizationError(
                 .notFound,

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

@@ -232,7 +232,6 @@ public actor ContainersService {
             }
 
             let path = self.containerRoot.appendingPathComponent(configuration.id)
-            let metadataPath = self.getMetadataPath(for: configuration.id, containerRoot: self.containerRoot)
             let systemPlatform = kernel.platform
             let initFs = try await self.getInitBlock(for: systemPlatform.ociPlatform())
 
@@ -249,7 +248,7 @@ public actor ContainersService {
                     options: options
                 )
 
-                try ContainerResource.Bundle.writeMetadata(completeMetadata, to: metadataPath)
+                try ContainerResource.Bundle.writeMetadata(completeMetadata)
 
                 let snapshot = ContainerSnapshot(
                     configuration: configuration,
@@ -279,7 +278,7 @@ public actor ContainersService {
             }
 
             let path = self.containerRoot.appendingPathComponent(id)
-            let config = try await self.getContainerConfiguration(for: id, at: path)
+            let config = try await self.getContainerConfiguration(at: path)
 
             do {
                 try Self.registerService(
@@ -705,18 +704,11 @@ public actor ContainersService {
         }
     }
 
-    /// Get metadata file path for the given container ID
-    private nonisolated func getMetadataPath(for containerID: String, containerRoot: URL) -> URL {
-        containerRoot.appendingPathComponent(containerID)
-            .appendingPathComponent("bundle-metadata.json")
-    }
-
     /// Get container configuration, either from existing bundle or from metadata
-    private func getContainerConfiguration(for id: String, at path: URL) async throws -> ContainerConfiguration {
+    private func getContainerConfiguration(at path: URL) async throws -> ContainerConfiguration {
         guard await bundleExists(at: path) else {
             // Bundle doesn't exist, get config from metadata
-            let metadataPath = self.getMetadataPath(for: id, containerRoot: self.containerRoot)
-            let metadata = try ContainerResource.Bundle.readMetadata(from: metadataPath)
+            let metadata = try ContainerResource.Bundle.readMetadata(from: path)
             guard let config = metadata.containerConfiguration else {
                 throw ContainerizationError(.internalError, message: "Metadata missing container configuration")
             }

Sources/Services/ContainerSandboxService/Server/SandboxService.swift

@@ -39,7 +39,6 @@ import struct ContainerizationOCI.Process
 public actor SandboxService {
     private let connection: xpc_connection_t
     private let root: URL
-    private let metadataPath: URL?
     private let interfaceStrategy: InterfaceStrategy
     private var container: ContainerInfo?
     private let monitor: ExitMonitor
@@ -63,14 +62,12 @@ public actor SandboxService {
 
     public init(
         root: URL,
-        metadataPath: URL? = nil,
         interfaceStrategy: InterfaceStrategy,
         eventLoopGroup: any EventLoopGroup,
         connection: xpc_connection_t,
         log: Logger
     ) {
         self.root = root
-        self.metadataPath = metadataPath ?? root.appendingPathComponent("bundle-metadata.json")
         self.interfaceStrategy = interfaceStrategy
         self.log = log
         self.monitor = ExitMonitor(log: log)
@@ -1320,12 +1317,8 @@ extension SandboxService {
 
     /// Create bundle from metadata
     private func createBundle() throws {
-        guard let metadataPath = self.metadataPath else {
-            throw ContainerizationError(.internalError, message: "No metadata path provided for bundle creation")
-        }
-
         do {
-            let metadata = try ContainerResource.Bundle.readMetadata(from: metadataPath)
+            let metadata = try ContainerResource.Bundle.readMetadata(from: self.root)
             _ = try ContainerResource.Bundle.createFromMetadata(metadata)
             self.log.info("Created bundle from metadata at \(metadata.path)")
             // Could remove the metadata file at this point, but will be

Tests/ContainerResourceTests/BundleMetadataTests.swift

@@ -43,11 +43,9 @@ struct BundleMetadataTests {
     func testMetadataReadWrite() throws {
         let tempDir = FileManager.default.temporaryDirectory
         let bundlePath = tempDir.appendingPathComponent("test-bundle-\(UUID())")
-        let metadataPath = tempDir.appendingPathComponent("test-metadata-\(UUID()).json")
 
         defer {
             try? FileManager.default.removeItem(at: bundlePath)
-            try? FileManager.default.removeItem(at: metadataPath)
         }
 
         let initFs = Filesystem.virtiofs(
@@ -70,8 +68,13 @@ struct BundleMetadataTests {
             options: nil
         )
 
-        try ContainerResource.Bundle.writeMetadata(metadata, to: metadataPath)
-        let readMetadata = try ContainerResource.Bundle.readMetadata(from: metadataPath)
+        try ContainerResource.Bundle.writeMetadata(metadata)
+
+        defer {
+            try? FileManager.default.removeItem(at: metadata.bundleMetadataPath)
+        }
+
+        let readMetadata = try ContainerResource.Bundle.readMetadata(from: bundlePath)
 
         #expect(
             readMetadata.path == bundlePath,