mirror of
https://github.com/apple/container.git
synced 2026-07-15 14:07:04 +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
87 lines
2.9 KiB
Swift
87 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 ContainerPersistence
|
|
import ContainerResource
|
|
import ContainerXPC
|
|
import ContainerizationError
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
import Logging
|
|
|
|
public actor AllocationOnlyVmnetNetwork: Network {
|
|
private let log: Logger
|
|
private var _state: NetworkState
|
|
|
|
/// Configure a bridge network that allows external system access using
|
|
/// network address translation.
|
|
public init(
|
|
configuration: NetworkConfiguration,
|
|
log: Logger
|
|
) throws {
|
|
guard configuration.mode == .nat else {
|
|
throw ContainerizationError(.unsupported, message: "invalid network mode \(configuration.mode)")
|
|
}
|
|
|
|
guard configuration.ipv4Subnet == nil else {
|
|
throw ContainerizationError(.unsupported, message: "IPv4 subnet assignment is not yet implemented")
|
|
}
|
|
|
|
self.log = log
|
|
self._state = .created(configuration)
|
|
}
|
|
|
|
public var state: NetworkState {
|
|
self._state
|
|
}
|
|
|
|
public nonisolated func withAdditionalData(_ handler: (XPCMessage?) throws -> Void) throws {
|
|
try handler(nil)
|
|
}
|
|
|
|
public func start() async throws {
|
|
guard case .created(let configuration) = _state else {
|
|
throw ContainerizationError(.invalidState, message: "cannot start network \(_state.id) in \(_state.state) state")
|
|
}
|
|
|
|
log.info(
|
|
"starting allocation-only network",
|
|
metadata: [
|
|
"id": "\(configuration.id)",
|
|
"mode": "\(NetworkMode.nat.rawValue)",
|
|
]
|
|
)
|
|
|
|
let subnet = DefaultsStore.get(key: .defaultSubnet)
|
|
let subnetCIDR = try CIDRv4(subnet)
|
|
let gateway = IPv4Address(subnetCIDR.lower.value + 1)
|
|
let status = NetworkStatus(
|
|
ipv4Subnet: subnetCIDR,
|
|
ipv4Gateway: gateway,
|
|
ipv6Subnet: nil,
|
|
)
|
|
self._state = .running(configuration, status)
|
|
log.info(
|
|
"started allocation-only network",
|
|
metadata: [
|
|
"id": "\(configuration.id)",
|
|
"mode": "\(configuration.mode)",
|
|
"cidr": "\(subnet)",
|
|
]
|
|
)
|
|
}
|
|
}
|