delete support multiple vars

Author: bahrmichael

cmd/src/abc_variables_delete.go

@@ -16,9 +16,15 @@ Examples:
   Delete a variable from a workflow instance:
 
 	    $ src abc QWdlbnRpY1dvcmtmbG93SW5zdGFuY2U6MQ== variables delete approval
+
+  Delete multiple variables in one request:
+
+	    $ src abc QWdlbnRpY1dvcmtmbG93SW5zdGFuY2U6MQ== variables delete --var approval --var checkpoints
 	`
 
 	flagSet := flag.NewFlagSet("delete", flag.ExitOnError)
+	var variableArgs abcVariableArgs
+	flagSet.Var(&variableArgs, "var", "Variable name to delete. Repeat to delete multiple variables.")
 	usageFunc := func() {
 		fmt.Fprintf(flag.CommandLine.Output(), "Usage of 'src abc <workflow-instance-id> variables %s':\n", flagSet.Name())
 		flagSet.PrintDefaults()
@@ -32,27 +38,39 @@ Examples:
 		}
 
 		instanceID := args[0]
+		variableArgs = nil
 		if err := flagSet.Parse(args[1:]); err != nil {
 			return err
 		}
-		if flagSet.NArg() != 1 {
-			return cmderrors.Usage("must provide exactly one variable name")
+
+		variableNames, err := parseABCVariableNames(flagSet.Args(), variableArgs)
+		if err != nil {
+			return err
+		}
+
+		variables := make([]map[string]string, 0, len(variableNames))
+		for _, key := range variableNames {
+			variables = append(variables, map[string]string{
+				"key":   key,
+				"value": "null",
+			})
 		}
 
-		key := flagSet.Arg(0)
 		client := cfg.apiClient(apiFlags, flagSet.Output())
-		if err := updateABCWorkflowInstanceVariables(context.Background(), client, instanceID, []map[string]string{{
-			"key":   key,
-			"value": "null",
-		}}); err != nil {
+		if err := updateABCWorkflowInstanceVariables(context.Background(), client, instanceID, variables); err != nil {
 			return err
 		}
 
 		if apiFlags.GetCurl() {
 			return nil
 		}
 
-		fmt.Printf("Removed variable %q from workflow instance %q.\n", key, instanceID)
+		if len(variableNames) == 1 {
+			fmt.Printf("Removed variable %q from workflow instance %q.\n", variableNames[0], instanceID)
+			return nil
+		}
+
+		fmt.Printf("Removed %d variables from workflow instance %q.\n", len(variableNames), instanceID)
 		return nil
 	}
 
@@ -62,3 +80,19 @@ Examples:
 		usageFunc: usageFunc,
 	})
 }
+
+func parseABCVariableNames(positional []string, flagged abcVariableArgs) ([]string, error) {
+	variableNames := append([]string{}, positional...)
+	variableNames = append(variableNames, flagged...)
+	if len(variableNames) == 0 {
+		return nil, cmderrors.Usage("must provide at least one variable name")
+	}
+
+	for _, name := range variableNames {
+		if name == "" {
+			return nil, cmderrors.Usage("variable names must not be empty")
+		}
+	}
+
+	return variableNames, nil
+}

cmd/src/abc_variables_delete_test.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/sourcegraph/src-cli/internal/cmderrors"
+)
+
+func TestParseABCVariableNames(t *testing.T) {
+	t.Parallel()
+
+	variableNames, err := parseABCVariableNames(
+		[]string{"approval"},
+		abcVariableArgs{"checkpoints", "prompt"},
+	)
+	if err != nil {
+		t.Fatalf("parseABCVariableNames returned error: %v", err)
+	}
+
+	if len(variableNames) != 3 {
+		t.Fatalf("len(variableNames) = %d, want 3", len(variableNames))
+	}
+	if variableNames[0] != "approval" || variableNames[1] != "checkpoints" || variableNames[2] != "prompt" {
+		t.Fatalf("variableNames = %#v, want [approval checkpoints prompt]", variableNames)
+	}
+}
+
+func TestParseABCVariableNamesRequiresAtLeastOneName(t *testing.T) {
+	t.Parallel()
+
+	_, err := parseABCVariableNames(nil, nil)
+	if err == nil {
+		t.Fatal("parseABCVariableNames returned nil error, want usage error")
+	}
+	if _, ok := err.(*cmderrors.UsageError); !ok {
+		t.Fatalf("parseABCVariableNames error = %T, want *cmderrors.UsageError", err)
+	}
+}
+
+func TestParseABCVariableNamesRejectsEmptyNames(t *testing.T) {
+	t.Parallel()
+
+	_, err := parseABCVariableNames([]string{"approval", ""}, nil)
+	if err == nil {
+		t.Fatal("parseABCVariableNames returned nil error, want usage error")
+	}
+	if _, ok := err.(*cmderrors.UsageError); !ok {
+		t.Fatalf("parseABCVariableNames error = %T, want *cmderrors.UsageError", err)
+	}
+}