mirror of
https://github.com/apple/container.git
synced 2026-07-19 07:57:07 +00:00
356c8d2f88
- 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
90 lines
3.3 KiB
Swift
90 lines
3.3 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 ContainerizationError
|
|
import ContainerizationOS
|
|
import Foundation
|
|
|
|
public struct ClientNetwork {
|
|
static let serviceIdentifier = "com.apple.container.apiserver"
|
|
|
|
public static let defaultNetworkName = "default"
|
|
public static let noNetworkName = "none"
|
|
}
|
|
|
|
extension ClientNetwork {
|
|
private static func newClient() -> XPCClient {
|
|
XPCClient(service: serviceIdentifier)
|
|
}
|
|
|
|
private static func xpcSend(
|
|
client: XPCClient,
|
|
message: XPCMessage,
|
|
timeout: Duration? = .seconds(15)
|
|
) async throws -> XPCMessage {
|
|
try await client.send(message, responseTimeout: timeout)
|
|
}
|
|
|
|
public static func create(configuration: NetworkConfiguration) async throws -> NetworkState {
|
|
let client = Self.newClient()
|
|
let request = XPCMessage(route: .networkCreate)
|
|
request.set(key: .networkId, value: configuration.id)
|
|
|
|
let data = try JSONEncoder().encode(configuration)
|
|
request.set(key: .networkConfig, value: data)
|
|
|
|
let response = try await xpcSend(client: client, message: request)
|
|
let responseData = response.dataNoCopy(key: .networkState)
|
|
guard let responseData else {
|
|
throw ContainerizationError(.invalidArgument, message: "network configuration not received")
|
|
}
|
|
let state = try JSONDecoder().decode(NetworkState.self, from: responseData)
|
|
return state
|
|
}
|
|
|
|
public static func list() async throws -> [NetworkState] {
|
|
let client = Self.newClient()
|
|
let request = XPCMessage(route: .networkList)
|
|
|
|
let response = try await xpcSend(client: client, message: request, timeout: .seconds(1))
|
|
let responseData = response.dataNoCopy(key: .networkStates)
|
|
guard let responseData else {
|
|
return []
|
|
}
|
|
let states = try JSONDecoder().decode([NetworkState].self, from: responseData)
|
|
return states
|
|
}
|
|
|
|
/// Get the network for the provided id.
|
|
public static func get(id: String) async throws -> NetworkState {
|
|
let networks = try await list()
|
|
guard let network = networks.first(where: { $0.id == id }) else {
|
|
throw ContainerizationError(.notFound, message: "network \(id) not found")
|
|
}
|
|
return network
|
|
}
|
|
|
|
/// Delete the network with the given id.
|
|
public static func delete(id: String) async throws {
|
|
let client = XPCClient(service: Self.serviceIdentifier)
|
|
let request = XPCMessage(route: .networkDelete)
|
|
request.set(key: .networkId, value: id)
|
|
try await client.send(request)
|
|
}
|
|
}
|