Files
container/Tests/CLITests/Subcommands/System/TestKernelSet.swift
T
J Logan 356c8d2f88 Reorganize client libraries. (#1020)
- Closes #461.
- Extract core types into ContainerResources target.
- Extract ContainerNetworkServiceClient from ContainerNetworkService.
- Relocate sandbox client from ContainerClient to
ContainerSandboxServiceClient.
- Relocate ContainerClient to ContainerAPIServiceClient.
- Common structure from services and clients under Source/Services.

Updated project hierarchy:

```
Sources/CAuditToken - audit token access wrapper
Sources/CLI - CLI executable
Sources/ContainerBuild - builder
Sources/ContainerCommands - CLI command implementations
Sources/ContainerLog - logging helpers
Sources/ContainerPersistence - persistent data and system property helpers
Sources/ContainerPlugin - plugin system
Sources/ContainerResource - resource (container, image, volume, network) types
Sources/ContainerVersion - version helpers
Sources/ContainerXPC - XPC helpers
Sources/CVersion - injected project version
Sources/DNSServer - container DNS resolver
Sources/Helpers - service executables
Sources/Services/*/Client - service clients
Sources/Services/*/Server - service implementations
Sources/SocketForwarder - port forwarding
Sources/TerminalProgress - progress bar
```

## Type of Change
- [ ] Bug fix
- [ ] New feature  
- [x] Breaking change
- [ ] Documentation update

## Motivation and Context
The ContainerClient library was a bit of a grab bag. This refactor
applies a more sensible project and library structure for resource data
types, services, and clients.

## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
2026-01-06 08:27:14 -08:00

133 lines
4.6 KiB
Swift

//===----------------------------------------------------------------------===//
// Copyright © 2025-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 ContainerAPIClient
import ContainerPersistence
import ContainerizationArchive
import Foundation
import Testing
// This suite is run serialized since each test modifies the global default kernel
@Suite(.serialized)
class TestCLIKernelSet: CLITest {
let defaultKernelTar = DefaultsStore.get(key: .defaultKernelURL)
var remoteTar: URL! {
URL(string: defaultKernelTar)
}
let defaultBinaryPath = DefaultsStore.get(key: .defaultKernelBinaryPath)
deinit {
try? resetDefaultBinary()
}
func resetDefaultBinary() throws {
let arguments: [String] = [
"system",
"kernel",
"set",
"--recommended",
"--force",
]
let (_, _, error, status) = try run(arguments: arguments)
if status != 0 {
throw CLIError.executionFailed("failed to reset kernel to recommended: \(error)")
}
}
func doKernelSet(extraArgs: [String]) throws {
var arguments = [
"system",
"kernel",
"set",
"--force",
]
arguments.append(contentsOf: extraArgs)
let (_, _, error, status) = try run(arguments: arguments)
if status != 0 {
throw CLIError.executionFailed("failed to set kernel: \(error)")
}
}
func validateContainerRun() throws {
let name = getTestName()
try doLongRun(name: name, args: [])
defer { try? doStop(name: name) }
_ = try doExec(name: name, cmd: ["date"])
try doStop(name: name)
}
private func getTestName() -> String {
Test.current!.name.trimmingCharacters(in: ["(", ")"]).lowercased()
}
@Test func fromLocalTar() async throws {
let symlinkBinaryPath: String = URL(filePath: defaultBinaryPath).deletingLastPathComponent().appending(path: "vmlinux.container").relativePath
try await withTempDir { tempDir in
// manually download the tar file
let localTarPath = tempDir.appending(path: remoteTar.lastPathComponent)
try await ContainerAPIClient.FileDownloader.downloadFile(url: remoteTar, to: localTarPath)
let extraArgs: [String] = [
"--tar",
localTarPath.path,
"--binary",
symlinkBinaryPath,
]
try doKernelSet(extraArgs: extraArgs)
try validateContainerRun()
}
}
@Test func fromRemoteTarSymlink() throws {
// opt/kata/share/kata-containers/vmlinux.container should point to opt/kata/share/kata-containers/vmlinux-<version> in the archive
let symlinkBinaryPath: String = URL(filePath: defaultBinaryPath).deletingLastPathComponent().appending(path: "vmlinux.container").relativePath
let extraArgs: [String] = [
"--tar",
defaultKernelTar,
"--binary",
symlinkBinaryPath,
]
try doKernelSet(extraArgs: extraArgs)
try validateContainerRun()
}
@Test func fromLocalDisk() async throws {
try await withTempDir { tempDir in
// manually download the tar file
let localTarPath = tempDir.appending(path: remoteTar.lastPathComponent)
try await ContainerAPIClient.FileDownloader.downloadFile(url: remoteTar, to: localTarPath)
// extract just the file we want
let targetPath = tempDir.appending(path: URL(string: defaultBinaryPath)!.lastPathComponent)
let archiveReader = try ArchiveReader(file: localTarPath)
let (_, data) = try archiveReader.extractFile(path: defaultBinaryPath)
try data.write(to: targetPath, options: .atomic)
let extraArgs = [
"--binary",
targetPath.path,
]
try doKernelSet(extraArgs: extraArgs)
try validateContainerRun()
}
}
}