mirror of
https://github.com/apple/container.git
synced 2026-07-13 04:57:08 +00:00
Danny Canter
8fdfa29728
ClientContainer was honestly extremely awkward. It could only be created by passing either a ContainerConfiguration, or a Snapshot that had to be obtained from calling a static method on the type itself. The type also did not store a connection, so every single method got a new xpc connection to the APIServer. This change aims to rework this type to be just a generic client, that is *not* a client for one specific container, but for any. - Rename to ContainerClient - Have list() return [ContainerSnapshot] - Create a connection in the constructor - Change all the callsites to use the new API - Small, somewhat related, change to logs API in the APIServer. Now that we don't need to call get() to grab a client anymore which was typically what did "does this container exist" logic and gave a nice error message, I added a small check in the APIServer to see if the container exists and return mostly the same error message.
55 lines
1.9 KiB
Swift
55 lines
1.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 ContainerizationOCI
|
|
import Foundation
|
|
|
|
/// A snapshot of a container along with its configuration
|
|
/// and any runtime state information.
|
|
public struct ContainerSnapshot: Codable, Sendable {
|
|
/// The configuration of the container.
|
|
public var configuration: ContainerConfiguration
|
|
|
|
/// Identifier of the container.
|
|
public var id: String {
|
|
configuration.id
|
|
}
|
|
|
|
/// Configured platform for the container.
|
|
public var platform: ContainerizationOCI.Platform {
|
|
configuration.platform
|
|
}
|
|
|
|
/// The runtime status of the container.
|
|
public var status: RuntimeStatus
|
|
/// Network interfaces attached to the sandbox that are provided to the container.
|
|
public var networks: [Attachment]
|
|
/// When the container was started.
|
|
public var startedDate: Date?
|
|
|
|
public init(
|
|
configuration: ContainerConfiguration,
|
|
status: RuntimeStatus,
|
|
networks: [Attachment],
|
|
startedDate: Date? = nil
|
|
) {
|
|
self.configuration = configuration
|
|
self.status = status
|
|
self.networks = networks
|
|
self.startedDate = startedDate
|
|
}
|
|
}
|