Add table-view support for CLI list commands

tools/cli/adminCommands.go

@@ -427,11 +427,22 @@ func AdminListTasks(c *cli.Context) {
 
 	if category == enumsgenpb.TASK_CATEGORY_TRANSFER {
 		req := &persistence.GetTransferTasksRequest{}
-		tasks, err := executionManager.GetTransferTasks(req)
-		if err != nil {
-			ErrorAndExit("Failed to get Transfer Tasks", err)
+
+		paginationFunc := func(paginationToken []byte) ([]interface{}, []byte, error) {
+			req.NextPageToken = paginationToken
+			response, err := executionManager.GetTransferTasks(req)
+			if err != nil {
+				return nil, nil, err
+			}
+			token := response.NextPageToken
+
+			var items []interface{}
+			for _, task := range response.Tasks {
+				items = append(items, task)
+			}
+			return items, token, nil
 		}
-		prettyPrintJSONObject(tasks)
+		paginate(c, paginationFunc)
 	} else if category == enumsgenpb.TASK_CATEGORY_TIMER {
 		minVisFlag := parseTime(c.String(FlagMinVisibilityTimestamp), 0, time.Now())
 		minVis := time.Unix(0, minVisFlag)
@@ -456,11 +467,21 @@ func AdminListTasks(c *cli.Context) {
 		paginate(c, paginationFunc)
 	} else if category == enumsgenpb.TASK_CATEGORY_REPLICATION {
 		req := &persistence.GetReplicationTasksRequest{}
-		task, err := executionManager.GetReplicationTasks(req)
-		if err != nil {
-			ErrorAndExit("Failed to get Replication Tasks", err)
+		paginationFunc := func(paginationToken []byte) ([]interface{}, []byte, error) {
+			req.NextPageToken = paginationToken
+			response, err := executionManager.GetReplicationTasks(req)
+			if err != nil {
+				return nil, nil, err
+			}
+			token := response.NextPageToken
+
+			var items []interface{}
+			for _, task := range response.Tasks {
+				items = append(items, task)
+			}
+			return items, token, nil
 		}
-		prettyPrintJSONObject(task)
+		paginate(c, paginationFunc)
 	} else {
 		ErrorAndExit("Failed to describe task", fmt.Errorf("Unrecognized task type, task_type=%v", category))
 	}

tools/cli/util.go

@@ -43,6 +43,7 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/gogo/protobuf/proto"
+	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli"
 	"github.com/valyala/fastjson"
 	commonpb "go.temporal.io/temporal-proto/common/v1"
@@ -904,25 +905,73 @@ func showNextPage() bool {
 // paginate creates an interactive CLI mode to control the printing of items
 func paginate(c *cli.Context, paginationFn collection.PaginationFn) error {
 	more := c.Bool(FlagMore)
+	isTableView := !c.Bool(FlagPrintJSON)
 	pageSize := c.Int(FlagPageSize)
 	if pageSize == 0 {
 		pageSize = defaultPageSize
 	}
 	iter := collection.NewPagingIterator(paginationFn)
 
-	pageItemsCount := 0
+	var pageItems []interface{}
 	for iter.HasNext() {
-		batch, err := iter.Next()
+		item, err := iter.Next()
 		if err != nil {
 			return err
 		}
 
-		prettyPrintJSONObject(batch)
-		pageItemsCount++
-		if pageItemsCount%pageSize == 0 && (!more || !showNextPage()) {
-			break
+		pageItems = append(pageItems, item)
+		if len(pageItems) == pageSize || !iter.HasNext() {
+			if isTableView {
+				printTable(pageItems)
+			} else {
+				prettyPrintJSONObject(pageItems)
+			}
+
+			if !more || !showNextPage() {
+				break
+			}
+			pageItems = pageItems[:0]
+		}
+	}
+
+	return nil
+}
+
+func printTable(items []interface{}) error {
+	if len(items) == 0 {
+		return nil
+	}
+
+	e := reflect.ValueOf(items[0])
+	for e.Type().Kind() == reflect.Ptr {
+		e = e.Elem()
+	}
+
+	var fields []string
+	t := e.Type()
+	for i := 0; i < e.NumField(); i++ {
+		fields = append(fields, t.Field(i).Name)
+	}
+
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetBorder(false)
+	table.SetColumnSeparator("|")
+	table.SetHeader(fields)
+	table.SetHeaderLine(false)
+	for i := 0; i < len(items); i++ {
+		item := reflect.ValueOf(items[i])
+		for item.Type().Kind() == reflect.Ptr {
+			item = item.Elem()
+		}
+		var columns []string
+		for j := 0; j < len(fields); j++ {
+			col := item.Field(j)
+			columns = append(columns, fmt.Sprintf("%v", col.Interface()))
 		}
+		table.Append(columns)
 	}
+	table.Render()
+	table.ClearRows()
 
 	return nil
 }