Deps: Bump CZ to 0.32.0 (apple#1498)

Signals changed from being raw ints to a new Signal type.

Author: dcantah

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.12.0"
-let scVersion = "0.31.0"
+let scVersion = "0.32.0"
 
 let package = Package(
     name: "container",

Package.swift

@@ -17,6 +17,7 @@
 import ArgumentParser
 import ContainerAPIClient
 import ContainerResource
+import Containerization
 import ContainerizationError
 import ContainerizationOS
 import Darwin
@@ -60,7 +61,7 @@ extension Application {
                 containers = containerIds
             }
 
-            let signalNumber = try Signals.parseSignal(signal)
+            let signalNumber = try Signal(signal).rawValue
 
             var errors: [any Error] = []
             for container in containers {

Sources/ContainerCommands/Container/ContainerKill.swift

@@ -17,6 +17,7 @@
 import ArgumentParser
 import ContainerAPIClient
 import ContainerResource
+import Containerization
 import ContainerizationError
 import ContainerizationOS
 import Foundation
@@ -67,7 +68,7 @@ extension Application {
 
             let opts = ContainerStopOptions(
                 timeoutInSeconds: self.time,
-                signal: try Signals.parseSignal(self.signal)
+                signal: try Signal(self.signal).rawValue
             )
             try await Self.stopContainers(
                 client: client,

Sources/ContainerCommands/Container/ContainerStop.swift

@@ -18,6 +18,7 @@ import ArgumentParser
 import ContainerAPIClient
 import ContainerPlugin
 import ContainerResource
+import Containerization
 import ContainerizationOS
 import Foundation
 import Logging
@@ -65,7 +66,7 @@ extension Application {
                 log.info("stopping containers", metadata: ["stopTimeoutSeconds": "\(Self.stopTimeoutSeconds)"])
                 do {
                     let containers = try await client.list().map { $0.id }
-                    let signal = try Signals.parseSignal("SIGTERM")
+                    let signal = Signal.term.rawValue
                     let opts = ContainerStopOptions(timeoutInSeconds: Self.stopTimeoutSeconds, signal: signal)
                     try await ContainerStop.stopContainers(
                         client: client,

Sources/ContainerCommands/System/SystemStop.swift

@@ -541,12 +541,12 @@ public actor SandboxService {
                     guard let proc = processInfo.process else {
                         throw ContainerizationError(.invalidState, message: "process \(id) not started")
                     }
-                    try await proc.kill(Int32(try message.signal()))
+                    try await proc.kill(Signal(rawValue: Int32(try message.signal())))
                     return message.reply()
                 }
 
                 // TODO: fix underlying signal value to int64
-                try await ctr.container.kill(Int32(try message.signal()))
+                try await ctr.container.kill(Signal(rawValue: Int32(try message.signal())))
                 return message.reply()
             default:
                 throw ContainerizationError(
@@ -1095,9 +1095,9 @@ public actor SandboxService {
                     try await lc.wait()
                 }
                 group.addTask {
-                    try await lc.kill(stopOpts.signal)
+                    try await lc.kill(Signal(rawValue: stopOpts.signal))
                     try await Task.sleep(for: .seconds(stopOpts.timeoutInSeconds))
-                    try await lc.kill(SIGKILL)
+                    try await lc.kill(.kill)
 
                     return ExitStatus(exitCode: 137)
                 }