Skip to content

Commit cc9f26b

Browse files
authored
chore(deps): update tablewriter dependency (#572)
* chore(deps): go get tablewriter v1.0.8 Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com> * fix(tablewriter): update tablewriter to the new api Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com> --------- Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
1 parent 89c603e commit cc9f26b

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

go.mod

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/fairwindsops/pluto/v5
33
go 1.24.4
44

55
require (
6-
github.com/olekukonko/tablewriter v0.0.5
6+
github.com/olekukonko/tablewriter v1.0.8
77
github.com/spf13/cobra v1.9.1
88
github.com/spf13/pflag v1.0.6
99
github.com/spf13/viper v1.20.1
@@ -25,6 +25,7 @@ require (
2525
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2727
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
28+
github.com/fatih/color v1.15.0 // indirect
2829
github.com/fsnotify/fsnotify v1.9.0 // indirect
2930
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3031
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
@@ -45,12 +46,16 @@ require (
4546
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
4647
github.com/lib/pq v1.10.9 // indirect
4748
github.com/mailru/easyjson v0.9.0 // indirect
49+
github.com/mattn/go-colorable v0.1.13 // indirect
50+
github.com/mattn/go-isatty v0.0.19 // indirect
4851
github.com/mattn/go-runewidth v0.0.16 // indirect
4952
github.com/mitchellh/copystructure v1.2.0 // indirect
5053
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5154
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5255
github.com/modern-go/reflect2 v1.0.2 // indirect
5356
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
57+
github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 // indirect
58+
github.com/olekukonko/ll v0.0.8 // indirect
5459
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
5560
github.com/pkg/errors v0.9.1 // indirect
5661
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1717
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1818
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
1919
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
20+
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
21+
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
2022
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
2123
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
2224
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
@@ -75,7 +77,11 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
7577
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
7678
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
7779
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
78-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
80+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
81+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
82+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
83+
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
84+
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
7985
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
8086
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
8187
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
@@ -91,8 +97,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
9197
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
9298
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9399
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
94-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
95-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
100+
github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 h1:r3FaAI0NZK3hSmtTDrBVREhKULp8oUeqLT5Eyl2mSPo=
101+
github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
102+
github.com/olekukonko/ll v0.0.8 h1:sbGZ1Fx4QxJXEqL/6IG8GEFnYojUSQ45dJVwN2FH2fc=
103+
github.com/olekukonko/ll v0.0.8/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
104+
github.com/olekukonko/tablewriter v1.0.8 h1:f6wJzHg4QUtJdvrVPKco4QTrAylgaU0+b9br/lJxEiQ=
105+
github.com/olekukonko/tablewriter v1.0.8/go.mod h1:H428M+HzoUXC6JU2Abj9IT9ooRmdq9CxuDmKMtrOCMs=
96106
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
97107
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
98108
github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw=
@@ -176,6 +186,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
176186
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
177187
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
178188
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
189+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
190+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
179191
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
180192
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
181193
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=

pkg/api/output.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"text/tabwriter"
2424

2525
"github.com/olekukonko/tablewriter"
26+
"github.com/olekukonko/tablewriter/renderer"
27+
"github.com/olekukonko/tablewriter/tw"
2628

2729
"gopkg.in/yaml.v3"
2830
)
@@ -121,8 +123,6 @@ func (instance *Instance) DisplayOutput() error {
121123
}
122124
t := instance.markdownOut(c)
123125
if t != nil {
124-
t.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
125-
t.SetCenterSeparator("|")
126126
t.Render()
127127
}
128128
case "csv":
@@ -224,7 +224,11 @@ func (instance *Instance) tabOut(columns columnList) *tabwriter.Writer {
224224
}
225225

226226
func (instance *Instance) markdownOut(columns columnList) *tablewriter.Table {
227-
table := tablewriter.NewWriter(os.Stdout)
227+
table := tablewriter.NewTable(
228+
os.Stdout,
229+
tablewriter.WithRenderer(renderer.NewMarkdown()),
230+
tablewriter.WithHeaderAlignment(tw.AlignNone), // retain parity with previous versions
231+
)
228232

229233
if len(instance.Outputs) == 0 {
230234
_, _ = fmt.Println("No output to display")
@@ -243,7 +247,8 @@ func (instance *Instance) markdownOut(columns columnList) *tablewriter.Table {
243247
headers = append(headers, columns[k].header())
244248
}
245249

246-
table.SetHeader(headers)
250+
// table.SetHeader(headers)
251+
table.Header(headers)
247252
}
248253

249254
for _, o := range instance.Outputs {

0 commit comments

Comments
 (0)