mirror of
https://github.com/apple/container.git
synced 2026-09-25 16:40:28 -04: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
63 lines
2.6 KiB
Swift
63 lines
2.6 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 ContainerizationError
|
|
import Foundation
|
|
import Testing
|
|
|
|
@testable import ContainerAPIClient
|
|
|
|
struct RequestSchemeTests {
|
|
static let defaultDnsDomain = DefaultsStore.get(key: .defaultDNSDomain)
|
|
|
|
internal struct TestArg {
|
|
let scheme: String
|
|
let host: String
|
|
let expected: RequestScheme
|
|
}
|
|
|
|
@Test(arguments: [
|
|
TestArg(scheme: "http", host: "myregistry.io", expected: .http),
|
|
TestArg(scheme: "https", host: "myregistry.io", expected: .https),
|
|
TestArg(scheme: "auto", host: "myregistry.io", expected: .https),
|
|
TestArg(scheme: "https", host: "localhost", expected: .https),
|
|
TestArg(scheme: "http", host: "localhost", expected: .http),
|
|
TestArg(scheme: "auto", host: "localhost", expected: .http),
|
|
TestArg(scheme: "http", host: "127.0.0.1", expected: .http),
|
|
TestArg(scheme: "https", host: "127.0.0.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "127.0.0.1", expected: .http),
|
|
TestArg(scheme: "https", host: "10.3.4.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "10.3.4.1", expected: .http),
|
|
TestArg(scheme: "auto", host: "some-dns-name.io.\(Self.defaultDnsDomain)", expected: .http),
|
|
TestArg(scheme: "auto", host: "some-dns-name.io", expected: .https),
|
|
TestArg(scheme: "auto", host: "172.32.0.1", expected: .https),
|
|
TestArg(scheme: "auto", host: "172.22.23.61", expected: .http),
|
|
])
|
|
|
|
func testIsConnectionSecure(arg: TestArg) throws {
|
|
let requestScheme = RequestScheme(rawValue: arg.scheme)!
|
|
#expect(try requestScheme.schemeFor(host: arg.host) == arg.expected)
|
|
}
|
|
|
|
func testEmptyHostThrowsError() throws {
|
|
#expect(throws: (any Error).self) {
|
|
let requestScheme = RequestScheme(rawValue: "https")!
|
|
_ = try requestScheme.schemeFor(host: "")
|
|
}
|
|
}
|
|
}
|