mirror of
https://github.com/apple/container.git
synced 2026-07-20 00:17:13 +00:00
J Logan
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
62 lines
2.9 KiB
Swift
62 lines
2.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 ContainerXPC
|
|
import ContainerizationError
|
|
import Foundation
|
|
|
|
public enum ClientHealthCheck {
|
|
static let serviceIdentifier = "com.apple.container.apiserver"
|
|
}
|
|
|
|
extension ClientHealthCheck {
|
|
private static func newClient() -> XPCClient {
|
|
XPCClient(service: serviceIdentifier)
|
|
}
|
|
|
|
public static func ping(timeout: Duration? = .seconds(5)) async throws -> SystemHealth {
|
|
let client = Self.newClient()
|
|
let request = XPCMessage(route: .ping)
|
|
let reply = try await client.send(request, responseTimeout: timeout)
|
|
guard let appRootValue = reply.string(key: .appRoot), let appRoot = URL(string: appRootValue) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode appRoot in health check")
|
|
}
|
|
guard let installRootValue = reply.string(key: .installRoot), let installRoot = URL(string: installRootValue) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode installRoot in health check")
|
|
}
|
|
guard let apiServerVersion = reply.string(key: .apiServerVersion) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode apiServerVersion in health check")
|
|
}
|
|
guard let apiServerCommit = reply.string(key: .apiServerCommit) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode apiServerCommit in health check")
|
|
}
|
|
guard let apiServerBuild = reply.string(key: .apiServerBuild) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode apiServerBuild in health check")
|
|
}
|
|
guard let apiServerAppName = reply.string(key: .apiServerAppName) else {
|
|
throw ContainerizationError(.internalError, message: "failed to decode apiServerAppName in health check")
|
|
}
|
|
return .init(
|
|
appRoot: appRoot,
|
|
installRoot: installRoot,
|
|
apiServerVersion: apiServerVersion,
|
|
apiServerCommit: apiServerCommit,
|
|
apiServerBuild: apiServerBuild,
|
|
apiServerAppName: apiServerAppName
|
|
)
|
|
}
|
|
}
|