mirror of
https://github.com/apple/container.git
synced 2026-07-14 13:37:02 +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
58 lines
2.2 KiB
Swift
58 lines
2.2 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 ContainerResource
|
|
import ContainerizationError
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
import TerminalProgress
|
|
|
|
extension Application {
|
|
public struct NetworkCreate: AsyncParsableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "create",
|
|
abstract: "Create a new network")
|
|
|
|
@Option(name: .customLong("label"), help: "Set metadata for a network")
|
|
var labels: [String] = []
|
|
|
|
@Option(name: .customLong("subnet"), help: "Set subnet for a network")
|
|
var ipv4Subnet: String? = nil
|
|
|
|
@Option(name: .customLong("subnet-v6"), help: "Set the IPv6 prefix for a network")
|
|
var ipv6Subnet: String? = nil
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
@Argument(help: "Network name")
|
|
var name: String
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let parsedLabels = Utility.parseKeyValuePairs(labels)
|
|
let ipv4Subnet = try ipv4Subnet.map { try CIDRv4($0) }
|
|
let ipv6Subnet = try ipv6Subnet.map { try CIDRv6($0) }
|
|
let config = try NetworkConfiguration(id: self.name, mode: .nat, ipv4Subnet: ipv4Subnet, ipv6Subnet: ipv6Subnet, labels: parsedLabels)
|
|
let state = try await ClientNetwork.create(configuration: config)
|
|
print(state.id)
|
|
}
|
|
}
|
|
}
|