Files
container/Sources/Services/ContainerAPIService/Server/Kernel/KernelHarness.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

98 lines
3.9 KiB
Swift

//===----------------------------------------------------------------------===//
// 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 ContainerAPIClient
import ContainerXPC
import Containerization
import ContainerizationError
import Foundation
import Logging
public struct KernelHarness: Sendable {
private let log: Logging.Logger
private let service: KernelService
public init(service: KernelService, log: Logging.Logger) {
self.log = log
self.service = service
}
@Sendable
public func install(_ message: XPCMessage) async throws -> XPCMessage {
let kernelFilePath = try message.kernelFilePath()
let platform = try message.platform()
let force = try message.kernelForce()
guard let kernelTarUrl = try message.kernelTarURL() else {
// We have been given a path to a kernel binary on disk
guard let kernelFile = URL(string: kernelFilePath) else {
throw ContainerizationError(.invalidArgument, message: "invalid kernel file path: \(kernelFilePath)")
}
try await self.service.installKernel(kernelFile: kernelFile, platform: platform, force: force)
return message.reply()
}
let progressUpdateService = ProgressUpdateService(message: message)
try await self.service.installKernelFrom(
tar: kernelTarUrl, kernelFilePath: kernelFilePath, platform: platform, progressUpdate: progressUpdateService?.handler, force: force)
return message.reply()
}
@Sendable
public func getDefaultKernel(_ message: XPCMessage) async throws -> XPCMessage {
guard let platformData = message.dataNoCopy(key: .systemPlatform) else {
throw ContainerizationError(.invalidArgument, message: "missing SystemPlatform")
}
let platform = try JSONDecoder().decode(SystemPlatform.self, from: platformData)
let kernel = try await self.service.getDefaultKernel(platform: platform)
let reply = message.reply()
let data = try JSONEncoder().encode(kernel)
reply.set(key: .kernel, value: data)
return reply
}
}
extension XPCMessage {
fileprivate func platform() throws -> SystemPlatform {
guard let platformData = self.dataNoCopy(key: .systemPlatform) else {
throw ContainerizationError(.invalidArgument, message: "missing SystemPlatform in XPC Message")
}
let platform = try JSONDecoder().decode(SystemPlatform.self, from: platformData)
return platform
}
fileprivate func kernelFilePath() throws -> String {
guard let kernelFilePath = self.string(key: .kernelFilePath) else {
throw ContainerizationError(.invalidArgument, message: "missing kernel file path in XPC Message")
}
return kernelFilePath
}
fileprivate func kernelTarURL() throws -> URL? {
guard let kernelTarURLString = self.string(key: .kernelTarURL) else {
return nil
}
guard let k = URL(string: kernelTarURLString) else {
throw ContainerizationError(.invalidArgument, message: "cannot parse URL from \(kernelTarURLString)")
}
return k
}
fileprivate func kernelForce() throws -> Bool {
self.bool(key: .kernelForce)
}
}