Use the parsed args

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

cmd/root/run.go

@@ -145,7 +145,7 @@ func (f *runExecFlags) runRunCommand(cmd *cobra.Command, args []string) (command
 	}
 
 	if f.sandbox {
-		return runInSandbox(ctx, &f.runConfig, f.sandboxTemplate)
+		return runInSandbox(ctx, args, &f.runConfig, f.sandboxTemplate)
 	}
 
 	out := cli.NewPrinter(cmd.OutOrStdout())

cmd/root/sandbox.go

@@ -20,7 +20,7 @@ import (
 // runInSandbox delegates the current command to a Docker sandbox.
 // It ensures a sandbox exists (creating or recreating as needed), then
 // executes docker agent inside it via `docker sandbox exec`.
-func runInSandbox(ctx context.Context, runConfig *config.RuntimeConfig, template string) error {
+func runInSandbox(ctx context.Context, args []string, runConfig *config.RuntimeConfig, template string) error {
 	if environment.InSandbox() {
 		return fmt.Errorf("already running inside a Docker sandbox (VM %s)", os.Getenv("SANDBOX_VM_ID"))
 	}
@@ -29,8 +29,12 @@ func runInSandbox(ctx context.Context, runConfig *config.RuntimeConfig, template
 		return err
 	}
 
+	var agentRef string
+	if len(args) > 0 {
+		agentRef = args[0]
+	}
+
 	dockerAgentArgs := sandbox.BuildCagentArgs(os.Args)
-	agentRef := sandbox.AgentRefFromArgs(dockerAgentArgs)
 	configDir := paths.GetConfigDir()
 
 	// Always forward config directory paths so the sandbox-side

pkg/sandbox/args.go

@@ -102,18 +102,6 @@ func isEqualsFormOf(arg string, flags map[string]bool) bool {
 	return false
 }
 
-// AgentRefFromArgs returns the first positional (non-flag) argument from the
-// docker-agent arg list, which is the agent file reference. Returns "" if there are
-// no positional arguments.
-func AgentRefFromArgs(args []string) string {
-	for _, a := range args {
-		if !strings.HasPrefix(a, "-") {
-			return a
-		}
-	}
-	return ""
-}
-
 // ResolveAlias returns the alias path if name is a user-defined alias,
 // or an empty string otherwise.
 func ResolveAlias(name string) string {

pkg/sandbox/sandbox_test.go

@@ -244,29 +244,6 @@ func TestBuildCagentArgs_ResolvesAlias(t *testing.T) {
 	assert.Equal(t, []string{"/path/to/dev.yaml", "--yolo"}, got)
 }
 
-func TestAgentRefFromArgs(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		args []string
-		want string
-	}{
-		{"file first", []string{"./agent.yaml", "--debug"}, "./agent.yaml"},
-		{"flags before file", []string{"--debug", "./agent.yaml"}, "./agent.yaml"},
-		{"no positional", []string{"--debug", "--yolo"}, ""},
-		{"empty", nil, ""},
-		{"built-in name", []string{"default"}, "default"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			assert.Equal(t, tt.want, sandbox.AgentRefFromArgs(tt.args))
-		})
-	}
-}
-
 func TestExtraWorkspace(t *testing.T) {
 	tests := []struct {
 		name     string