fix(cli): Rearrange the order of chunk size argument in list command. Closes #2420

cmd/argo/commands/list.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"log"
+	"math"
 	"os"
 	"sort"
 	"strings"
@@ -62,9 +63,6 @@ func NewListCommand() *cobra.Command {
 				labelSelector = labelSelector.Add(*req)
 			}
 			listOpts.LabelSelector = labelSelector.String()
-			if listArgs.chunkSize != 0 {
-				listOpts.Limit = listArgs.chunkSize
-			}
 
 			ctx, apiClient := client.NewAPIClient()
 			serviceClient := apiClient.NewWorkflowServiceClient()
@@ -121,6 +119,11 @@ func NewListCommand() *cobra.Command {
 			}
 			sort.Sort(workflows)
 
+			if listArgs.chunkSize != 0 {
+				idx := int64(math.Min(float64(listArgs.chunkSize), float64(len(workflows))))
+				workflows = workflows[0:idx]
+			}
+
 			switch listArgs.output {
 			case "", "wide":
 				printTable(workflows, &listArgs)

test/e2e/cli_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 	"testing"
 	"time"
 
@@ -180,13 +181,36 @@ func (s *CLISuite) TestRoot() {
 		})
 	})
 	s.Run("List", func() {
+		const rowCount = 1
+		for i := 0; i < rowCount*3; i++ {
+			s.Given().
+				Workflow("@smoke/basic-generate-name.yaml").
+				When().
+				SubmitWorkflow()
+		}
 		s.Given().RunCli([]string{"list"}, func(t *testing.T, output string, err error) {
 			if assert.NoError(t, err) {
 				assert.Contains(t, output, "NAME")
 				assert.Contains(t, output, "STATUS")
 				assert.Contains(t, output, "AGE")
 				assert.Contains(t, output, "DURATION")
 				assert.Contains(t, output, "PRIORITY")
+
+				// header + rowCount*3 workflows + empty line
+				assert.Equal(t, 5, len(strings.Split(output, "\n")))
+			}
+		})
+
+		s.Given().RunCli([]string{"list", "--chunk-size", "1"}, func(t *testing.T, output string, err error) {
+			if assert.NoError(t, err) {
+				assert.Contains(t, output, "NAME")
+				assert.Contains(t, output, "STATUS")
+				assert.Contains(t, output, "AGE")
+				assert.Contains(t, output, "DURATION")
+				assert.Contains(t, output, "PRIORITY")
+
+				// header + 1 workflow + empty line
+				assert.Equal(t, 3, len(strings.Split(output, "\n")))
 			}
 		})
 	})

test/e2e/smoke/basic-generate-name.yaml

@@ -0,0 +1,14 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: basic-
+  labels:
+    argo-e2e: true
+spec:
+  entrypoint: run-workflow
+  templates:
+    - name: run-workflow
+      container:
+        image: cowsay:v1
+        command: [cowsay, ":) Hello Argo!"]
+        imagePullPolicy: IfNotPresent