cli: Fix panic in task cancel when no task id given as arg

Fixes #4016
hashicorp · Oct 10, 2022 · eb665e3 · eb665e3
1 parent 9650815
commit eb665e3
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/internal/cli/task_cancel.go b/internal/cli/task_cancel.go
@@ -26,13 +26,15 @@ func (c *TaskCancelCommand) Run(args []string) int {
 	}
 	ctx := c.Ctx
 
-	if len(c.args) == 0 && c.flagRunJobId == "" {
-		c.ui.Output("Task ID or Run Job Id required.\n\n%s", c.Help(), terminal.WithErrorStyle())
-		return 1
+	var taskId string
+	if len(c.args) > 0 {
+		taskId = c.args[0]
 	}
-	taskId := c.args[0]
 
-	if c.flagRunJobId != "" && taskId != "" {
+	if taskId == "" && c.flagRunJobId == "" {
+		c.ui.Output("Task ID or Run Job Id required.\n\n%s", c.Help(), terminal.WithErrorStyle())
+		return 1
+	} else if c.flagRunJobId != "" && taskId != "" {
 		c.ui.Output("Both Run Job Id and Task Id was supplied, will look up by Task Id", terminal.WithWarningStyle())
 	}