mirror of
https://github.com/apple/container.git
synced 2026-07-23 09:51:30 +00:00
- 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
95 lines
3.4 KiB
Swift
95 lines
3.4 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 ContainerResource
|
|
import ContainerXPC
|
|
import Containerization
|
|
import Foundation
|
|
|
|
public struct ClientVolume {
|
|
static let serviceIdentifier = "com.apple.container.apiserver"
|
|
|
|
public static func create(
|
|
name: String,
|
|
driver: String = "local",
|
|
driverOpts: [String: String] = [:],
|
|
labels: [String: String] = [:]
|
|
) async throws -> Volume {
|
|
let client = XPCClient(service: serviceIdentifier)
|
|
let message = XPCMessage(route: .volumeCreate)
|
|
message.set(key: .volumeName, value: name)
|
|
message.set(key: .volumeDriver, value: driver)
|
|
|
|
let driverOptsData = try JSONEncoder().encode(driverOpts)
|
|
message.set(key: .volumeDriverOpts, value: driverOptsData)
|
|
|
|
let labelsData = try JSONEncoder().encode(labels)
|
|
message.set(key: .volumeLabels, value: labelsData)
|
|
|
|
let reply = try await client.send(message)
|
|
|
|
guard let responseData = reply.dataNoCopy(key: .volume) else {
|
|
throw VolumeError.storageError("invalid response from server")
|
|
}
|
|
|
|
return try JSONDecoder().decode(Volume.self, from: responseData)
|
|
}
|
|
|
|
public static func delete(name: String) async throws {
|
|
let client = XPCClient(service: serviceIdentifier)
|
|
let message = XPCMessage(route: .volumeDelete)
|
|
message.set(key: .volumeName, value: name)
|
|
|
|
_ = try await client.send(message)
|
|
}
|
|
|
|
public static func list() async throws -> [Volume] {
|
|
let client = XPCClient(service: serviceIdentifier)
|
|
let message = XPCMessage(route: .volumeList)
|
|
let reply = try await client.send(message)
|
|
|
|
guard let responseData = reply.dataNoCopy(key: .volumes) else {
|
|
return []
|
|
}
|
|
|
|
return try JSONDecoder().decode([Volume].self, from: responseData)
|
|
}
|
|
|
|
public static func inspect(_ name: String) async throws -> Volume {
|
|
let client = XPCClient(service: serviceIdentifier)
|
|
let message = XPCMessage(route: .volumeInspect)
|
|
message.set(key: .volumeName, value: name)
|
|
|
|
let reply = try await client.send(message)
|
|
|
|
guard let responseData = reply.dataNoCopy(key: .volume) else {
|
|
throw VolumeError.volumeNotFound(name)
|
|
}
|
|
|
|
return try JSONDecoder().decode(Volume.self, from: responseData)
|
|
}
|
|
|
|
public static func volumeDiskUsage(name: String) async throws -> UInt64 {
|
|
let client = XPCClient(service: serviceIdentifier)
|
|
let message = XPCMessage(route: .volumeDiskUsage)
|
|
message.set(key: .volumeName, value: name)
|
|
let reply = try await client.send(message)
|
|
|
|
let size = reply.uint64(key: .volumeSize)
|
|
return size
|
|
}
|
|
}
|