Skip to content

Commit c9beee2

Browse files
ryan-mistryan-mist
authored
cherrypick: ci: migrate to tablewriter to v1 (#9116) (#9135)
1 parent 7ff7943 commit c9beee2

6 files changed

Lines changed: 115 additions & 40 deletions

File tree

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ module github.com/aws/karpenter-provider-aws
22

33
go 1.26.2
44

5-
// TODO: migrate tablewriter to v1.0.8
6-
// https://github.com/olekukonko/tablewriter/blob/c64d84b3ecc64a18cfc8ba10cdd8c52cc13a7d23/MIGRATION.md?plain=1#L661
7-
replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5
8-
95
require (
106
github.com/Pallinder/go-randomdata v1.2.0
117
github.com/PuerkitoBio/goquery v1.11.0
@@ -24,7 +20,7 @@ require (
2420
github.com/aws/aws-sdk-go-v2/service/ssm v1.68.1
2521
github.com/aws/aws-sdk-go-v2/service/sts v1.41.7
2622
github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.17
27-
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20240410220356-6b868db24881
23+
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20260430212548-5e978c594ece
2824
github.com/aws/smithy-go v1.25.0
2925
github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20240229193347-cfab22a10647
3026
github.com/awslabs/operatorpkg v0.0.0-20251222193911-34e9a1898737
@@ -74,6 +70,7 @@ require (
7470
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
7571
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
7672
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
73+
github.com/fatih/color v1.15.0 // indirect
7774
github.com/fsnotify/fsnotify v1.9.0 // indirect
7875
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7976
github.com/go-logr/logr v1.4.3 // indirect
@@ -100,13 +97,17 @@ require (
10097
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10198
github.com/json-iterator/go v1.1.12 // indirect
10299
github.com/klauspost/compress v1.18.1 // indirect
100+
github.com/mattn/go-colorable v0.1.13 // indirect
101+
github.com/mattn/go-isatty v0.0.19 // indirect
103102
github.com/mattn/go-runewidth v0.0.17 // indirect
104103
github.com/mitchellh/go-homedir v1.1.0 // indirect
105104
github.com/moby/spdystream v0.5.1 // indirect
106105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
107106
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
108107
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
109108
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
109+
github.com/olekukonko/errors v1.1.0 // indirect
110+
github.com/olekukonko/ll v0.0.9 // indirect
110111
github.com/olekukonko/tablewriter v1.1.0 // indirect
111112
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
112113
github.com/prometheus/client_model v0.6.2 // indirect

‎go.sum‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 h1:NITQpgo9A5NrDZ57uOWj+abvXSb8
5858
github.com/aws/aws-sdk-go-v2/service/sts v1.41.7/go.mod h1:sks5UWBhEuWYDPdwlnRFn1w7xWdH29Jcpe+/PJQefEs=
5959
github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.17 h1:Wlwn7YHQD3EWt1nQ9vSfeuQWZxI3BjDIRdzNF1rSeJQ=
6060
github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.17/go.mod h1:ENvCiX8Lsds2dgCXynL6PcPgxcdzmsG6BYH0RZ+xPng=
61-
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20240410220356-6b868db24881 h1:m9rhsGhdepdQV96tZgfy68oU75AWAjOH8u65OefTjwA=
62-
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20240410220356-6b868db24881/go.mod h1:+Mk5k0b6HpKobxNq+B56DOhZ+I/NiPhd5MIBhQMSTSs=
61+
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20260430212548-5e978c594ece h1:WpmapgNk5efoOrWjSNCc+Q6mRxHdL1pN8CDvg7VnTe4=
62+
github.com/aws/karpenter-provider-aws/tools/kompat v0.0.0-20260430212548-5e978c594ece/go.mod h1:sPpL15MgSUupFmP/f8CLLW5uHUM4otv1d/4LYHG9FqA=
6363
github.com/aws/smithy-go v1.25.0 h1:Sz/XJ64rwuiKtB6j98nDIPyYrV1nVNJ4YU74gttcl5U=
6464
github.com/aws/smithy-go v1.25.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
6565
github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20240229193347-cfab22a10647 h1:8yRBVsjGmI7qQsPWtIrbWP+XfwHO9Wq7gdLVzjqiZFs=
@@ -85,6 +85,8 @@ github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb
8585
github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
8686
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
8787
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
88+
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
89+
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
8890
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
8991
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
9092
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
@@ -173,7 +175,11 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
173175
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
174176
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
175177
github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
176-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
178+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
179+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
180+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
181+
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
182+
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
177183
github.com/mattn/go-runewidth v0.0.17 h1:78v8ZlW0bP43XfmAfPsdXcoNCelfMHsDmd/pkENfrjQ=
178184
github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
179185
github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
@@ -194,8 +200,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
194200
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
195201
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
196202
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
197-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
198-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
203+
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
204+
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
205+
github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
206+
github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
207+
github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
208+
github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
199209
github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI=
200210
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
201211
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
@@ -297,7 +307,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
297307
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
298308
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
299309
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
310+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
300311
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
312+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
301313
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
302314
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
303315
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

‎tools/kompat/cmd/kompat/main.go‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"strings"
2525

2626
"github.com/olekukonko/tablewriter"
27+
"github.com/olekukonko/tablewriter/renderer"
28+
"github.com/olekukonko/tablewriter/tw"
2729
"github.com/samber/lo"
2830
"github.com/spf13/cobra"
2931

@@ -139,20 +141,34 @@ func PrettyTable[T any](data []T, wide bool) string {
139141
rows = append(rows, row)
140142
}
141143
out := bytes.Buffer{}
142-
table := tablewriter.NewWriter(&out)
143-
table.SetHeader(headers)
144-
table.SetAutoWrapText(false)
145-
table.SetAutoFormatHeaders(true)
146-
table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
147-
table.SetAlignment(tablewriter.ALIGN_LEFT)
148-
table.SetCenterSeparator("")
149-
table.SetColumnSeparator("")
150-
table.SetRowSeparator("")
151-
table.SetHeaderLine(false)
152-
table.SetBorder(false)
153-
table.SetTablePadding("\t") // pad with tabs
154-
table.SetNoWhiteSpace(true)
155-
table.AppendBulk(rows) // Add Bulk Data
144+
table := tablewriter.NewTable(&out,
145+
tablewriter.WithRenderer(renderer.NewBlueprint()),
146+
tablewriter.WithRendition(tw.Rendition{
147+
Borders: tw.BorderNone,
148+
Symbols: tw.NewSymbols(tw.StyleNone),
149+
Settings: tw.Settings{
150+
Lines: tw.LinesNone,
151+
Separators: tw.SeparatorsNone,
152+
},
153+
}),
154+
tablewriter.WithConfig(tablewriter.Config{
155+
Header: tw.CellConfig{
156+
Alignment: tw.CellAlignment{Global: tw.AlignLeft},
157+
Formatting: tw.CellFormatting{AutoFormat: tw.On},
158+
Padding: tw.CellPadding{Global: tw.Padding{Left: "\t", Right: "\t"}},
159+
},
160+
Row: tw.CellConfig{
161+
Alignment: tw.CellAlignment{Global: tw.AlignLeft},
162+
Formatting: tw.CellFormatting{AutoWrap: tw.WrapNone},
163+
Padding: tw.CellPadding{Global: tw.Padding{Left: "\t", Right: "\t"}},
164+
},
165+
Behavior: tw.Behavior{
166+
TrimSpace: tw.On,
167+
},
168+
}),
169+
)
170+
table.Header(headers)
171+
table.Bulk(rows)
156172
table.Render()
157173
return out.String()
158174
}

‎tools/kompat/go.mod‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,22 @@ go 1.22
55
require (
66
github.com/Masterminds/semver/v3 v3.2.1
77
github.com/mitchellh/go-homedir v1.1.0
8-
github.com/olekukonko/tablewriter v0.0.5
8+
github.com/olekukonko/tablewriter v1.1.0
99
github.com/samber/lo v1.38.1
1010
github.com/spf13/cobra v1.6.0
1111
gopkg.in/yaml.v3 v3.0.1
1212
)
1313

1414
require (
15+
github.com/fatih/color v1.15.0 // indirect
1516
github.com/inconshreveable/mousetrap v1.0.1 // indirect
16-
github.com/mattn/go-runewidth v0.0.9 // indirect
17+
github.com/mattn/go-colorable v0.1.13 // indirect
18+
github.com/mattn/go-isatty v0.0.19 // indirect
19+
github.com/mattn/go-runewidth v0.0.16 // indirect
20+
github.com/olekukonko/errors v1.1.0 // indirect
21+
github.com/olekukonko/ll v0.0.9 // indirect
22+
github.com/rivo/uniseg v0.2.0 // indirect
1723
github.com/spf13/pflag v1.0.5 // indirect
1824
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
25+
golang.org/x/sys v0.12.0 // indirect
1926
)

‎tools/kompat/go.sum‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
22
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
33
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4+
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
5+
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
46
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
57
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
6-
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
7-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
8+
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
9+
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
10+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
11+
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
12+
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
13+
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
14+
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
815
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
916
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
10-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
11-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
17+
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
18+
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
19+
github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
20+
github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
21+
github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
22+
github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
23+
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
24+
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
1225
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
1326
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
1427
github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
@@ -18,6 +31,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
1831
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1932
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
2033
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
34+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
37+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2138
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2239
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2340
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎tools/kompat/pkg/kompat/kompat.go‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import (
3030
"github.com/Masterminds/semver/v3"
3131
"github.com/mitchellh/go-homedir"
3232
"github.com/olekukonko/tablewriter"
33+
"github.com/olekukonko/tablewriter/renderer"
34+
"github.com/olekukonko/tablewriter/tw"
3335
"github.com/samber/lo"
3436
"gopkg.in/yaml.v3"
3537
)
@@ -188,7 +190,19 @@ func (k List) YAML() string {
188190
func (k Kompat) Markdown(_ ...Options) string {
189191
// options := mergeOptions(opts...)
190192
out := bytes.Buffer{}
191-
table := tablewriter.NewWriter(&out)
193+
table := tablewriter.NewTable(&out,
194+
tablewriter.WithRenderer(renderer.NewBlueprint()),
195+
tablewriter.WithHeaderAutoFormat(tw.Off),
196+
tablewriter.WithRendition(tw.Rendition{
197+
Borders: tw.Border{
198+
Left: tw.On,
199+
Right: tw.On,
200+
Top: tw.Off,
201+
Bottom: tw.Off,
202+
},
203+
Symbols: tw.NewSymbols(tw.StyleMarkdown),
204+
}),
205+
)
192206
headers := []string{"Kubernetes"}
193207
data := []string{k.Name}
194208
for _, c := range k.Compatibility {
@@ -199,10 +213,8 @@ func (k Kompat) Markdown(_ ...Options) string {
199213
}
200214
data = append(data, c.AppVersion)
201215
}
202-
table.SetHeader(headers)
203-
table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
204-
table.SetCenterSeparator("|")
205-
table.AppendBulk([][]string{data})
216+
table.Header(headers)
217+
table.Bulk([][]string{data})
206218
table.Render()
207219
return out.String()
208220
}
@@ -213,7 +225,19 @@ func (k List) Markdown(opts ...Options) string {
213225
// return k[0].Markdown()
214226
// }
215227
out := bytes.Buffer{}
216-
table := tablewriter.NewWriter(&out)
228+
table := tablewriter.NewTable(&out,
229+
tablewriter.WithRenderer(renderer.NewBlueprint()),
230+
tablewriter.WithHeaderAutoFormat(tw.Off),
231+
tablewriter.WithRendition(tw.Rendition{
232+
Borders: tw.Border{
233+
Left: tw.On,
234+
Right: tw.On,
235+
Top: tw.Off,
236+
Bottom: tw.Off,
237+
},
238+
Symbols: tw.NewSymbols(tw.StyleMarkdown),
239+
}),
240+
)
217241
headers := []string{"Kubernetes"}
218242
var data [][]string
219243
// Get all k8s versions for the first row
@@ -245,10 +269,8 @@ func (k List) Markdown(opts ...Options) string {
245269
data[i] = append(data[i], semverRange(k8sVersionToAppVersions[k8sVersion], allAppVersions...))
246270
}
247271
}
248-
table.SetHeader(headers)
249-
table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
250-
table.SetCenterSeparator("|")
251-
table.AppendBulk(data)
272+
table.Header(headers)
273+
table.Bulk(data)
252274
table.Render()
253275
return out.String()
254276
}

0 commit comments

Comments
 (0)