mirror of
https://github.com/apple/container.git
synced 2026-09-30 03:25:53 +00:00
- Discussion topic #1336. - This change migrates away from using `UserDefaults`, instead providing a TOML configuration mechanism for user configurable settings. All existing system property settings keys are supported in the new configuration file. However, users will have to migrate any settings they have configured in the `UserDefaults` into TOML for these settings to take effect. - Breaking changes: * `container system property get` is removed in favor of users directly utilizing `container system property list --format toml | jq<>`. * `container system property set` is removed since the TOML configuration is effectively immutable during the lifetime of the `container` daemon. Uses can edit the TOML they have in their home directory, however no changes will take effect until the daemon is restarted via `container system stop && container system start` * `container system property list --format table` is removed as generating tabular format is non-trivial and the new TOML format is intended to be human readable
198 lines
8.1 KiB
Swift
198 lines
8.1 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 ContainerizationExtras
|
|
import Foundation
|
|
import Testing
|
|
|
|
struct SystemRuntimeOptionsTests {
|
|
@Test func testDefaultsWithNoToml() throws {
|
|
let url = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("nonexistent-\(UUID().uuidString).toml")
|
|
let config: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: url)
|
|
#expect(config.build.rosetta == true)
|
|
#expect(config.build.cpus == 2)
|
|
#expect(config.build.memory == BuildConfig.defaultMemory)
|
|
#expect(config.container.cpus == 4)
|
|
#expect(config.container.memory == ContainerConfig.defaultMemory)
|
|
#expect(config.dns.domain == nil)
|
|
#expect(!config.build.image.isEmpty)
|
|
#expect(!config.vminit.image.isEmpty)
|
|
#expect(!config.kernel.binaryPath.isEmpty)
|
|
#expect(!config.kernel.url.absoluteString.isEmpty)
|
|
#expect(config.network.subnet == nil)
|
|
#expect(config.network.subnetv6 == nil)
|
|
#expect(config.registry.domain == "docker.io")
|
|
}
|
|
|
|
@Test func testTomlOverrideAllKeys() throws {
|
|
let toml = """
|
|
[build]
|
|
rosetta = false
|
|
cpus = 8
|
|
memory = "4096MB"
|
|
image = "custom-builder:latest"
|
|
|
|
[container]
|
|
cpus = 16
|
|
memory = "8g"
|
|
|
|
[dns]
|
|
domain = "custom"
|
|
|
|
[kernel]
|
|
binaryPath = "custom/path"
|
|
url = "https://example.com/kernel.tar"
|
|
|
|
[network]
|
|
subnet = "10.0.0.1/16"
|
|
subnetv6 = "fd01::/48"
|
|
|
|
[registry]
|
|
domain = "ghcr.io"
|
|
|
|
[vminit]
|
|
image = "custom-init:latest"
|
|
"""
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-\(UUID().uuidString).toml")
|
|
try toml.write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
|
|
let config: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
#expect(config.build.rosetta == false)
|
|
#expect(config.build.cpus == 8)
|
|
let expectedBuildMemory = try MemorySize("4096MB")
|
|
#expect(config.build.memory == expectedBuildMemory)
|
|
#expect(config.container.cpus == 16)
|
|
let expectedContainerMemory = try MemorySize("8g")
|
|
#expect(config.container.memory == expectedContainerMemory)
|
|
#expect(config.dns.domain == "custom")
|
|
#expect(config.build.image == "custom-builder:latest")
|
|
#expect(config.vminit.image == "custom-init:latest")
|
|
#expect(config.kernel.binaryPath == "custom/path")
|
|
#expect(config.kernel.url.absoluteString == "https://example.com/kernel.tar")
|
|
let expectedSubnet = try CIDRv4("10.0.0.1/16")
|
|
let expectedSubnetV6 = try CIDRv6("fd01::/48")
|
|
#expect(config.network.subnet == expectedSubnet)
|
|
#expect(config.network.subnetv6 == expectedSubnetV6)
|
|
#expect(config.registry.domain == "ghcr.io")
|
|
}
|
|
|
|
@Test func testPartialToml() throws {
|
|
let toml = """
|
|
[build]
|
|
cpus = 16
|
|
"""
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-\(UUID().uuidString).toml")
|
|
try toml.write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
|
|
let config: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
#expect(config.build.cpus == 16)
|
|
// All other fields should have their hardcoded defaults
|
|
#expect(config.build.rosetta == true)
|
|
#expect(config.build.memory == BuildConfig.defaultMemory)
|
|
#expect(config.container.cpus == 4)
|
|
#expect(config.container.memory == ContainerConfig.defaultMemory)
|
|
#expect(config.dns.domain == nil)
|
|
#expect(config.network.subnet == nil)
|
|
#expect(config.network.subnetv6 == nil)
|
|
#expect(config.registry.domain == "docker.io")
|
|
}
|
|
|
|
@Test func testUnknownKeysIgnored() throws {
|
|
let toml = """
|
|
[build]
|
|
cpus = 4
|
|
unknownBuildKey = "ignored"
|
|
|
|
[unknownSection]
|
|
foo = "bar"
|
|
"""
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-\(UUID().uuidString).toml")
|
|
try toml.write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
|
|
let config: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
#expect(config.build.cpus == 4)
|
|
#expect(config.build.rosetta == true)
|
|
}
|
|
|
|
@Test func testIndependentPluginConfig() throws {
|
|
struct PluginConfig: Codable, Sendable {
|
|
var network: NetworkConfig
|
|
init(network: NetworkConfig = .init()) { self.network = network }
|
|
init(from decoder: any Decoder) throws {
|
|
let container = try decoder.container(keyedBy: CodingKeys.self)
|
|
self.network = try container.decodeIfPresent(NetworkConfig.self, forKey: .network) ?? .init()
|
|
}
|
|
}
|
|
|
|
let toml = """
|
|
[build]
|
|
cpus = 8
|
|
|
|
[network]
|
|
subnet = "10.1.2.3/24"
|
|
subnetv6 = "fd02::/48"
|
|
"""
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-\(UUID().uuidString).toml")
|
|
try toml.write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
|
|
let config: PluginConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
// Only network is decoded; build section is ignored
|
|
let expectedSubnet = try CIDRv4("10.1.2.3/24")
|
|
let expectedSubnetV6 = try CIDRv6("fd02::/48")
|
|
#expect(config.network.subnet == expectedSubnet)
|
|
#expect(config.network.subnetv6 == expectedSubnetV6)
|
|
}
|
|
|
|
@Test func testInvalidTomlThrows() throws {
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-invalid-toml.toml")
|
|
try "this is [not valid toml".write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
#expect(throws: (any Error).self) {
|
|
let _: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
}
|
|
}
|
|
|
|
@Test func testEmptyTomlDecodesToDefaults() throws {
|
|
let tmpFile = FileManager.default.temporaryDirectory
|
|
.appendingPathComponent("test-\(UUID().uuidString).toml")
|
|
try "".write(to: tmpFile, atomically: true, encoding: .utf8)
|
|
defer { try? FileManager.default.removeItem(at: tmpFile) }
|
|
|
|
let config: ContainerSystemConfig = try SystemRuntimeOptions.loadConfig(configFile: tmpFile)
|
|
#expect(config.build.rosetta == true)
|
|
#expect(config.build.cpus == 2)
|
|
#expect(config.build.memory == BuildConfig.defaultMemory)
|
|
#expect(config.container.cpus == 4)
|
|
#expect(config.container.memory == ContainerConfig.defaultMemory)
|
|
#expect(config.dns.domain == nil)
|
|
#expect(config.network.subnet == nil)
|
|
#expect(config.network.subnetv6 == nil)
|
|
#expect(config.registry.domain == "docker.io")
|
|
}
|
|
|
|
}
|