Display tables using the less terminal pager (#25)

* Display tables using the less terminal pager * Review adjustments * Fix lint * Use command out instead of std out * Rename variable
stackitcloud · Nov 24, 2023 · 53fe3cb · 53fe3cb
1 parent bfe8432
commit 53fe3cb
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 8 deletions.
diff --git a/internal/cmd/dns/record-set/list/list.go b/internal/cmd/dns/record-set/list/list.go
@@ -70,7 +70,10 @@ func NewCmd() *cobra.Command {
 				rs := recordSets[i]
 				table.AddRow(*rs.Id, *rs.Name, *rs.Type, *rs.State)
 			}
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/cmd/dns/zone/list/list.go b/internal/cmd/dns/zone/list/list.go
@@ -68,7 +68,10 @@ func NewCmd() *cobra.Command {
 				z := zones[i]
 				table.AddRow(*z.Id, *z.Name, *z.DnsName, *z.State)
 			}
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/cmd/postgresql/credential/list/list.go b/internal/cmd/postgresql/credential/list/list.go
@@ -68,7 +68,10 @@ func NewCmd() *cobra.Command {
 				c := credentials[i]
 				table.AddRow(*c.Id)
 			}
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/cmd/postgresql/instance/list/list.go b/internal/cmd/postgresql/instance/list/list.go
@@ -65,7 +65,10 @@ func NewCmd() *cobra.Command {
 				instance := instances[i]
 				table.AddRow(*instance.InstanceId, *instance.Name, *instance.LastOperation.Type, *instance.LastOperation.State)
 			}
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/cmd/postgresql/offering/list/list.go b/internal/cmd/postgresql/offering/list/list.go
@@ -70,7 +70,10 @@ func NewCmd() *cobra.Command {
 				table.AddSeparator()
 			}
 			table.EnableAutoMergeOnColumns(1)
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/cmd/ske/cluster/list/list.go b/internal/cmd/ske/cluster/list/list.go
@@ -65,7 +65,10 @@ func NewCmd() *cobra.Command {
 				c := clusters[i]
 				table.AddRow(*c.Name, *c.Status.Aggregated)
 			}
-			table.Render(cmd)
+			err = table.Render(cmd)
+			if err != nil {
+				return fmt.Errorf("render table: %w", err)
+			}
 
 			return nil
 		},

diff --git a/internal/pkg/tables/tables.go b/internal/pkg/tables/tables.go
@@ -1,6 +1,10 @@
 package tables
 
 import (
+	"fmt"
+	"os/exec"
+	"strings"
+
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 )
@@ -42,11 +46,23 @@ func (t *Table) EnableAutoMergeOnColumns(columns ...int) {
 }
 
 // Renders the table
-func (t *Table) Render(cmd *cobra.Command) {
+func (t *Table) Render(cmd *cobra.Command) error {
 	t.table.SetStyle(table.StyleLight)
 	t.table.Style().Options.DrawBorder = false
 	t.table.Style().Options.SeparateRows = false
 	t.table.Style().Options.SeparateColumns = true
 	t.table.Style().Options.SeparateHeader = true
-	cmd.Printf("\n%s\n\n", t.table.Render())
+
+	renderedTable := fmt.Sprintf("\n%s\n\n", t.table.Render())
+
+	lessCmd := exec.Command("less", "-F", "-S", "-w")
+	lessCmd.Stdin = strings.NewReader(renderedTable)
+	lessCmd.Stdout = cmd.OutOrStdout()
+
+	err := lessCmd.Run()
+	if err != nil {
+		return fmt.Errorf("run less command: %w", err)
+	}
+
+	return nil
 }