fix: fixed table generation

Author: demeyerthom

.changes/unreleased/Fixed-20250704-113733.yaml

@@ -0,0 +1,3 @@
+kind: Fixed
+body: Fixed table generation
+time: 2025-07-04T11:37:33.635807967+02:00

internal/cmd/cloudcmd/api_client.go

@@ -61,11 +61,10 @@ var listApiClientCmd = &cobra.Command{
 			}
 		}
 
-		writeTable(os.Stdout,
+		return writeTable(os.Stdout,
 			[]string{"Created At", "ClientWrapper ID", "ClientWrapper Secret", "Last Used", "Description", "Scopes"},
 			data,
 		)
-		return nil
 	},
 }
 

internal/cmd/cloudcmd/component.go

@@ -78,11 +78,10 @@ var componentListCmd = &cobra.Command{
 			}
 		}
 
-		writeTable(os.Stdout,
+		return writeTable(os.Stdout,
 			[]string{"Created At", "Key"},
 			data,
 		)
-		return nil
 	},
 }
 
@@ -209,12 +208,10 @@ var componentListVersionCmd = &cobra.Command{
 			}
 		}
 
-		writeTable(os.Stdout,
+		return writeTable(os.Stdout,
 			[]string{"Created At", "Key"},
 			data,
 		)
-
-		return nil
 	},
 }
 
@@ -252,12 +249,10 @@ var componentDescribeVersionCmd = &cobra.Command{
 			}
 		}
 
-		writeTable(os.Stdout,
+		return writeTable(os.Stdout,
 			[]string{"Date", "Commit", "Author", "Message"},
 			data,
 		)
-
-		return nil
 	},
 }
 

internal/cmd/cloudcmd/organization.go

@@ -35,8 +35,7 @@ var listOrganizationCmd = &cobra.Command{
 				record.Key,
 			}
 		}
-		writeTable(os.Stdout, []string{"Created At", "Name", "Key"}, data)
-		return nil
+		return writeTable(os.Stdout, []string{"Created At", "Name", "Key"}, data)
 	},
 }
 

internal/cmd/cloudcmd/project.go

@@ -36,8 +36,7 @@ var listProjectCmd = &cobra.Command{
 				record.Key,
 			}
 		}
-		writeTable(os.Stdout, []string{"Created At", "Name", "Key"}, data)
-		return nil
+		return writeTable(os.Stdout, []string{"Created At", "Name", "Key"}, data)
 	},
 }
 

internal/cmd/cloudcmd/utils.go

@@ -1,12 +1,10 @@
 package cloudcmd
 
 import (
-	"fmt"
-	"io"
-	"os"
-
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/spf13/cobra"
+	"io"
 )
 
 func Must(err error) {
@@ -23,21 +21,17 @@ func MustGetString(cmd *cobra.Command, key string) string {
 	return value
 }
 
-func writeTable(writer io.Writer, header []string, data [][]string) {
-	table := tablewriter.NewWriter(os.Stdout)
-	table.SetAutoWrapText(false)
-	table.SetAutoFormatHeaders(true)
-	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
-	table.SetAlignment(tablewriter.ALIGN_LEFT)
-	table.SetCenterSeparator("")
-	table.SetColumnSeparator("")
-	table.SetRowSeparator("-")
-	table.SetHeaderLine(true)
-	table.SetBorder(true)
-	table.SetTablePadding("\t") // pad with tabs
-	table.SetNoWhiteSpace(true)
-	table.SetHeader(header)
-	table.AppendBulk(data)
-	table.Render() // Send output
-	fmt.Println()
+func writeTable(writer io.Writer, header []string, data [][]string) error {
+	table := tablewriter.NewWriter(writer)
+	table.Configure(func(cfg *tablewriter.Config) {
+		cfg.Row.Formatting.AutoWrap = tw.WrapNone
+		cfg.Header.Formatting.AutoFormat = tw.On
+		cfg.Header.Alignment.Global = tw.AlignLeft
+		cfg.Row.Alignment.Global = tw.AlignLeft
+		cfg.Behavior.TrimSpace = tw.On
+	})
+	table.Header(header)
+	_ = table.Bulk(data)
+
+	return table.Render()
 }