chore: import upstream snapshot with attribution
container project - merge build / Invoke build (push) Successful in 1s

This commit is contained in:
wehub-resource-sync
2026-07-13 12:06:18 +08:00
commit e84fb4a79e
474 changed files with 68321 additions and 0 deletions
@@ -0,0 +1,40 @@
//===----------------------------------------------------------------------===//
// 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
extension Application {
public struct NetworkCommand: AsyncLoggableCommand {
public static let configuration = CommandConfiguration(
commandName: "network",
abstract: "Manage container networks",
subcommands: [
NetworkCreate.self,
NetworkDelete.self,
NetworkList.self,
NetworkInspect.self,
NetworkPrune.self,
],
aliases: ["n"]
)
public init() {}
@OptionGroup
public var logOptions: Flags.Logging
}
}
@@ -0,0 +1,83 @@
//===----------------------------------------------------------------------===//
// 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 ContainerResource
import ContainerizationError
import ContainerizationExtras
import Foundation
import TerminalProgress
extension Application {
public struct NetworkCreate: AsyncLoggableCommand {
public static let configuration = CommandConfiguration(
commandName: "create",
abstract: "Create a new network")
@Flag(name: .customLong("internal"), help: "Restrict to host-only network")
var hostOnly: Bool = false
@Option(name: .customLong("label"), help: "Set metadata for a network")
var labels: [String] = []
@Option(name: .customLong("option"), help: "Set a plugin-specific option (key=value)")
var options: [String] = []
@Option(name: .long, help: "Set the plugin to use to create this network.")
var plugin: String = "container-network-vmnet"
@Option(
name: .customLong("subnet"), help: "Set subnet for a network",
transform: {
try CIDRv4($0)
})
var ipv4Subnet: CIDRv4? = nil
@Option(
name: .customLong("subnet-v6"), help: "Set the IPv6 prefix for a network",
transform: {
try CIDRv6($0)
})
var ipv6Subnet: CIDRv6? = nil
@OptionGroup
public var logOptions: Flags.Logging
@Argument(help: "Network name")
var name: String
public init() {}
public func run() async throws {
let parsedLabels = try ResourceLabels(Utility.parseKeyValuePairs(labels))
let parsedOptions = Utility.parseKeyValuePairs(options)
let mode: NetworkMode = hostOnly ? .hostOnly : .nat
let config = try NetworkConfiguration(
name: self.name,
mode: mode,
ipv4Subnet: ipv4Subnet,
ipv6Subnet: ipv6Subnet,
labels: parsedLabels,
plugin: self.plugin,
options: parsedOptions
)
let networkClient = NetworkClient()
let network = try await networkClient.create(configuration: config)
print(network.id)
}
}
}
@@ -0,0 +1,128 @@
//===----------------------------------------------------------------------===//
// 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 ContainerResource
import ContainerizationError
import Foundation
extension Application {
public struct NetworkDelete: AsyncLoggableCommand {
public static let configuration = CommandConfiguration(
commandName: "delete",
abstract: "Delete one or more networks",
aliases: ["rm"])
@Flag(name: .shortAndLong, help: "Delete all networks")
var all = false
@OptionGroup
public var logOptions: Flags.Logging
@Argument(help: "Network names")
var networkNames: [String] = []
public init() {}
public func validate() throws {
if networkNames.count == 0 && !all {
throw ContainerizationError(.invalidArgument, message: "no networks specified and --all not supplied")
}
if networkNames.count > 0 && all {
throw ContainerizationError(
.invalidArgument,
message: "explicitly supplied network name(s) conflict with the --all flag"
)
}
}
public mutating func run() async throws {
let networkClient = NetworkClient()
let uniqueNetworkNames = Set<String>(networkNames)
let networks: [NetworkResource]
if all {
networks = try await networkClient.list()
.filter { !$0.isBuiltin }
} else {
networks = try await networkClient.list()
.filter { c in
guard uniqueNetworkNames.contains(c.id) else {
return false
}
guard !c.isBuiltin else {
throw ContainerizationError(
.invalidArgument,
message: "cannot delete a builtin network: \(c.id)"
)
}
return true
}
// If one of the networks requested isn't present lets throw. We don't need to do
// this for --all as --all should be perfectly usable with no networks to remove,
// otherwise it'd be quite clunky.
if networks.count != uniqueNetworkNames.count {
let missing = uniqueNetworkNames.filter { id in
!networks.contains { n in
n.id == id
}
}
throw ContainerizationError(
.notFound,
message: "failed to delete one or more networks: \(missing)"
)
}
}
var failed = [String]()
let _log = log
try await withThrowingTaskGroup(of: NetworkResource?.self) { group in
for network in networks {
group.addTask {
do {
// Delete atomically disables the IP allocator, then deletes
// the allocator. The disable fails if any IPs are still in use.
try await networkClient.delete(id: network.id)
print(network.id)
return nil
} catch {
_log.error(
"failed to delete network",
metadata: [
"id": "\(network.id)",
"error": "\(error)",
])
return network
}
}
}
for try await network in group {
guard let network else {
continue
}
failed.append(network.id)
}
}
if failed.count > 0 {
throw ContainerizationError(.internalError, message: "delete failed for one or more networks: \(failed)")
}
}
}
}
@@ -0,0 +1,53 @@
//===----------------------------------------------------------------------===//
// 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 ContainerizationError
import Foundation
extension Application {
public struct NetworkInspect: AsyncLoggableCommand {
public static let configuration = CommandConfiguration(
commandName: "inspect",
abstract: "Display information about one or more networks")
@Argument(help: "Networks to inspect")
var networks: [String]
@OptionGroup
public var logOptions: Flags.Logging
public init() {}
public func run() async throws {
let networkClient = NetworkClient()
let uniqueNames = Set(networks)
let items = try await networkClient.list().filter { uniqueNames.contains($0.id) }
if items.count != uniqueNames.count {
let found = Set(items.map { $0.id })
let missing = uniqueNames.subtracting(found).sorted()
throw ContainerizationError(
.notFound,
message: "network not found: \(missing.joined(separator: ", "))"
)
}
try Output.emit(Output.renderJSON(items, options: .pretty))
}
}
}
@@ -0,0 +1,45 @@
//===----------------------------------------------------------------------===//
// 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 {
public struct NetworkList: AsyncLoggableCommand {
public static let configuration = CommandConfiguration(
commandName: "list",
abstract: "List networks",
aliases: ["ls"])
@Option(name: .long, help: "Format of the output")
var format: ListFormat = .table
@Flag(name: .shortAndLong, help: "Only output the network name")
var quiet = false
@OptionGroup
public var logOptions: Flags.Logging
public init() {}
public func run() async throws {
let networkClient = NetworkClient()
let networks = try await networkClient.list()
try Output.render(payload: networks, display: networks, format: format, quiet: quiet)
}
}
}
@@ -0,0 +1,73 @@
//===----------------------------------------------------------------------===//
// 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 networkClient = NetworkClient()
let client = ContainerClient()
let allContainers = try await client.list()
let allNetworks = try await networkClient.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 networkClient.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",
metadata: [
"id": "\(network.id)",
"error": "\(error)",
])
}
}
for name in prunedNetworks {
print(name)
}
}
}
}
@@ -0,0 +1,31 @@
//===----------------------------------------------------------------------===//
// 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
extension NetworkResource: ListDisplayable {
public static var tableHeader: [String] {
["NETWORK", "SUBNET"]
}
public var tableRow: [String] {
[id, status.ipv4Subnet.description]
}
public var quietValue: String {
id
}
}