fix: Fix delete --complete (#3278)

argoproj · Jun 25, 2020 · a91cea5 · a91cea5
1 parent d5a4807
commit a91cea5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/cmd/argo/commands/delete.go b/cmd/argo/commands/delete.go
@@ -30,6 +30,7 @@ func NewDeleteCommand() *cobra.Command {
   argo delete my-wf
 
 # Delete the latest workflow:
+
   argo delete @latest
 `,
 		Run: func(cmd *cobra.Command, args []string) {

diff --git a/cmd/argo/commands/list.go b/cmd/argo/commands/list.go
@@ -79,7 +79,8 @@ func listWorkflows(ctx context.Context, serviceClient workflowpkg.WorkflowServic
 	listOpts := &metav1.ListOptions{
 		Limit: flags.chunkSize,
 	}
-	labelSelector := labels.NewSelector()
+	labelSelector, err := labels.Parse(flags.labels)
+	errors.CheckError(err)
 	if len(flags.status) != 0 {
 		req, _ := labels.NewRequirement(common.LabelKeyPhase, selection.In, flags.status)
 		if req != nil {
@@ -94,10 +95,7 @@ func listWorkflows(ctx context.Context, serviceClient workflowpkg.WorkflowServic
 		req, _ := labels.NewRequirement(common.LabelKeyCompleted, selection.NotEquals, []string{"true"})
 		labelSelector = labelSelector.Add(*req)
 	}
-	if listOpts.LabelSelector = labelSelector.String(); listOpts.LabelSelector != "" {
-		listOpts.LabelSelector = listOpts.LabelSelector + ","
-	}
-	listOpts.LabelSelector = listOpts.LabelSelector + flags.labels
+	listOpts.LabelSelector = labelSelector.String()
 	listOpts.FieldSelector = flags.fields
 	var workflows wfv1.Workflows
 	for {

diff --git a/cmd/argo/commands/list_test.go b/cmd/argo/commands/list_test.go
@@ -15,20 +15,26 @@ import (
 )
 
 func Test_listWorkflows(t *testing.T) {
+	t.Run("Nothing", func(t *testing.T) {
+		workflows, err := list(&metav1.ListOptions{}, listFlags{})
+		if assert.NoError(t, err) {
+			assert.NotNil(t, workflows)
+		}
+	})
 	t.Run("Status", func(t *testing.T) {
-		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/phase in (Pending,Running),"}, listFlags{status: []string{"Running", "Pending"}})
+		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/phase in (Pending,Running)"}, listFlags{status: []string{"Running", "Pending"}})
 		if assert.NoError(t, err) {
 			assert.NotNil(t, workflows)
 		}
 	})
 	t.Run("Completed", func(t *testing.T) {
-		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/completed=true,"}, listFlags{completed: true})
+		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/completed=true"}, listFlags{completed: true})
 		if assert.NoError(t, err) {
 			assert.NotNil(t, workflows)
 		}
 	})
 	t.Run("Running", func(t *testing.T) {
-		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/completed!=true,"}, listFlags{running: true})
+		workflows, err := list(&metav1.ListOptions{LabelSelector: "workflows.argoproj.io/completed!=true"}, listFlags{running: true})
 		if assert.NoError(t, err) {
 			assert.NotNil(t, workflows)
 		}

diff --git a/server/workflow/workflow_server.go b/server/workflow/workflow_server.go
@@ -391,7 +391,7 @@ func (s *workflowServer) getWorkflow(wfClient versioned.Interface, namespace str
 		if err != nil {
 			return nil, err
 		}
-		log.Infof("Resolved alias %s to workflow %s.\n", latestAlias, latest.Name)
+		log.Debugf("Resolved alias %s to workflow %s.\n", latestAlias, latest.Name)
 		return latest, nil
 	}
 	wf, err := wfClient.ArgoprojV1alpha1().Workflows(namespace).Get(name, options)