Expose Command Structs for Plugins

Package.swift

@@ -33,6 +33,7 @@ let package = Package(
         .library(name: "ContainerSandboxService", targets: ["ContainerSandboxService"]),
         .library(name: "ContainerNetworkService", targets: ["ContainerNetworkService"]),
         .library(name: "ContainerImagesService", targets: ["ContainerImagesService", "ContainerImagesServiceClient"]),
+        .library(name: "ContainerCommands", targets: ["ContainerCommands"]),
         .library(name: "ContainerClient", targets: ["ContainerClient"]),
         .library(name: "ContainerBuild", targets: ["ContainerBuild"]),
         .library(name: "ContainerLog", targets: ["ContainerLog"]),
@@ -65,6 +66,15 @@ let package = Package(
     targets: [
         .executableTarget(
             name: "container",
+            dependencies: [
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                "ContainerClient",
+                "ContainerCommands",
+            ],
+            path: "Sources/ExecutableCLI"
+        ),
+        .target(
+            name: "ContainerCommands",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "Logging", package: "swift-log"),

Sources/CLI/Application.swift

@@ -35,12 +35,13 @@ nonisolated(unsafe) var log = {
     return log
 }()
 
-@main
-struct Application: AsyncParsableCommand {
+public struct Application: AsyncParsableCommand {
     @OptionGroup
     var global: Flags.Global
 
-    static let configuration = CommandConfiguration(
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "container",
         abstract: "A container platform for macOS",
         version: ReleaseVersion.singleLine(appName: "container CLI"),
@@ -126,7 +127,7 @@ struct Application: AsyncParsableCommand {
         }
     }
 
-    static func createPluginLoader() async throws -> PluginLoader {
+    public static func createPluginLoader() async throws -> PluginLoader {
         let installRoot = CommandLine.executablePathUrl
             .deletingLastPathComponent()
             .appendingPathComponent("..")
@@ -170,7 +171,7 @@ struct Application: AsyncParsableCommand {
         )
     }
 
-    static func handleProcess(io: ProcessIO, process: ClientProcess) async throws -> Int32 {
+    public static func handleProcess(io: ProcessIO, process: ClientProcess) async throws -> Int32 {
         let signals = AsyncSignalHandler.create(notify: Application.signalSet)
         return try await withThrowingTaskGroup(of: Int32?.self, returning: Int32.self) { group in
             let waitAdded = group.addTaskUnlessCancelled {
@@ -242,7 +243,7 @@ struct Application: AsyncParsableCommand {
         }
     }
 
-    func validate() throws {
+    public func validate() throws {
         // Not really a "validation", but a cheat to run this before
         // any of the commands do their business.
         let debugEnvVar = ProcessInfo.processInfo.environment["CONTAINER_DEBUG"]
@@ -308,7 +309,7 @@ extension Application {
         print(altered)
     }
 
-    enum ListFormat: String, CaseIterable, ExpressibleByArgument {
+    public enum ListFormat: String, CaseIterable, ExpressibleByArgument {
         case json
         case table
     }

Sources/CLI/BuildCommand.swift

@@ -27,7 +27,8 @@ import NIO
 import TerminalProgress
 
 extension Application {
-    struct BuildCommand: AsyncParsableCommand {
+    public struct BuildCommand: AsyncParsableCommand {
+        public init() {}
         public static var configuration: CommandConfiguration {
             var config = CommandConfiguration()
             config.commandName = "build"
@@ -38,7 +39,7 @@ extension Application {
         }
 
         @Option(name: [.customLong("cpus"), .customShort("c")], help: "Number of CPUs to allocate to the container")
-        public var cpus: Int64 = 2
+        var cpus: Int64 = 2
 
         @Option(
             name: [.customLong("memory"), .customShort("m")],
@@ -117,7 +118,7 @@ extension Application {
         @Flag(name: .shortAndLong, help: "Suppress build output")
         var quiet: Bool = false
 
-        func run() async throws {
+        public func run() async throws {
             do {
                 let timeout: Duration = .seconds(300)
                 let progressConfig = try ProgressConfig(
@@ -132,16 +133,16 @@ extension Application {
 
                 progress.set(description: "Dialing builder")
 
-                let builder: Builder? = try await withThrowingTaskGroup(of: Builder.self) { group in
+                let builder: Builder? = try await withThrowingTaskGroup(of: Builder.self) { [vsockPort, cpus, memory] group in
                     defer {
                         group.cancelAll()
                     }
 
-                    group.addTask {
+                    group.addTask { [vsockPort, cpus, memory] in
                         while true {
                             do {
                                 let container = try await ClientContainer.get(id: "buildkit")
-                                let fh = try await container.dial(self.vsockPort)
+                                let fh = try await container.dial(vsockPort)
 
                                 let threadGroup: MultiThreadedEventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: System.coreCount)
                                 let b = try Builder(socket: fh, group: threadGroup)
@@ -156,8 +157,8 @@ extension Application {
                                 progress.set(totalTasks: 3)
 
                                 try await BuilderStart.start(
-                                    cpus: self.cpus,
-                                    memory: self.memory,
+                                    cpus: cpus,
+                                    memory: memory,
                                     progressUpdate: progress.handler
                                 )
 
@@ -255,7 +256,7 @@ extension Application {
                         }
                         return results
                     }()
-                    group.addTask { [terminal] in
+                    group.addTask { [terminal, buildArg, contextDir, label, noCache, target, quiet, cacheIn, cacheOut] in
                         let config = ContainerBuild.Builder.BuildConfig(
                             buildID: buildID,
                             contentStore: RemoteContentStoreClient(),
@@ -341,7 +342,7 @@ extension Application {
             }
         }
 
-        func validate() throws {
+        public func validate() throws {
             guard FileManager.default.fileExists(atPath: file) else {
                 throw ValidationError("Dockerfile does not exist at path: \(file)")
             }

Sources/CLI/Builder/Builder.swift

@@ -17,8 +17,10 @@
 import ArgumentParser
 
 extension Application {
-    struct BuilderCommand: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct BuilderCommand: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "builder",
             abstract: "Manage an image builder instance",
             subcommands: [

Sources/CLI/Builder/BuilderDelete.swift

@@ -20,7 +20,9 @@ import ContainerizationError
 import Foundation
 
 extension Application {
-    struct BuilderDelete: AsyncParsableCommand {
+    public struct BuilderDelete: AsyncParsableCommand {
+        public init() {}
+
         public static var configuration: CommandConfiguration {
             var config = CommandConfiguration()
             config.commandName = "delete"
@@ -35,7 +37,7 @@ extension Application {
         @Flag(name: .shortAndLong, help: "Force delete builder even if it is running")
         var force = false
 
-        func run() async throws {
+        public func run() async throws {
             do {
                 let container = try await ClientContainer.get(id: "buildkit")
                 if container.status != .stopped {

Sources/CLI/Builder/BuilderStart.swift

@@ -27,7 +27,9 @@ import Foundation
 import TerminalProgress
 
 extension Application {
-    struct BuilderStart: AsyncParsableCommand {
+    public struct BuilderStart: AsyncParsableCommand {
+        public init() {}
+
         public static var configuration: CommandConfiguration {
             var config = CommandConfiguration()
             config.commandName = "start"
@@ -39,16 +41,16 @@ extension Application {
         }
 
         @Option(name: [.customLong("cpus"), .customShort("c")], help: "Number of CPUs to allocate to the container")
-        public var cpus: Int64 = 2
+        var cpus: Int64 = 2
 
         @Option(
             name: [.customLong("memory"), .customShort("m")],
             help:
                 "Amount of memory in bytes, kilobytes (K), megabytes (M), or gigabytes (G) for the container, with MB granularity (for example, 1024K will result in 1MB being allocated for the container)"
         )
-        public var memory: String = "2048MB"
+        var memory: String = "2048MB"
 
-        func run() async throws {
+        public func run() async throws {
             let progressConfig = try ProgressConfig(
                 showTasks: true,
                 showItems: true,

Sources/CLI/Builder/BuilderStatus.swift

@@ -20,7 +20,9 @@ import ContainerizationError
 import Foundation
 
 extension Application {
-    struct BuilderStatus: AsyncParsableCommand {
+    public struct BuilderStatus: AsyncParsableCommand {
+        public init() {}
+
         public static var configuration: CommandConfiguration {
             var config = CommandConfiguration()
             config.commandName = "status"
@@ -34,7 +36,7 @@ extension Application {
         @Flag(name: .long, help: ArgumentHelp("Display detailed status in json format"))
         var json: Bool = false
 
-        func run() async throws {
+        public func run() async throws {
             do {
                 let container = try await ClientContainer.get(id: "buildkit")
                 if json {

Sources/CLI/Builder/BuilderStop.swift

@@ -20,7 +20,9 @@ import ContainerizationError
 import Foundation
 
 extension Application {
-    struct BuilderStop: AsyncParsableCommand {
+    public struct BuilderStop: AsyncParsableCommand {
+        public init() {}
+
         public static var configuration: CommandConfiguration {
             var config = CommandConfiguration()
             config.commandName = "stop"
@@ -31,7 +33,7 @@ extension Application {
             return config
         }
 
-        func run() async throws {
+        public func run() async throws {
             do {
                 let container = try await ClientContainer.get(id: "buildkit")
                 try await container.stop()

Sources/CLI/Container/ContainerCreate.swift

@@ -21,8 +21,10 @@ import Foundation
 import TerminalProgress
 
 extension Application {
-    struct ContainerCreate: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct ContainerCreate: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "create",
             abstract: "Create a new container")
 
@@ -47,7 +49,7 @@ extension Application {
         @OptionGroup
         var global: Flags.Global
 
-        func run() async throws {
+        public func run() async throws {
             let progressConfig = try ProgressConfig(
                 showTasks: true,
                 showItems: true,

Sources/CLI/Container/ContainerDelete.swift

@@ -20,8 +20,10 @@ import ContainerizationError
 import Foundation
 
 extension Application {
-    struct ContainerDelete: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct ContainerDelete: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "delete",
             abstract: "Delete one or more containers",
             aliases: ["rm"])
@@ -38,7 +40,7 @@ extension Application {
         @Argument(help: "Container IDs/names")
         var containerIDs: [String] = []
 
-        func validate() throws {
+        public func validate() throws {
             if containerIDs.count == 0 && !all {
                 throw ContainerizationError(.invalidArgument, message: "no containers specified and --all not supplied")
             }
@@ -50,7 +52,7 @@ extension Application {
             }
         }
 
-        mutating func run() async throws {
+        public mutating func run() async throws {
             let set = Set<String>(containerIDs)
             var containers = [ClientContainer]()
 

Sources/CLI/Container/ContainerExec.swift

@@ -21,8 +21,10 @@ import ContainerizationOS
 import Foundation
 
 extension Application {
-    struct ContainerExec: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct ContainerExec: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "exec",
             abstract: "Run a new command in a running container")
 
@@ -38,7 +40,7 @@ extension Application {
         @Argument(parsing: .captureForPassthrough, help: "New process arguments")
         var arguments: [String]
 
-        func run() async throws {
+        public func run() async throws {
             var exitCode: Int32 = 127
             let container = try await ClientContainer.get(id: containerID)
             try ensureRunning(container: container)

Sources/CLI/Container/ContainerInspect.swift

@@ -20,8 +20,10 @@ import Foundation
 import SwiftProtobuf
 
 extension Application {
-    struct ContainerInspect: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct ContainerInspect: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "inspect",
             abstract: "Display information about one or more containers")
 
@@ -31,7 +33,7 @@ extension Application {
         @Argument(help: "Containers to inspect")
         var containers: [String]
 
-        func run() async throws {
+        public func run() async throws {
             let objects: [any Codable] = try await ClientContainer.list().filter {
                 containers.contains($0.id)
             }.map {

Sources/CLI/Container/ContainerKill.swift

@@ -21,8 +21,10 @@ import ContainerizationOS
 import Darwin
 
 extension Application {
-    struct ContainerKill: AsyncParsableCommand {
-        static let configuration = CommandConfiguration(
+    public struct ContainerKill: AsyncParsableCommand {
+        public init() {}
+
+        public static let configuration = CommandConfiguration(
             commandName: "kill",
             abstract: "Kill one or more running containers")
 
@@ -38,7 +40,7 @@ extension Application {
         @OptionGroup
         var global: Flags.Global
 
-        func validate() throws {
+        public func validate() throws {
             if containerIDs.count == 0 && !all {
                 throw ContainerizationError(.invalidArgument, message: "no containers specified and --all not supplied")
             }
@@ -47,7 +49,7 @@ extension Application {
             }
         }
 
-        mutating func run() async throws {
+        public mutating func run() async throws {
             let set = Set<String>(containerIDs)
 
             var containers = try await ClientContainer.list().filter { c in