Pass token and username only if set

loft-sh · Oct 8, 2024 · 942663a · 942663a
1 parent de72040
commit 942663a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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: