Update allocations in Allocator (#264)

The `allocations` property in the nested `Allocator` structure wasn't
updated. This PR resolves the problem by using mutating methods and
keeping the original types as structs.

Author: dkovba

Sources/Containerization/ContainerManager.swift

@@ -29,22 +29,22 @@ import vmnet
 public struct ContainerManager: Sendable {
     public let imageStore: ImageStore
     private let vmm: VirtualMachineManager
-    private let network: Network?
+    private var network: Network?
 
     private var containerRoot: URL {
         self.imageStore.path.appendingPathComponent("containers")
     }
 
     /// A network that can allocate and release interfaces for use with containers.
     public protocol Network: Sendable {
-        func create(_ id: String) throws -> Interface?
-        func release(_ id: String) throws
+        mutating func create(_ id: String) throws -> Interface?
+        mutating func release(_ id: String) throws
     }
 
     /// A network backed by vmnet on macOS.
     @available(macOS 26.0, *)
     public struct VmnetNetwork: Network {
-        private let allocator: Allocator
+        private var allocator: Allocator
         nonisolated(unsafe) private let reference: vmnet_network_ref
 
         /// The IPv4 subnet of this network.
@@ -70,18 +70,20 @@ public struct ContainerManager: Sendable {
                 )
             }
 
-            func allocate(_ id: String) throws -> String {
+            mutating func allocate(_ id: String) throws -> String {
                 if allocations[id] != nil {
                     throw ContainerizationError(.exists, message: "allocation with id \(id) already exists")
                 }
                 let index = try addressAllocator.allocate()
+                allocations[id] = index
                 let ip = IPv4Address(fromValue: index)
                 return try CIDRAddress(ip, prefixLength: cidr.prefixLength).description
             }
 
-            func release(_ id: String) throws {
+            mutating func release(_ id: String) throws {
                 if let index = self.allocations[id] {
                     try addressAllocator.release(index)
+                    allocations.removeValue(forKey: id)
                 }
             }
         }
@@ -147,7 +149,7 @@ public struct ContainerManager: Sendable {
 
         /// Returns a new interface for use with a container.
         /// - Parameter id: The container ID.
-        public func create(_ id: String) throws -> Containerization.Interface? {
+        public mutating func create(_ id: String) throws -> Containerization.Interface? {
             let address = try allocator.allocate(id)
             return Self.Interface(
                 reference: self.reference,
@@ -158,7 +160,7 @@ public struct ContainerManager: Sendable {
 
         /// Performs cleanup of an interface.
         /// - Parameter id: The container ID.
-        public func release(_ id: String) throws {
+        public mutating func release(_ id: String) throws {
             try allocator.release(id)
         }
 
@@ -332,7 +334,7 @@ public struct ContainerManager: Sendable {
     ///   - id: The container ID.
     ///   - reference: The image reference.
     ///   - rootfsSizeInBytes: The size of the root filesystem in bytes. Defaults to 8 GiB.
-    public func create(
+    public mutating func create(
         _ id: String,
         reference: String,
         rootfsSizeInBytes: UInt64 = 8.gib(),
@@ -352,7 +354,7 @@ public struct ContainerManager: Sendable {
     ///   - id: The container ID.
     ///   - image: The image.
     ///   - rootfsSizeInBytes: The size of the root filesystem in bytes. Defaults to 8 GiB.
-    public func create(
+    public mutating func create(
         _ id: String,
         image: Image,
         rootfsSizeInBytes: UInt64 = 8.gib(),
@@ -378,7 +380,7 @@ public struct ContainerManager: Sendable {
     ///   - id: The container ID.
     ///   - image: The image.
     ///   - rootfs: The root filesystem mount pointing to an existing block file.
-    public func create(
+    public mutating func create(
         _ id: String,
         image: Image,
         rootfs: Mount,
@@ -405,7 +407,7 @@ public struct ContainerManager: Sendable {
     /// - Parameters:
     ///   - id: The container ID.
     ///   - image: The image.
-    public func get(
+    public mutating func get(
         _ id: String,
         image: Image,
     ) async throws -> LinuxContainer {
@@ -439,7 +441,7 @@ public struct ContainerManager: Sendable {
 
     /// Performs the cleanup of a container.
     /// - Parameter id: The container ID.
-    public func delete(_ id: String) throws {
+    public mutating func delete(_ id: String) throws {
         try self.network?.release(id)
         let path = containerRoot.appendingPathComponent(id)
         try FileManager.default.removeItem(at: path)

Sources/Integration/VMTests.swift

@@ -172,7 +172,7 @@ extension IntegrationSuite {
         let bs = try await bootstrap()
 
         // Create ContainerManager with kernel and initfs reference
-        let manager = try ContainerManager(vmm: bs.vmm)
+        var manager = try ContainerManager(vmm: bs.vmm)
         defer {
             try? manager.delete(id)
         }
@@ -213,7 +213,7 @@ extension IntegrationSuite {
         let bs = try await bootstrap()
 
         // Create ContainerManager with kernel and initfs reference
-        let manager = try ContainerManager(vmm: bs.vmm)
+        var manager = try ContainerManager(vmm: bs.vmm)
         defer {
             try? manager.delete(id)
         }
@@ -262,7 +262,7 @@ extension IntegrationSuite {
 
         let bs = try await bootstrap()
 
-        let manager = try ContainerManager(vmm: bs.vmm)
+        var manager = try ContainerManager(vmm: bs.vmm)
         defer {
             try? manager.delete(id)
         }

Sources/cctl/RunCommand.swift

@@ -76,7 +76,7 @@ extension Application {
                 path: URL(fileURLWithPath: kernel),
                 platform: .linuxArm
             )
-            let manager = try await ContainerManager(
+            var manager = try await ContainerManager(
                 kernel: kernel,
                 initfsReference: "vminit:latest",
             )