🐛 Fix use of extra-args for command & arguments in rig deploy (#1271)

rigdev · Oct 10, 2024 · 0b124e5 · 0b124e5
1 parent 277ffb1
commit 0b124e5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cmd/rig/cmd/capsule/deploy/deploy.go b/cmd/rig/cmd/capsule/deploy/deploy.go
@@ -191,6 +191,12 @@ func (c *Cmd) deploy(ctx context.Context, cmd *cobra.Command, args []string) err
 }
 
 func (c *Cmd) getNewSpec(ctx context.Context, cmd *cobra.Command, args []string) (*platformv1.Capsule, error) {
+	var extraArgs []string
+	if cmd.ArgsLenAtDash() >= 0 {
+		extraArgs = args[cmd.ArgsLenAtDash():]
+		args = args[:cmd.ArgsLenAtDash()]
+	}
+
 	if file != "" {
 		if environmentVariables != nil ||
 			removeEnvironmentVariables != nil ||
@@ -453,8 +459,7 @@ func (c *Cmd) getNewSpec(ctx context.Context, cmd *cobra.Command, args []string)
 	}
 
 	// Command and arguments.
-	if idx := cmd.ArgsLenAtDash(); idx >= 0 {
-		extraArgs := args[idx:]
+	if extraArgs != nil {
 		if len(extraArgs) == 0 {
 			spec.Spec.Command = ""
 			spec.Spec.Args = nil