mirror of
https://github.com/apple/container.git
synced 2026-10-01 20:07:53 +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.
68 lines
2.5 KiB
Swift
68 lines
2.5 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-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 ArgumentParser
|
|
import ContainerAPIClient
|
|
import Foundation
|
|
|
|
extension Application.NetworkCommand {
|
|
public struct NetworkPrune: AsyncLoggableCommand {
|
|
public init() {}
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "prune",
|
|
abstract: "Remove networks with no container connections"
|
|
)
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
public func run() async throws {
|
|
let client = ContainerClient()
|
|
let allContainers = try await client.list()
|
|
let allNetworks = try await ClientNetwork.list()
|
|
|
|
var networksInUse = Set<String>()
|
|
for container in allContainers {
|
|
for network in container.configuration.networks {
|
|
networksInUse.insert(network.network)
|
|
}
|
|
}
|
|
|
|
let networksToPrune = allNetworks.filter { network in
|
|
!network.isBuiltin && !networksInUse.contains(network.id)
|
|
}
|
|
|
|
var prunedNetworks = [String]()
|
|
|
|
for network in networksToPrune {
|
|
do {
|
|
try await ClientNetwork.delete(id: network.id)
|
|
prunedNetworks.append(network.id)
|
|
} catch {
|
|
// Note: This failure may occur due to a race condition between the network/
|
|
// container collection above and a container run command that attaches to a
|
|
// network listed in the networksToPrune collection.
|
|
log.error("Failed to prune network \(network.id): \(error)")
|
|
}
|
|
}
|
|
|
|
for name in prunedNetworks {
|
|
print(name)
|
|
}
|
|
}
|
|
}
|
|
}
|