Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Sources/Services/ContainerAPIService/Client/Flags.swift
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,21 @@ public struct Flags {

@Option(name: [.customLong("volume"), .short], help: "Bind mount a volume into the container")
public var volumes: [String] = []

public func validate() throws {
if dnsDisabled {
let hasDNSConfig =
!dns.nameservers.isEmpty
|| dns.domain != nil
|| !dns.options.isEmpty
|| !dns.searchDomains.isEmpty
if hasDNSConfig {
throw ValidationError(
"`--no-dns` cannot be used with DNS configuration flags (`--dns`, `--dns-domain`, `--dns-option`, `--dns-search`)"
)
}
}
}
}

public struct Progress: ParsableArguments {
Expand Down
40 changes: 40 additions & 0 deletions Tests/ContainerAPIClientTests/ParserTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1296,4 +1296,44 @@ struct ParserTest {
#expect(result.cpus == 2)
#expect(result.memoryInBytes == 2048.mib())
}

// MARK: - DNS Flag Validation Tests

@Test
func testManagementFlagsRejectsNoDNSWithDNS() throws {
#expect(throws: (any Error).self) {
_ = try Flags.Management.parse(["--dns", "1.1.1.1", "--no-dns"])
}
}

@Test
func testManagementFlagsRejectsNoDNSWithDNSDomain() throws {
#expect(throws: (any Error).self) {
_ = try Flags.Management.parse(["--dns-domain", "example.com", "--no-dns"])
}
}

@Test
func testManagementFlagsRejectsNoDNSWithDNSSearch() throws {
#expect(throws: (any Error).self) {
_ = try Flags.Management.parse(["--dns-search", "example.com", "--no-dns"])
}
}

@Test
func testManagementFlagsRejectsNoDNSWithDNSOption() throws {
#expect(throws: (any Error).self) {
_ = try Flags.Management.parse(["--dns-option", "debug", "--no-dns"])
}
}

@Test
func testManagementFlagsAcceptsDNSAlone() throws {
_ = try Flags.Management.parse(["--dns", "1.1.1.1"])
}

@Test
func testManagementFlagsAcceptsNoDNSAlone() throws {
_ = try Flags.Management.parse(["--no-dns"])
}
}