mirror of
https://github.com/apple/container.git
synced 2026-08-24 10:05:43 -05:00
- 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
91 lines
3.3 KiB
Swift
91 lines
3.3 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.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
/// The network protocols available for port forwarding.
|
|
public enum PublishProtocol: String, Sendable, Codable {
|
|
case tcp = "tcp"
|
|
case udp = "udp"
|
|
|
|
/// Initialize a protocol with to default value, `.tcp`.
|
|
public init() {
|
|
self = .tcp
|
|
}
|
|
|
|
/// Initialize a protocol value from the provided string.
|
|
public init?(_ value: String) {
|
|
switch value.lowercased() {
|
|
case "tcp": self = .tcp
|
|
case "udp": self = .udp
|
|
default: return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Specifies internet port forwarding from host to container.
|
|
public struct PublishPort: Sendable, Codable {
|
|
/// The IP address of the proxy listener on the host
|
|
public let hostAddress: String
|
|
|
|
/// The port number of the proxy listener on the host
|
|
public let hostPort: UInt16
|
|
|
|
/// The port number of the container listener
|
|
public let containerPort: UInt16
|
|
|
|
/// The network protocol for the proxy
|
|
public let proto: PublishProtocol
|
|
|
|
/// The number of ports to publish
|
|
public let count: UInt16
|
|
|
|
/// Creates a new port forwarding specification.
|
|
public init(hostAddress: String, hostPort: UInt16, containerPort: UInt16, proto: PublishProtocol, count: UInt16) {
|
|
self.hostAddress = hostAddress
|
|
self.hostPort = hostPort
|
|
self.containerPort = containerPort
|
|
self.proto = proto
|
|
self.count = count
|
|
}
|
|
|
|
/// Create a configuration from the supplied Decoder, initializing missing
|
|
/// values where possible to reasonable defaults.
|
|
public init(from decoder: Decoder) throws {
|
|
let container = try decoder.container(keyedBy: CodingKeys.self)
|
|
|
|
hostAddress = try container.decode(String.self, forKey: .hostAddress)
|
|
hostPort = try container.decode(UInt16.self, forKey: .hostPort)
|
|
containerPort = try container.decode(UInt16.self, forKey: .containerPort)
|
|
proto = try container.decode(PublishProtocol.self, forKey: .proto)
|
|
count = try container.decodeIfPresent(UInt16.self, forKey: .count) ?? 1
|
|
}
|
|
}
|
|
|
|
extension [PublishPort] {
|
|
public func hasOverlaps() -> Bool {
|
|
var hostPorts = Set<String>()
|
|
for publishPort in self {
|
|
for index in publishPort.hostPort..<(publishPort.hostPort + publishPort.count) {
|
|
let hostPortKey = "\(index)/\(publishPort.proto.rawValue)"
|
|
guard !hostPorts.contains(hostPortKey) else {
|
|
return true
|
|
}
|
|
hostPorts.insert(hostPortKey)
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
}
|