chore: move to generic tabwritter

Author: azrod

cmd/glctl/cmd/delete-link.go

@@ -39,14 +39,4 @@ var deleteLinkCmd = &cobra.Command{
 
 func init() {
 	deleteCmd.AddCommand(deleteLinkCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// linkCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// linkCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }

cmd/glctl/cmd/get-label.go

@@ -4,12 +4,9 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package glctl
 
 import (
-	"context"
-	"fmt"
 	"log"
-	"os"
-	"text/tabwriter"
 
+	"github.com/orange-cloudavenue/common-go/print"
 	"github.com/spf13/cobra"
 
 	"github.com/azrod/golink/models"
@@ -22,14 +19,9 @@ var getLabelCmd = &cobra.Command{
 	Short:   "Get labels",
 	Long:    `Return a list of labels or a single label by name or ID.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		initSDK()
-
+		sdk := initSDK()
 		sdk.SetNamespace(globalFlagNamespace)
 
-		// Create a new context with timeout
-		ctx, cancel := context.WithTimeout(context.Background(), globalTimeout())
-		defer cancel()
-
 		var labels []struct {
 			Label models.Label
 			Links []models.Link
@@ -38,7 +30,7 @@ var getLabelCmd = &cobra.Command{
 		if len(args) > 0 {
 			if models.IsValidUUID(args[0]) {
 				// Arg is not an ID, try to find the label by name
-				label, err := sdk.GetLabelByID(ctx, models.LabelID(args[0]))
+				label, err := sdk.GetLabelByID(cmd.Context(), models.LabelID(args[0]))
 				if err != nil {
 					log.Default().Printf("Failed to get label: %s", err)
 					return
@@ -49,7 +41,7 @@ var getLabelCmd = &cobra.Command{
 					Links []models.Link
 				}{Label: label})
 			} else {
-				label, err := sdk.GetLabelByName(ctx, args[0])
+				label, err := sdk.GetLabelByName(cmd.Context(), args[0])
 				if err != nil {
 					log.Default().Printf("Failed to get label: %s", err)
 					return
@@ -61,7 +53,7 @@ var getLabelCmd = &cobra.Command{
 				}{Label: label})
 			}
 		} else {
-			listLabels, err := sdk.GetLabels(ctx)
+			listLabels, err := sdk.GetLabels(cmd.Context())
 			if err != nil {
 				log.Default().Printf("Failed to get labels: %s", err)
 				return
@@ -75,36 +67,31 @@ var getLabelCmd = &cobra.Command{
 		}
 
 		for i, label := range labels {
-			links, err := sdk.GetLinksAssociatedToLabel(ctx, label.Label.ID)
+			links, err := sdk.GetLinksAssociatedToLabel(cmd.Context(), label.Label.ID)
 			if err != nil {
 				log.Default().Printf("Failed to get links associated with label: %s", err)
 				return
 			}
 			labels[i].Links = links
 		}
 
+		p := print.New()
+		defer p.PrintTable()
+
 		switch globalFlagOutput {
 		case globalFlagOutputShort:
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-			fs := "%s\t%s\n"
-			fmt.Fprintf(w, fs, "NAME", "LINKS")
+			p.SetHeader("NAME", "LINKS")
 
 			for _, l := range labels {
-				fmt.Fprintf(w, fs, l.Label.Name, fmt.Sprintf("%d", len(l.Links)))
+				p.AddFields(l.Label.Name, len(l.Links))
 			}
 
-			w.Flush()
-
 		case globalFlagOutputWide:
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-			fs := "%s\t%s\t%s\t%s\n"
-			fmt.Fprintf(w, fs, "ID", "NAME", "LINKS", "COLOR")
+			p.SetHeader("ID", "NAME", "LINKS", "COLOR")
 
 			for _, l := range labels {
-				fmt.Fprintf(w, fs, l.Label.ID, l.Label.Name, fmt.Sprintf("%d", len(l.Links)), l.Label.Color)
+				p.AddFields(l.Label.ID, l.Label.Name, len(l.Links), l.Label.Color)
 			}
-
-			w.Flush()
 		}
 	},
 }

cmd/glctl/cmd/get-link.go

@@ -4,11 +4,9 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package glctl
 
 import (
-	"fmt"
 	"log"
-	"os"
-	"text/tabwriter"
 
+	"github.com/orange-cloudavenue/common-go/print"
 	"github.com/spf13/cobra"
 
 	"github.com/azrod/golink/models"
@@ -69,29 +67,26 @@ var getLinkCmd = &cobra.Command{
 			}
 		}
 
+		p := print.New()
+		defer p.PrintTable()
+
 		switch globalFlagOutput {
 		case globalFlagOutputShort:
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-			fs := "%s\t%s\t%s\t%s\t%s\n"
-			fmt.Fprintf(w, fs, "NAMESPACE", "NAME", "PATH", "TARGET URL", "STATUS")
+			p.SetHeader("NAMESPACE", "NAME", "PATH", "TARGET URL", "STATUS")
 
 			for _, l := range links {
 				if len(l.TargetURL) > 50 {
 					l.TargetURL = l.TargetURL[:50] + "..."
 				}
-				fmt.Fprintf(w, fs, globalFlagNamespace, l.Name, l.SourcePath, l.TargetURL, l.Enabled.String())
+				p.AddFields(globalFlagNamespace, l.Name, l.SourcePath, l.TargetURL, l.Enabled)
 			}
-			w.Flush()
 
 		case globalFlagOutputWide:
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-			fs := "%s\t%s\t%s\t%s\t%s\t%s\n"
-			fmt.Fprintf(w, fs, "NAMESPACE", "NAME", "PATH", "TARGET URL", "STATUS", "LABELS")
+			p.SetHeader("NAMESPACE", "NAME", "PATH", "TARGET URL", "STATUS", "LABELS")
 
 			for _, l := range links {
-				fmt.Fprintf(w, fs, globalFlagNamespace, l.Name, l.SourcePath, l.TargetURL, l.Enabled.String(), l.Labels)
+				p.AddFields(globalFlagNamespace, l.Name, l.SourcePath, l.TargetURL, l.Enabled, l.Labels)
 			}
-			w.Flush()
 		}
 	},
 }

cmd/glctl/cmd/get-namespace.go

@@ -4,11 +4,9 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package glctl
 
 import (
-	"fmt"
 	"log"
-	"os"
-	"text/tabwriter"
 
+	"github.com/orange-cloudavenue/common-go/print"
 	"github.com/spf13/cobra"
 
 	"github.com/azrod/golink/models"
@@ -71,14 +69,12 @@ $> glctl get namespace [NAME] [NAME] [NAME]`,
 
 		switch globalFlagOutput {
 		case globalFlagOutputShort, globalFlagOutputWide:
-			w := tabwriter.NewWriter(os.Stdout, 10, 1, 5, ' ', 0)
-			fs := "%s\t%s\t%s\n"
-			fmt.Fprintf(w, fs, "NAME", "STATUS", "LINKS")
-
+			p := print.New()
+			p.SetHeader("NAME", "STATUS", "LINKS")
 			for _, l := range nss {
-				fmt.Fprintf(w, fs, l.Name, l.Enabled, fmt.Sprintf("%d", len(l.Links)))
+				p.AddFields(l.Name, l.Enabled, len(l.Links))
 			}
-			w.Flush()
+			p.PrintTable()
 		}
 	},
 }

cmd/glctl/cmd/update.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-*/
 package glctl
 
 import (

cmd/glctl/cmd/version.go

@@ -1,11 +1,7 @@
-/*
-Copyright © 2024 NAME HERE <EMAIL ADDRESS>
-*/
 package glctl
 
 import (
-	"log"
-
+	"github.com/orange-cloudavenue/common-go/print"
 	"github.com/spf13/cobra"
 )
 
@@ -21,17 +17,13 @@ var versionCmd = &cobra.Command{
 		// Ignore errors, we don't care if the server is not reachable
 		vServer, _ := sdk.GetVersion(cmd.Context())
 
-		log.Printf(`Client informations:
-  Version: %s
-  Commit: %s
-  Build Date: %s`,
-			version, commit, date)
+		p := print.New()
+		defer p.PrintTable()
+		p.SetHeader("Type", "Version", "Commit", "Build Date")
+		p.AddFields("Client", version, commit, date)
 
 		if vServer != "" {
-			log.Printf(`
-Server informations:
-  Version: %s
-`, vServer)
+			p.AddFields("Server", vServer, "", "")
 		}
 	},
 }

go.mod

@@ -44,6 +44,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/orange-cloudavenue/common-go/print v0.0.0-20240129085602-f04f55fc74ff // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect

go.sum

@@ -211,6 +211,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/num30/config v0.1.2 h1:FCH7WapA/YejX5EU8peeMNWrZDqfIF8JgaatR+Mxf1w=
 github.com/num30/config v0.1.2/go.mod h1:CIFhchwXwqNsgLneQ/ZVtPZUIQeKACWzqiYNdoisRks=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/orange-cloudavenue/common-go/print v0.0.0-20240129085602-f04f55fc74ff h1:8XNeH2ssPlKVauaHToG5EsfXLrtJXshvTg19NLPKzvs=
+github.com/orange-cloudavenue/common-go/print v0.0.0-20240129085602-f04f55fc74ff/go.mod h1:IYtCusqpEGS0dhC6F8X9GHrrt1gp1zHaNhSKGYV59Xg=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=