From 942663a9c44ab51101b330a2e5cc218a785e382e Mon Sep 17 00:00:00 2001 From: Jan Baraniewski Date: Thu, 3 Oct 2024 16:44:04 +0200 Subject: [PATCH] Pass token and username only if set --- pkg/devcontainer/crane/run.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/devcontainer/crane/run.go b/pkg/devcontainer/crane/run.go index d6a834774..66b774344 100644 --- a/pkg/devcontainer/crane/run.go +++ b/pkg/devcontainer/crane/run.go @@ -85,12 +85,15 @@ func PullConfigFromSource(workspaceInfo *provider2.AgentWorkspaceInfo, options * switch { case options.EnvironmentTemplate != "": - data, err = New(PullCommand). + command := New(PullCommand). WithArg(EnvironmentCrane). - WithArg(options.EnvironmentTemplate). - WithFlag("--git-username", options.GitOverrideUsername). - WithFlag("--git-token", options.GitOverrideToken). - Run() + WithArg(options.EnvironmentTemplate) + + if options.GitOverrideUsername != "" && options.GitOverrideToken != "" { + command = command.WithFlag("--git-username", options.GitOverrideUsername). + WithFlag("--git-token", options.GitOverrideToken) + } + data, err = command.Run() case options.DevContainerSource != "": data, err = New(PullCommand).WithArg(GitCrane).WithArg(options.DevContainerSource).Run() default: