Skip to content

fix: interpolate command and entrypoint environment #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saeidakbari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: interpolate command and entrypoint environment #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions Sources/Container-Compose/Commands/ComposeUp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,18 +361,19 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
/// `-c` flag and the script as a single argument.
static func entrypointAndCommandArgs(
entrypoint: [String]?,
command: [String]?
command: [String]?,
environmentVariables: [String: String] = [:]
) -> (entrypointFlag: String?, positional: [String]) {
var positional: [String] = []
let entrypointFlag: String?
if let entrypoint, !entrypoint.isEmpty {
entrypointFlag = entrypoint.first
positional.append(contentsOf: entrypoint.dropFirst())
entrypointFlag = entrypoint.first.map { resolveVariable($0, with: environmentVariables) }
positional.append(contentsOf: entrypoint.dropFirst().map { resolveVariable($0, with: environmentVariables) })
} else {
entrypointFlag = nil
}
if let command {
positional.append(contentsOf: command)
positional.append(contentsOf: command.map { resolveVariable($0, with: environmentVariables) })
}
return (entrypointFlag, positional)
}
Expand Down Expand Up @@ -1127,7 +1128,8 @@ public struct ComposeUp: AsyncParsableCommand, @unchecked Sendable {
// the image. See the helper below for the full mapping.
let argv = Self.entrypointAndCommandArgs(
entrypoint: service.entrypoint,
command: service.command
command: service.command,
environmentVariables: environmentVariables
)
if let entrypointFlag = argv.entrypointFlag {
runCommandArgs.append(contentsOf: ["--entrypoint", entrypointFlag])
Expand Down
33 changes: 33 additions & 0 deletions Tests/Container-Compose-StaticTests/EntrypointCommandTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,39 @@ struct EntrypointCommandTests {
#expect(r.positional == ["nginx", "-g", "daemon off;"])
}

@Test("command arguments interpolate project environment")
func commandArgumentsInterpolateProjectEnvironment() {
let r = ComposeUp.entrypointAndCommandArgs(
entrypoint: nil,
command: [
"-database=postgres://${CC_TEST_MIGRATE_USER:-compose-user}:${CC_TEST_MIGRATE_PASSWORD:-compose-password}@${CC_TEST_MIGRATE_HOST:-postgres}:5432/app?sslmode=disable",
"up",
],
environmentVariables: [
"CC_TEST_MIGRATE_USER": "env-file-user",
"CC_TEST_MIGRATE_PASSWORD": "env-file-password",
"CC_TEST_MIGRATE_HOST": "env-file-host",
]
)

#expect(r.positional == [
"-database=postgres://env-file-user:env-file-password@env-file-host:5432/app?sslmode=disable",
"up",
])
}

@Test("entrypoint arguments interpolate project environment")
func entrypointArgumentsInterpolateProjectEnvironment() {
let r = ComposeUp.entrypointAndCommandArgs(
entrypoint: ["${CC_TEST_MIGRATE_EXECUTABLE}", "${CC_TEST_MIGRATE_FLAG:-default-flag}"],
command: ["up"],
environmentVariables: ["CC_TEST_MIGRATE_EXECUTABLE": "/usr/local/bin/migrate"]
)

#expect(r.entrypointFlag == "/usr/local/bin/migrate")
#expect(r.positional == ["default-flag", "up"])
}

@Test("single-element entrypoint, no command → flag set, no positional")
func singleEntrypointNoCommand() {
let r = ComposeUp.entrypointAndCommandArgs(
Expand Down