Add TestCLIExport

Author: JaewonHur

Sources/ContainerCommands/Container/ContainerExport.swift

@@ -33,11 +33,11 @@ extension Application {
         @OptionGroup
         public var logOptions: Flags.Logging
 
-        @Option(name: .long, help: "container ID")
-        var name: String
+        @Option(name: .long, help: "image name")
+        var image: String?
 
-        @Argument(help: "image name")
-        var image: String
+        @Argument(help: "container ID")
+        var name: String
 
         public func run() async throws {
             let client = ContainerClient()
@@ -48,6 +48,8 @@ extension Application {
                 try? FileManager.default.removeItem(at: tempDir)
             }
 
+            let imageName = image ?? name
+
             let archive = tempDir.appendingPathComponent("archive.tar")
             try await client.export(id: name, archive: archive)
 
@@ -57,7 +59,7 @@ extension Application {
                 """
             try dockerfile.data(using: .utf8)!.write(to: tempDir.appendingPathComponent("Dockerfile"), options: .atomic)
 
-            let builder = try BuildCommand.parse(["-t", image, tempDir.absolutePath()])
+            let builder = try BuildCommand.parse(["-t", imageName, tempDir.absolutePath()])
 
             try await builder.run()
         }

Tests/CLITests/Subcommands/Containers/TestCLIExport.swift

@@ -0,0 +1,50 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2026 Apple Inc. and the container project authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+import Foundation
+import Testing
+
+class TestCLIExportCommand: CLITest {
+    private func getTestName() -> String {
+        Test.current!.name.trimmingCharacters(in: ["(", ")"]).lowercased()
+    }
+
+    @Test func testExportCommand() throws {
+        let name = getTestName()
+        try doLongRun(name: name, autoRemove: false)
+        defer {
+            try? doRemove(name: name)
+        }
+
+        let mustBeInImage = "must-be-in-image"
+        _ = try doExec(name: name, cmd: ["sh", "-c", "echo \(mustBeInImage) > /foo"])
+
+        try doStop(name: name)
+        try doExport(name: name, image: name)
+        defer {
+            try? doRemoveImages(images: [name])
+        }
+
+        let exported = "\(name)-from-exported"
+        try doLongRun(name: exported, image: name)
+        defer {
+            try? doStop(name: exported)
+        }
+
+        let foo = try doExec(name: exported, cmd: ["cat", "/foo"])
+        #expect(foo == mustBeInImage + "\n")
+    }
+}

Tests/CLITests/Utilities/CLITest.swift

@@ -583,4 +583,16 @@ class CLITest {
             .filter { (key, val) in proxyVars.contains(key) }
             .flatMap { (key, val) in ["-e", "\(key)=\(val)"] }
     }
+
+    func doExport(name: String, image: String) throws {
+        let (_, _, error, status) = try run(arguments: [
+            "export",
+            "--image",
+            image,
+            name,
+        ])
+        if status != 0 {
+            throw CLIError.executionFailed("command failed: \(error)")
+        }
+    }
 }