fix(cli): add validate args in delete command (argoproj#4142)

highb · Sep 29, 2020 · b3682d4 · b3682d4
1 parent 45fe517
commit b3682d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmd/argo/commands/delete.go b/cmd/argo/commands/delete.go
@@ -2,6 +2,7 @@ package commands
 
 import (
  "fmt"
+ "os"
 
  "github.com/argoproj/pkg/errors"
  "github.com/spf13/cobra"
@@ -34,6 +35,11 @@ func NewDeleteCommand() *cobra.Command {
  argo delete @latest
 `,
  Run: func(cmd *cobra.Command, args []string) {
+ if len(args) == 0 && !(all || allNamespaces || flags.completed || flags.resubmitted || flags.prefix != "" || flags.labels != "" || flags.finishedAfter != "") {
+ cmd.HelpFunc()(cmd, args)
+ os.Exit(1)
+ }
+
  ctx, apiClient := client.NewAPIClient()
  serviceClient := apiClient.NewWorkflowServiceClient()
  var workflows wfv1.Workflows

diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
@@ -414,7 +414,7 @@ func (s *CLISuite) TestWorkflowDeleteNothing() {
  When().
  SubmitWorkflow().
  RunCli([]string{"delete"}, func(t *testing.T, output string, err error) {
- if assert.NoError(t, err) {
+ if assert.EqualError(t, err, "exit status 1") {
  assert.NotContains(t, output, "deleted")
  }
  })