fix build errors after tablewriter bump to v1.1.4

dangra · dangra · commit 75f528ef7c67 · 2026-04-09T11:51:23.000-03:00
Migrate from the removed v0.0.5 setter API (SetHeader, SetBorder,
SetAlignment, etc.) to the new v1.1.4 configuration-driven API using
Options, Configure, WithRendition, and WithHeader.
diff --git a/cmd/audit/lint.go b/cmd/audit/lint.go
@@ -9,6 +9,7 @@ import (
 	"unicode"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/superfly/flyctl/internal/command/root"
@@ -22,21 +23,22 @@ func newLintCmd() *cobra.Command {
 			root := root.New()
 			run := NewCheckRun(root)
 
-			table := tablewriter.NewWriter(os.Stdout)
-			table.SetBorder(false)
-			table.SetAutoWrapText(false)
-			table.SetHeader([]string{"Path", "Check", "Failure Reason"})
+			table := tablewriter.NewTable(os.Stdout,
+				tablewriter.WithHeader([]string{"Path", "Check", "Failure Reason"}),
+				tablewriter.WithRendition(tw.Rendition{
+					Borders: tw.Border{Left: tw.Off, Right: tw.Off, Top: tw.Off, Bottom: tw.Off},
+				}),
+			)
+			table.Configure(func(cfg *tablewriter.Config) {
+				cfg.Row.Formatting.AutoWrap = tw.WrapNone
+			})
 
 			errors := run.Run()
 			for _, err := range errors {
-				table.Append([]string{
-					err.command,
-					err.check,
-					err.Error(),
-				})
+				table.Append(err.command, err.check, err.Error()) //nolint:errcheck
 			}
 
-			table.Render()
+			table.Render() //nolint:errcheck
 
 			fmt.Println()
 			fmt.Printf("%d checks failed\n", len(errors))
diff --git a/cmd/audit/output.go b/cmd/audit/output.go
@@ -7,6 +7,7 @@ import (
 	"io"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 )
 
 func newOutput(w io.Writer, format string) output {
@@ -25,23 +26,38 @@ type output interface {
 }
 
 func NewTableOutput(w io.Writer) *tableOutput {
-	t := tablewriter.NewWriter(w)
-	t.SetBorder(false)
-	t.SetAutoWrapText(false)
+	t := tablewriter.NewTable(w,
+		tablewriter.WithRendition(tw.Rendition{
+			Borders: tw.Border{Left: tw.Off, Right: tw.Off, Top: tw.Off, Bottom: tw.Off},
+		}),
+	)
+	t.Configure(func(cfg *tablewriter.Config) {
+		cfg.Row.Formatting.AutoWrap = tw.WrapNone
+	})
 
 	return &tableOutput{
-		Table: t,
+		table: t,
 	}
 }
 
 type tableOutput struct {
-	*tablewriter.Table
+	table *tablewriter.Table
 }
 
-func (t *tableOutput) Flush() error {
-	t.Render()
+func (t *tableOutput) SetHeader(header []string) {
+	t.table.Options(tablewriter.WithHeader(header))
+}
+
+func (t *tableOutput) Append(row []string) {
+	args := make([]interface{}, len(row))
+	for i, v := range row {
+		args[i] = v
+	}
+	t.table.Append(args...) //nolint:errcheck
+}
 
-	return nil
+func (t *tableOutput) Flush() error {
+	return t.table.Render()
 }
 
 func NewCSVOutput(w io.Writer) *csvOutput {
diff --git a/helpers/tablehelper.go b/helpers/tablehelper.go
@@ -4,25 +4,22 @@ import (
 	"io"
 
 	tablewriter "github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 )
 
 func MakeSimpleTable(out io.Writer, headings []string) (table *tablewriter.Table) {
-	newtable := tablewriter.NewWriter(out)
-	// Future code to turn headers bold
-	// headercolors := []tablewriter.Colors{}
-	// for range headings {
-	// 	headercolors = append(headercolors, tablewriter.Colors{tablewriter.Bold})
-	// }
-	newtable.SetHeader(headings)
-	newtable.SetHeaderLine(true)
-	newtable.SetBorder(false)
-	newtable.SetAutoFormatHeaders(true)
-	newtable.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
-	newtable.SetAlignment(tablewriter.ALIGN_LEFT)
-	newtable.SetTablePadding(" ")
-	newtable.SetCenterSeparator("*")
-	newtable.SetRowSeparator("-")
-	newtable.SetAutoWrapText(false)
+	newtable := tablewriter.NewTable(out,
+		tablewriter.WithHeader(headings),
+		tablewriter.WithHeaderAlignment(tw.AlignLeft),
+		tablewriter.WithRowAlignment(tw.AlignLeft),
+		tablewriter.WithRendition(tw.Rendition{
+			Borders: tw.Border{Left: tw.Off, Right: tw.Off, Top: tw.Off, Bottom: tw.Off},
+		}),
+	)
+	newtable.Configure(func(cfg *tablewriter.Config) {
+		cfg.Header.Formatting.AutoFormat = tw.On
+		cfg.Row.Formatting.AutoWrap = tw.WrapNone
+	})
 
 	return newtable
 }
diff --git a/internal/command/checks/list.go b/internal/command/checks/list.go
@@ -45,7 +45,6 @@ func runAppCheckList(ctx context.Context) error {
 
 	fmt.Fprintf(out, "Health Checks for %s\n", appName)
 	table := helpers.MakeSimpleTable(out, []string{"Name", "Status", "Machine", "Last Updated", "Output"})
-	table.SetRowLine(true)
 	for _, machine := range machines {
 		sort.Slice(machine.Checks, func(i, j int) bool {
 			return machine.Checks[i].Name < machine.Checks[j].Name
@@ -55,10 +54,10 @@ func runAppCheckList(ctx context.Context) error {
 			if nameFilter != "" && nameFilter != check.Name {
 				continue
 			}
-			table.Append([]string{check.Name, string(check.Status), machine.ID, format.RelativeTime(*check.UpdatedAt), check.Output})
+			table.Append(check.Name, string(check.Status), machine.ID, format.RelativeTime(*check.UpdatedAt), check.Output) //nolint:errcheck
 		}
 	}
-	table.Render()
+	table.Render() //nolint:errcheck
 
 	return nil
 }
diff --git a/internal/command/deploy/machines_deploymachinesapp.go b/internal/command/deploy/machines_deploymachinesapp.go
@@ -1301,10 +1301,10 @@ func (md *machineDeployment) warnAboutIncorrectListenAddress(ctx context.Context
 			}
 		}
 		if len(addresses) > 0 {
-			table.Append([]string{proc.Command, strings.Join(addresses, ", ")})
+			table.Append(proc.Command, strings.Join(addresses, ", ")) //nolint:errcheck
 		}
 	}
-	table.Render()
+	table.Render() //nolint:errcheck
 	fmt.Fprintf(md.io.ErrOut, "\n")
 }
 
diff --git a/internal/command/incidents/hosts/list.go b/internal/command/incidents/hosts/list.go
@@ -61,11 +61,10 @@ func runList(ctx context.Context) (err error) {
 	if appHostIssuesCount > 0 {
 		fmt.Fprintf(out, "Host Issues count: %d\n\n", appHostIssuesCount)
 		table := helpers.MakeSimpleTable(out, []string{"Id", "Message", "Started At", "Last Updated"})
-		table.SetRowLine(true)
 		for _, appHostIssue := range appHostIssues {
-			table.Append([]string{appHostIssue.InternalId, appHostIssue.Message, appHostIssue.CreatedAt.String(), appHostIssue.UpdatedAt.String()})
+			table.Append(appHostIssue.InternalId, appHostIssue.Message, appHostIssue.CreatedAt.String(), appHostIssue.UpdatedAt.String()) //nolint:errcheck
 		}
-		table.Render()
+		table.Render() //nolint:errcheck
 	} else {
 		fmt.Fprintf(out, "There are no active host issues\n")
 	}
diff --git a/internal/command/incidents/incidents.go b/internal/command/incidents/incidents.go
@@ -66,15 +66,14 @@ func runIncidentsList(ctx context.Context) error {
 	if incidentCount > 0 {
 		fmt.Fprintf(out, "Incidents count: %d\n\n", incidentCount)
 		table := helpers.MakeSimpleTable(out, []string{"Id", "Name", "Status", "Components", "Started At", "Last Updated"})
-		table.SetRowLine(true)
 		for _, incident := range statuspageIncidents.Incidents {
 			var components []string
 			for _, component := range incident.Components {
 				components = append(components, component.Name)
 			}
-			table.Append([]string{incident.ID, incident.Name, incident.Status, strings.Join(components, ", "), incident.StartedAt, incident.UpdatedAt})
+			table.Append(incident.ID, incident.Name, incident.Status, strings.Join(components, ", "), incident.StartedAt, incident.UpdatedAt) //nolint:errcheck
 		}
-		table.Render()
+		table.Render() //nolint:errcheck
 	} else {
 		fmt.Fprintf(out, "There are no active incidents\n")
 	}
diff --git a/internal/command/orgs/show.go b/internal/command/orgs/show.go
@@ -73,13 +73,14 @@ func runShow(ctx context.Context) (err error) {
 
 	fmt.Fprintln(&buf, colorize.Bold("Organization Members"))
 
-	membertable := tablewriter.NewWriter(&buf)
-	membertable.SetHeader([]string{"Name", "Email", "Role"})
+	membertable := tablewriter.NewTable(&buf,
+		tablewriter.WithHeader([]string{"Name", "Email", "Role"}),
+	)
 
 	for _, m := range org.Members.Edges {
-		membertable.Append([]string{m.Node.Name, m.Node.Email, m.Role})
+		membertable.Append(m.Node.Name, m.Node.Email, m.Role) //nolint:errcheck
 	}
-	membertable.Render()
+	membertable.Render() //nolint:errcheck
 
 	buf.WriteTo(io.Out)
 
diff --git a/internal/command/root/root.go b/internal/command/root/root.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/kr/text"
-	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/spf13/cobra"
 
 	"github.com/superfly/flyctl/flyctl"
@@ -232,7 +232,7 @@ func run(ctx context.Context) error {
 		if err != nil {
 			panic(err)
 		}
-		cmd.Printf("  %s %s\n", tablewriter.PadRight(c.CommandPath(), " ", 16), c.Short)
+		cmd.Printf("  %s %s\n", tw.PadRight(c.CommandPath(), " ", 16), c.Short)
 	}
 
 	cmd.Println()
diff --git a/internal/command/ssh/log.go b/internal/command/ssh/log.go
@@ -54,12 +54,9 @@ func runLog(ctx context.Context) (err error) {
 		return nil
 	}
 
-	table := tablewriter.NewWriter(out)
-
-	table.SetHeader([]string{
-		"Root",
-		"Certificate",
-	})
+	table := tablewriter.NewTable(out,
+		tablewriter.WithHeader([]string{"Root", "Certificate"}),
+	)
 
 	for _, cert := range certs {
 		root := "no"
@@ -72,7 +69,7 @@ func runLog(ctx context.Context) (err error) {
 		for i, ch := range cert.Cert {
 			buf.WriteRune(ch)
 			if i%60 == 0 && i != 0 {
-				table.Append([]string{root, buf.String()})
+				table.Append(root, buf.String()) //nolint:errcheck
 				if first {
 					root = ""
 					first = false
@@ -82,11 +79,11 @@ func runLog(ctx context.Context) (err error) {
 		}
 
 		if buf.Len() != 0 {
-			table.Append([]string{root, buf.String()})
+			table.Append(root, buf.String()) //nolint:errcheck
 		}
 	}
 
-	table.Render()
+	table.Render() //nolint:errcheck
 
 	return nil
 }
diff --git a/internal/command/volumes/snapshots/list.go b/internal/command/volumes/snapshots/list.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/spf13/cobra"
 	"github.com/superfly/flyctl/internal/appconfig"
 	"github.com/superfly/flyctl/internal/command"
@@ -118,15 +119,17 @@ func runList(ctx context.Context) error {
 	}
 
 	table := render.NewTable(io.Out, "Snapshots", rows, "ID", "Status", "Stored Size", "Vol Size", "Created At", "Retention Days")
-	table.SetColumnAlignment([]int{
-		tablewriter.ALIGN_DEFAULT, // ID
-		tablewriter.ALIGN_DEFAULT, // Status
-		tablewriter.ALIGN_RIGHT,   // Stored Size
-		tablewriter.ALIGN_RIGHT,   // Vol Size
-		tablewriter.ALIGN_DEFAULT, // Created At
-		tablewriter.ALIGN_RIGHT,   // Retention Days
-	})
-	table.Render()
+	table.Options(tablewriter.WithRowAlignmentConfig(tw.CellAlignment{
+		PerColumn: []tw.Align{
+			tw.AlignDefault, // ID
+			tw.AlignDefault, // Status
+			tw.AlignRight,   // Stored Size
+			tw.AlignRight,   // Vol Size
+			tw.AlignDefault, // Created At
+			tw.AlignRight,   // Retention Days
+		},
+	}))
+	table.Render() //nolint:errcheck
 
 	fmt.Fprintf(io.Out, "\nTotal stored size: %s\n", humanize.IBytes(totalStoredSize))
 
diff --git a/internal/command/wireguard/tokens.go b/internal/command/wireguard/tokens.go
@@ -39,12 +39,13 @@ func runWireguardTokenList(ctx context.Context) error {
 		return nil
 	}
 
-	table := tablewriter.NewWriter(io.Out)
-	table.SetHeader([]string{"Name"})
+	table := tablewriter.NewTable(io.Out,
+		tablewriter.WithHeader([]string{"Name"}),
+	)
 	for _, peer := range tokens {
-		table.Append([]string{peer.Name})
+		table.Append(peer.Name) //nolint:errcheck
 	}
-	table.Render()
+	table.Render() //nolint:errcheck
 
 	return nil
 }
diff --git a/internal/command/wireguard/wireguard.go b/internal/command/wireguard/wireguard.go
@@ -40,19 +40,15 @@ func runWireguardList(ctx context.Context) error {
 		return nil
 	}
 
-	table := tablewriter.NewWriter(io.Out)
-
-	table.SetHeader([]string{
-		"Name",
-		"Region",
-		"Peer IP",
-	})
+	table := tablewriter.NewTable(io.Out,
+		tablewriter.WithHeader([]string{"Name", "Region", "Peer IP"}),
+	)
 
 	for _, peer := range peers {
-		table.Append([]string{peer.Name, peer.Region, peer.Peerip})
+		table.Append(peer.Name, peer.Region, peer.Peerip) //nolint:errcheck
 	}
 
-	table.Render()
+	table.Render() //nolint:errcheck
 
 	return nil
 }
diff --git a/internal/render/render.go b/internal/render/render.go

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ func runAppCheckList(ctx context.Context) error {`
`45`	`45`
`46`	`46`	`fmt.Fprintf(out, "Health Checks for %s\n", appName)`
`47`	`47`	`table := helpers.MakeSimpleTable(out, []string{"Name", "Status", "Machine", "Last Updated", "Output"})`
`48`		`- table.SetRowLine(true)`
`49`	`48`	`for _, machine := range machines {`
`50`	`49`	`sort.Slice(machine.Checks, func(i, j int) bool {`
`51`	`50`	`return machine.Checks[i].Name < machine.Checks[j].Name`
`@@ -55,10 +54,10 @@ func runAppCheckList(ctx context.Context) error {`
`55`	`54`	`if nameFilter != "" && nameFilter != check.Name {`
`56`	`55`	`continue`
`57`	`56`	`}`
`58`		`- table.Append([]string{check.Name, string(check.Status), machine.ID, format.RelativeTime(*check.UpdatedAt), check.Output})`
	`57`	`+ table.Append(check.Name, string(check.Status), machine.ID, format.RelativeTime(*check.UpdatedAt), check.Output) //nolint:errcheck`
`59`	`58`	`}`
`60`	`59`	`}`
`61`		`- table.Render()`
	`60`	`+ table.Render() //nolint:errcheck`
`62`	`61`
`63`	`62`	`return nil`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1301,10 +1301,10 @@ func (md *machineDeployment) warnAboutIncorrectListenAddress(ctx context.Context`
`1301`	`1301`	`}`
`1302`	`1302`	`}`
`1303`	`1303`	`if len(addresses) > 0 {`
`1304`		`- table.Append([]string{proc.Command, strings.Join(addresses, ", ")})`
	`1304`	`+ table.Append(proc.Command, strings.Join(addresses, ", ")) //nolint:errcheck`
`1305`	`1305`	`}`
`1306`	`1306`	`}`
`1307`		`- table.Render()`
	`1307`	`+ table.Render() //nolint:errcheck`
`1308`	`1308`	`fmt.Fprintf(md.io.ErrOut, "\n")`
`1309`	`1309`	`}`
`1310`	`1310`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,10 @@ func runList(ctx context.Context) (err error) {`
`61`	`61`	`if appHostIssuesCount > 0 {`
`62`	`62`	`fmt.Fprintf(out, "Host Issues count: %d\n\n", appHostIssuesCount)`
`63`	`63`	`table := helpers.MakeSimpleTable(out, []string{"Id", "Message", "Started At", "Last Updated"})`
`64`		`- table.SetRowLine(true)`
`65`	`64`	`for _, appHostIssue := range appHostIssues {`
`66`		`- table.Append([]string{appHostIssue.InternalId, appHostIssue.Message, appHostIssue.CreatedAt.String(), appHostIssue.UpdatedAt.String()})`
	`65`	`+ table.Append(appHostIssue.InternalId, appHostIssue.Message, appHostIssue.CreatedAt.String(), appHostIssue.UpdatedAt.String()) //nolint:errcheck`
`67`	`66`	`}`
`68`		`- table.Render()`
	`67`	`+ table.Render() //nolint:errcheck`
`69`	`68`	`} else {`
`70`	`69`	`fmt.Fprintf(out, "There are no active host issues\n")`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,14 @@ func runIncidentsList(ctx context.Context) error {`
`66`	`66`	`if incidentCount > 0 {`
`67`	`67`	`fmt.Fprintf(out, "Incidents count: %d\n\n", incidentCount)`
`68`	`68`	`table := helpers.MakeSimpleTable(out, []string{"Id", "Name", "Status", "Components", "Started At", "Last Updated"})`
`69`		`- table.SetRowLine(true)`
`70`	`69`	`for _, incident := range statuspageIncidents.Incidents {`
`71`	`70`	`var components []string`
`72`	`71`	`for _, component := range incident.Components {`
`73`	`72`	`components = append(components, component.Name)`
`74`	`73`	`}`
`75`		`- table.Append([]string{incident.ID, incident.Name, incident.Status, strings.Join(components, ", "), incident.StartedAt, incident.UpdatedAt})`
	`74`	`+ table.Append(incident.ID, incident.Name, incident.Status, strings.Join(components, ", "), incident.StartedAt, incident.UpdatedAt) //nolint:errcheck`
`76`	`75`	`}`
`77`		`- table.Render()`
	`76`	`+ table.Render() //nolint:errcheck`
`78`	`77`	`} else {`
`79`	`78`	`fmt.Fprintf(out, "There are no active incidents\n")`
`80`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"path/filepath"`
`9`	`9`
`10`	`10`	`"github.com/kr/text"`
`11`		`- "github.com/olekukonko/tablewriter"`
	`11`	`+ "github.com/olekukonko/tablewriter/tw"`
`12`	`12`	`"github.com/spf13/cobra"`
`13`	`13`
`14`	`14`	`"github.com/superfly/flyctl/flyctl"`
`@@ -232,7 +232,7 @@ func run(ctx context.Context) error {`
`232`	`232`	`if err != nil {`
`233`	`233`	`panic(err)`
`234`	`234`	`}`
`235`		`- cmd.Printf(" %s %s\n", tablewriter.PadRight(c.CommandPath(), " ", 16), c.Short)`
	`235`	`+ cmd.Printf(" %s %s\n", tw.PadRight(c.CommandPath(), " ", 16), c.Short)`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`cmd.Println()`