Skip to content

Commit 3494de7

Browse files
jmank88jmank88
committed
upgrade olekukonko/tablewriter; rm replace
1 parent c525710 commit 3494de7

13 files changed

Lines changed: 76 additions & 55 deletions

‎core/cmd/bridge_commands.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ func (p *BridgePresenter) RenderTable(rt RendererTable) error {
5858
p.FriendlyConfirmations(),
5959
p.OutgoingToken,
6060
})
61-
render("Bridge", table)
62-
return nil
61+
return render("Bridge", table)
6362
}
6463

6564
type BridgePresenters []BridgePresenter
@@ -75,8 +74,7 @@ func (ps BridgePresenters) RenderTable(rt RendererTable) error {
7574
})
7675
}
7776

78-
render("Bridges", table)
79-
return nil
77+
return render("Bridges", table)
8078
}
8179

8280
// IndexBridges returns all bridges.

‎core/cmd/cosmos_transaction_commands.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ func (p *CosmosMsgPresenter) RenderTable(rt RendererTable) error {
5656
hash,
5757
})
5858

59-
render(fmt.Sprintf("Cosmos Message %v", p.ID), table)
60-
return nil
59+
return render(fmt.Sprintf("Cosmos Message %v", p.ID), table)
6160
}
6261

6362
// CosmosSendNativeToken transfers coins from the node's account to a specified address.

‎core/cmd/evm_transaction_commands.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ func (p *EthTxPresenter) RenderTable(rt RendererTable) error {
8080
p.State,
8181
})
8282

83-
render(fmt.Sprintf("Ethereum Transaction %v", p.Hash.Hex()), table)
84-
return nil
83+
return render(fmt.Sprintf("Ethereum Transaction %v", p.Hash.Hex()), table)
8584
}
8685

8786
type EthTxPresenters []EthTxPresenter
@@ -100,8 +99,7 @@ func (ps EthTxPresenters) RenderTable(rt RendererTable) error {
10099
})
101100
}
102101

103-
render("Ethereum Transactions", table)
104-
return nil
102+
return render("Ethereum Transactions", table)
105103
}
106104

107105
// IndexTransactions returns the list of transactions in descending order,

‎core/cmd/external_initiator_commands.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ type ExternalInitiatorPresenter struct {
3434
func (eip *ExternalInitiatorPresenter) RenderTable(rt RendererTable) error {
3535
table := rt.newTable([]string{"ID", "Name", "URL", "AccessKey", "OutgoingToken", "CreatedAt", "UpdatedAt"})
3636
table.Append(eip.ToRow())
37-
render("External Initiator:", table)
38-
return nil
37+
return render("External Initiator:", table)
3938
}
4039

4140
func (eip *ExternalInitiatorPresenter) ToRow() []string {
@@ -61,8 +60,7 @@ func (eips *ExternalInitiatorPresenters) RenderTable(rt RendererTable) error {
6160
for _, eip := range *eips {
6261
table.Append(eip.ToRow())
6362
}
64-
render("External Initiators:", table)
65-
return nil
63+
return render("External Initiators:", table)
6664
}
6765

6866
// IndexExternalInitiators lists external initiators

‎core/cmd/jobs_commands.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12+
"github.com/olekukonko/tablewriter"
13+
"github.com/olekukonko/tablewriter/tw"
1214
"github.com/pkg/errors"
1315
"github.com/urfave/cli"
1416

@@ -192,29 +194,31 @@ func (p JobPresenter) FriendlyCreatedAt() string {
192194
// RenderTable implements TableRenderer
193195
func (p *JobPresenter) RenderTable(rt RendererTable) error {
194196
table := rt.newTable([]string{"ID", "Name", "Type", "Tasks", "Created At"})
195-
table.SetAutoMergeCells(true)
197+
table.Configure(func(cfg *tablewriter.Config) {
198+
cfg.Behavior.Compact.Merge = tw.MergeHorizontal
199+
})
196200
for _, r := range p.ToRows() {
197201
table.Append(r)
198202
}
199203

200-
render("Jobs", table)
201-
return nil
204+
return render("Jobs", table)
202205
}
203206

204207
type JobPresenters []JobPresenter
205208

206209
// RenderTable implements TableRenderer
207210
func (ps JobPresenters) RenderTable(rt RendererTable) error {
208211
table := rt.newTable([]string{"ID", "Name", "Type", "Tasks", "Created At"})
209-
table.SetAutoMergeCells(true)
212+
table.Configure(func(cfg *tablewriter.Config) {
213+
cfg.Behavior.Compact.Merge = tw.MergeHorizontal
214+
})
210215
for _, p := range ps {
211216
for _, r := range p.ToRows() {
212217
table.Append(r)
213218
}
214219
}
215220

216-
render("Jobs (V2)", table)
217-
return nil
221+
return render("Jobs (V2)", table)
218222
}
219223

220224
// ListJobs lists all jobs

‎core/cmd/renderer.go‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66
"strings"
77

88
"github.com/olekukonko/tablewriter"
9+
"github.com/olekukonko/tablewriter/renderer"
10+
"github.com/olekukonko/tablewriter/tw"
911

1012
"github.com/smartcontractkit/chainlink/v2/core/utils"
1113
webpresenters "github.com/smartcontractkit/chainlink/v2/core/web/presenters"
@@ -78,8 +80,7 @@ func (rt RendererTable) renderLogPkgConfig(serviceLevelLog webpresenters.Service
7880
})
7981
}
8082

81-
render("ServiceLogConfig", table)
82-
return nil
83+
return render("ServiceLogConfig", table)
8384
}
8485

8586
func (rt RendererTable) renderVRFKeys(keys []VRFKeyPresenter) error {
@@ -98,14 +99,21 @@ func (rt RendererTable) renderVRFKeys(keys []VRFKeyPresenter) error {
9899
return nil
99100
}
100101

101-
func render(name string, table *tablewriter.Table) {
102-
table.SetRowLine(true)
103-
table.SetColumnSeparator("║")
104-
table.SetRowSeparator("═")
105-
table.SetCenterSeparator("╬")
102+
func render(name string, table *tablewriter.Table) error {
103+
// TODO table.SetRowLine(true)
104+
symbols := tw.NewSymbolCustom("double-line").
105+
WithColumn("║").
106+
WithRow("═").
107+
WithCenter("╬")
106108

107109
fmt.Println("╔ " + name)
108-
table.Render()
110+
return table.Options(
111+
tablewriter.WithRenderer(
112+
renderer.NewBlueprint(
113+
tw.Rendition{Symbols: symbols},
114+
),
115+
),
116+
).Render()
109117
}
110118

111119
func renderList(fields []string, items [][]string, writer io.Writer) {
@@ -151,13 +159,12 @@ func (rt RendererTable) renderExternalInitiatorAuthentication(eia webpresenters.
151159
eia.OutgoingToken,
152160
eia.OutgoingSecret,
153161
})
154-
render("External Initiator Credentials:", table)
155-
return nil
162+
return render("External Initiator Credentials:", table)
156163
}
157164

158165
func (rt RendererTable) newTable(headers []string) *tablewriter.Table {
159166
table := tablewriter.NewWriter(rt)
160-
table.SetHeader(headers)
167+
table.Header(headers)
161168
return table
162169
}
163170

@@ -176,6 +183,5 @@ func (rt RendererTable) renderPipelineRun(run webpresenters.PipelineRunResource)
176183
}
177184
table.Append(row)
178185

179-
render("Pipeline Run", table)
180-
return nil
186+
return render("Pipeline Run", table)
181187
}

‎core/cmd/solana_transaction_commands.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ func (p *SolanaMsgPresenter) RenderTable(rt RendererTable) error {
5454
strconv.FormatUint(p.Amount, 10),
5555
})
5656

57-
render(fmt.Sprintf("Solana Message %v", p.ID), table)
58-
return nil
57+
return render(fmt.Sprintf("Solana Message %v", p.ID), table)
5958
}
6059

6160
// SolanaSendSol transfers sol from the node's account to a specified address.

‎core/scripts/chaincli/handler/ocr2_config.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"github.com/ethereum/go-ethereum/common"
1414
"github.com/ethereum/go-ethereum/core/types"
1515
"github.com/olekukonko/tablewriter"
16+
"github.com/olekukonko/tablewriter/renderer"
17+
"github.com/olekukonko/tablewriter/tw"
1618

1719
"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
1820

@@ -98,7 +100,7 @@ func configFromBlock(bl *types.Block, addr common.Address, detail keeper_registr
98100
return nil, errors.New("public config not found")
99101
}
100102

101-
func printConfigValues(config *confighelper.PublicConfig) {
103+
func printConfigValues(config *confighelper.PublicConfig) error {
102104
data := [][]string{}
103105

104106
data = append(data, []string{"DeltaProgress", config.DeltaProgress.String()})
@@ -127,9 +129,11 @@ func printConfigValues(config *confighelper.PublicConfig) {
127129
}
128130

129131
table := tablewriter.NewWriter(os.Stdout)
130-
table.SetHeader([]string{"Field", "Value"})
132+
table.Header([]string{"Field", "Value"})
131133
// table.SetFooter([]string{"", "", "Total", "$146.93"}) // Add Footer
132-
table.SetBorder(false) // Set Border to false
133-
table.AppendBulk(data) // Add Bulk Data
134-
table.Render()
134+
table.Options(tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{Borders: tw.BorderNone})))
135+
if err := table.Bulk(data); err != nil { // Add Bulk Data
136+
return err
137+
}
138+
return table.Render()
135139
}

‎core/scripts/chaincli/handler/report.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"github.com/ethereum/go-ethereum/core/types"
1919
"github.com/ethereum/go-ethereum/rpc"
2020
"github.com/olekukonko/tablewriter"
21+
"github.com/olekukonko/tablewriter/renderer"
22+
"github.com/olekukonko/tablewriter/tw"
2123

2224
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
2325

@@ -128,13 +130,13 @@ func OCR2AutomationReports(hdlr *baseHandler, txs []string) error {
128130
})
129131

130132
table := tablewriter.NewWriter(os.Stdout)
131-
table.SetHeader([]string{"Hash", "ChainID", "Block", "Error", "From", "To", "Keys", "CheckBlocks"})
133+
table.Header([]string{"Hash", "ChainID", "Block", "Error", "From", "To", "Keys", "CheckBlocks"})
132134
// table.SetFooter([]string{"", "", "Total", "$146.93"}) // Add Footer
133-
table.SetBorder(false) // Set Border to false
134-
table.AppendBulk(data) // Add Bulk Data
135-
table.Render()
136-
137-
return nil
135+
table.Options(tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{Borders: tw.BorderNone})))
136+
if err = table.Bulk(data); err != nil { // Add Bulk Data
137+
return err
138+
}
139+
return table.Render()
138140
}
139141

140142
func getTransactionDetailForHashes(hdlr *baseHandler, txs []string) ([]*map[string]any, []error, error) {

‎core/scripts/go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,8 @@ require (
454454
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
455455
github.com/oklog/run v1.2.0 // indirect
456456
github.com/oklog/ulid/v2 v2.1.1 // indirect
457+
github.com/olekukonko/errors v1.1.0 // indirect
458+
github.com/olekukonko/ll v0.0.9 // indirect
457459
github.com/open-policy-agent/opa v1.14.1 // indirect
458460
github.com/opencontainers/go-digest v1.0.0 // indirect
459461
github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -482,6 +484,7 @@ require (
482484
github.com/prometheus/procfs v0.20.1 // indirect
483485
github.com/prometheus/prometheus v0.311.3 // indirect
484486
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
487+
github.com/rivo/uniseg v0.4.7 // indirect
485488
github.com/robfig/cron/v3 v3.0.1 // indirect
486489
github.com/rogpeppe/go-internal v1.14.1 // indirect
487490
github.com/rs/cors v1.11.1 // indirect
@@ -704,8 +707,6 @@ replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlin
704707
// yet, so we pin to v0.1.0 which has both the old aliases and the new compression API.
705708
replace github.com/moby/go-archive v0.2.0 => github.com/moby/go-archive v0.1.0
706709

707-
replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5
708-
709710
// Exclude Juno's placeholder dependency. It is only intended to be resolved via
710711
// Juno's local replace directive and is not used directly by chainlink
711712
exclude github.com/starknet-io/starknet-p2pspecs v0.0.0-00010101000000-000000000000

0 commit comments

Comments
 (0)