Update to the new library APIs

Signed-off-by: Dirkjan Bussink <[email protected]>

Author: dbussink

go/cmd/vtclient/cli/vtclient.go

@@ -29,6 +29,7 @@ import (
 	"time"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -395,10 +396,11 @@ func (r *results) print(w io.Writer) {
 		return
 	}
 
-	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader(r.Fields)
-	table.SetAutoFormatHeaders(false)
-	table.AppendBulk(r.Rows)
+	table := tablewriter.NewTable(os.Stdout,
+		tablewriter.WithHeaderAutoFormat(tw.Off),
+	)
+	table.Header(r.Fields)
+	table.Bulk(r.Rows)
 	table.Render()
 	fmt.Fprintf(w, "%v row(s) affected (%v, cum: %v)\n", r.rowsAffected, r.duration, r.cumulativeDuration)
 	if r.lastInsertID != 0 {

go/cmd/vtctldclient/cli/query.go

@@ -20,6 +20,7 @@ import (
 	"io"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 
 	"vitess.io/vitess/go/sqltypes"
 )
@@ -31,15 +32,15 @@ func WriteQueryResultTable(w io.Writer, qr *sqltypes.Result) {
 		return
 	}
 
-	table := tablewriter.NewWriter(w)
-	table.SetAutoFormatHeaders(false)
-
+	table := tablewriter.NewTable(w,
+		tablewriter.WithHeaderAutoFormat(tw.Off),
+	)
 	header := make([]string, 0, len(qr.Fields))
 	for _, field := range qr.Fields {
 		header = append(header, field.Name)
 	}
 
-	table.SetHeader(header)
+	table.Header(header)
 
 	for _, row := range qr.Rows {
 		vals := make([]string, 0, len(row))

go/vt/wrangler/vexec_plan.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/sqlparser"
@@ -92,16 +93,19 @@ func (p vreplicationPlanner) dryRun(ctx context.Context) error {
 	p.vx.wr.Logger().Printf("Query: %s\nwill be run on the following streams in keyspace %s for workflow %s:\n\n",
 		p.vx.plannedQuery, p.vx.keyspace, p.vx.workflow)
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
-	table.SetHeader([]string{"Tablet", "ID", "BinLogSource", "State", "DBName", "Current GTID"})
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRendition(tw.Rendition{Settings: tw.Settings{Separators: tw.Separators{BetweenRows: tw.On}}}),
+		tablewriter.WithRowMergeMode(tw.MergeNone),
+	)
+
+	table.Header([]string{"Tablet", "ID", "BinLogSource", "State", "DBName", "Current GTID"})
 	for _, primary := range p.vx.primaries {
 		key := fmt.Sprintf("%s/%s", primary.Shard, primary.AliasString())
 		for _, stream := range rsr.ShardStatuses[key].PrimaryReplicationStatuses {
 			table.Append([]string{key, fmt.Sprintf("%d", stream.ID), stream.Bls.String(), stream.State, stream.DBName, stream.Pos})
 		}
 	}
-	table.SetAutoMergeCellsByColumnIndex([]int{0})
-	table.SetRowLine(true)
 	table.Render()
 	p.vx.wr.Logger().Printf(tableString.String())
 	p.vx.wr.Logger().Printf("\n\n")