Skip to content

Commit 958f9a7

Browse files
mmetcmmetc
authored
update github.com/jedib0t/go-pretty/ (#3705)
1 parent 68ce9f1 commit 958f9a7

File tree

3 files changed

+61
-60
lines changed

3 files changed

+61
-60
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/ivanpirog/coloredcobra v1.0.1
5353
github.com/jackc/pgx/v4 v4.18.2
5454
github.com/jarcoal/httpmock v1.1.0
55-
github.com/jedib0t/go-pretty/v6 v6.5.9
55+
github.com/jedib0t/go-pretty/v6 v6.6.7
5656
github.com/jszwec/csvutil v1.5.1
5757
github.com/lithammer/dedent v1.1.0
5858
github.com/mattn/go-isatty v0.0.20
@@ -158,7 +158,7 @@ require (
158158
github.com/magefile/mage v1.15.1-0.20241126214340-bdc92f694516 // indirect
159159
github.com/mailru/easyjson v0.7.7 // indirect
160160
github.com/mattn/go-colorable v0.1.13 // indirect
161-
github.com/mattn/go-runewidth v0.0.15 // indirect
161+
github.com/mattn/go-runewidth v0.0.16 // indirect
162162
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
163163
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
164164
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -181,7 +181,7 @@ require (
181181
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
182182
github.com/prometheus/common v0.44.0 // indirect
183183
github.com/prometheus/procfs v0.15.1 // indirect
184-
github.com/rivo/uniseg v0.2.0 // indirect
184+
github.com/rivo/uniseg v0.4.7 // indirect
185185
github.com/robfig/cron/v3 v3.0.1 // indirect
186186
github.com/rogpeppe/go-internal v1.12.0 // indirect
187187
github.com/russross/blackfriday/v2 v2.1.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ github.com/jarcoal/httpmock v1.1.0 h1:F47ChZj1Y2zFsCXxNkBPwNNKnAyOATcdQibk0qEdVC
425425
github.com/jarcoal/httpmock v1.1.0/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
426426
github.com/jcchavezs/mergefs v0.1.0 h1:7oteO7Ocl/fnfFMkoVLJxTveCjrsd//UB0j89xmnpec=
427427
github.com/jcchavezs/mergefs v0.1.0/go.mod h1:eRLTrsA+vFwQZ48hj8p8gki/5v9C2bFtHH5Mnn4bcGk=
428-
github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+UV8OU=
429-
github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
428+
github.com/jedib0t/go-pretty/v6 v6.6.7 h1:m+LbHpm0aIAPLzLbMfn8dc3Ht8MW7lsSO4MPItz/Uuo=
429+
github.com/jedib0t/go-pretty/v6 v6.6.7/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
430430
github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
431431
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
432432
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -512,8 +512,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
512512
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
513513
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
514514
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
515-
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
516-
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
515+
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
516+
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
517517
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
518518
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
519519
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -613,8 +613,9 @@ github.com/prometheus/prom2json v1.3.0 h1:BlqrtbT9lLH3ZsOVhXPsHzFrApCTKRifB7gjJu
613613
github.com/prometheus/prom2json v1.3.0/go.mod h1:rMN7m0ApCowcoDlypBHlkNbp5eJQf/+1isKykIP5ZnM=
614614
github.com/r3labs/diff/v2 v2.14.1 h1:wRZ3jB44Ny50DSXsoIcFQ27l2x+n5P31K/Pk+b9B0Ic=
615615
github.com/r3labs/diff/v2 v2.14.1/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc=
616-
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
617616
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
617+
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
618+
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
618619
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
619620
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
620621
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

‎test/bats/08_metrics_bouncer.bats‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -228,20 +228,20 @@ teardown() {
228228

229229
rune -0 cscli metrics show bouncers
230230
assert_output - <<-EOT
231-
+-------------------------------------------------------------------------------------------+
232-
| Bouncer Metrics (testbouncer) since 2024-02-08 13:35:16 +0000 UTC |
233-
+----------------------------------+------------------+-------------------+-----------------+
234-
| Origin | active_decisions | dropped | foo |
235-
| | IPs | bytes | packets | dogyear | pound |
236-
+----------------------------------+------------------+---------+---------+---------+-------+
237-
| CAPI (community blocklist) | - | 3.80k | 100 | - | - |
238-
| cscli (manual decisions) | 1 | 380 | 10 | - | - |
239-
| lists:anotherlist | - | 0 | 0 | - | - |
240-
| lists:firehol_cruzit_web_attacks | - | 1.03k | 23 | - | - |
241-
| lists:firehol_voipbl | 500 | 3.85k | 58 | - | - |
242-
+----------------------------------+------------------+---------+---------+---------+-------+
243-
| Total | 501 | 9.06k | 191 | 2 | 5 |
244-
+----------------------------------+------------------+---------+---------+---------+-------+
231+
+-----------------------------------------------------------------------------------------+
232+
| Bouncer Metrics (testbouncer) since 2024-02-08 13:35:16 +0000 UTC |
233+
+----------------------------------+------------------+-----------------+-----------------+
234+
| Origin | active_decisions | dropped | foo |
235+
| | IPs | bytes | packets | dogyear | pound |
236+
+----------------------------------+------------------+-------+---------+---------+-------+
237+
| CAPI (community blocklist) | - | 3.80k | 100 | - | - |
238+
| cscli (manual decisions) | 1 | 380 | 10 | - | - |
239+
| lists:anotherlist | - | 0 | 0 | - | - |
240+
| lists:firehol_cruzit_web_attacks | - | 1.03k | 23 | - | - |
241+
| lists:firehol_voipbl | 500 | 3.85k | 58 | - | - |
242+
+----------------------------------+------------------+-------+---------+---------+-------+
243+
| Total | 501 | 9.06k | 191 | 2 | 5 |
244+
+----------------------------------+------------------+-------+---------+---------+-------+
245245
EOT
246246

247247
# active_decisions is actually a gauge: values should not be aggregated, keep only the latest one
@@ -312,20 +312,20 @@ teardown() {
312312

313313
rune -0 cscli metrics show bouncers
314314
assert_output - <<-EOT
315-
+-------------------------------------------------------------------------------------------+
316-
| Bouncer Metrics (testbouncer) since 2024-02-08 13:35:16 +0000 UTC |
317-
+----------------------------------+------------------+-------------------+-----------------+
318-
| Origin | active_decisions | dropped | foo |
319-
| | IPs | bytes | packets | dogyear | pound |
320-
+----------------------------------+------------------+---------+---------+---------+-------+
321-
| CAPI (community blocklist) | - | 3.80k | 100 | - | - |
322-
| cscli (manual decisions) | 10 | 380 | 10 | - | - |
323-
| lists:anotherlist | - | 0 | 0 | - | - |
324-
| lists:firehol_cruzit_web_attacks | - | 1.03k | 23 | - | - |
325-
| lists:firehol_voipbl | 250 | 3.85k | 58 | - | - |
326-
+----------------------------------+------------------+---------+---------+---------+-------+
327-
| Total | 260 | 9.06k | 191 | 2 | 5 |
328-
+----------------------------------+------------------+---------+---------+---------+-------+
315+
+-----------------------------------------------------------------------------------------+
316+
| Bouncer Metrics (testbouncer) since 2024-02-08 13:35:16 +0000 UTC |
317+
+----------------------------------+------------------+-----------------+-----------------+
318+
| Origin | active_decisions | dropped | foo |
319+
| | IPs | bytes | packets | dogyear | pound |
320+
+----------------------------------+------------------+-------+---------+---------+-------+
321+
| CAPI (community blocklist) | - | 3.80k | 100 | - | - |
322+
| cscli (manual decisions) | 10 | 380 | 10 | - | - |
323+
| lists:anotherlist | - | 0 | 0 | - | - |
324+
| lists:firehol_cruzit_web_attacks | - | 1.03k | 23 | - | - |
325+
| lists:firehol_voipbl | 250 | 3.85k | 58 | - | - |
326+
+----------------------------------+------------------+-------+---------+---------+-------+
327+
| Total | 260 | 9.06k | 191 | 2 | 5 |
328+
+----------------------------------+------------------+-------+---------+---------+-------+
329329
EOT
330330
}
331331

@@ -510,29 +510,29 @@ teardown() {
510510

511511
rune -0 cscli metrics show bouncers
512512
assert_output - <<-EOT
513-
+--------------------------------------------------------------+
514-
| Bouncer Metrics (bouncer1) since 2024-02-08 13:35:16 +0000 U |
515-
| TC |
516-
+----------------------------+---------+-----------------------+
517-
| Origin | dropped | processed |
518-
| | bytes | bytes | packets |
519-
+----------------------------+---------+-----------+-----------+
520-
| CAPI (community blocklist) | 1.00k | - | - |
521-
| lists:somelist | 800 | - | - |
522-
+----------------------------+---------+-----------+-----------+
523-
| Total | 1.80k | 12.34k | 100 |
524-
+----------------------------+---------+-----------+-----------+
525-
+------------------------------------------------+
526-
| Bouncer Metrics (bouncer2) since 2024-02-08 10 |
527-
| :48:36 +0000 UTC |
528-
+----------------------------+-------------------+
529-
| Origin | dropped |
530-
| | bytes | packets |
531-
+----------------------------+---------+---------+
532-
| CAPI (community blocklist) | 2.00k | - |
533-
| lists:somelist | 1.50k | 20 |
534-
+----------------------------+---------+---------+
535-
| Total | 3.50k | 20 |
536-
+----------------------------+---------+---------+
513+
+---------------------------------------------------------+
514+
| Bouncer Metrics (bouncer1) since 2024-02-08 13:35:16 +0 |
515+
| 000 UTC |
516+
+----------------------------+---------+------------------+
517+
| Origin | dropped | processed |
518+
| | bytes | bytes | packets |
519+
+----------------------------+---------+--------+---------+
520+
| CAPI (community blocklist) | 1.00k | - | - |
521+
| lists:somelist | 800 | - | - |
522+
+----------------------------+---------+--------+---------+
523+
| Total | 1.80k | 12.34k | 100 |
524+
+----------------------------+---------+--------+---------+
525+
+----------------------------------------------+
526+
| Bouncer Metrics (bouncer2) since 2024-02-08 |
527+
| 10:48:36 +0000 UTC |
528+
+----------------------------+-----------------+
529+
| Origin | dropped |
530+
| | bytes | packets |
531+
+----------------------------+-------+---------+
532+
| CAPI (community blocklist) | 2.00k | - |
533+
| lists:somelist | 1.50k | 20 |
534+
+----------------------------+-------+---------+
535+
| Total | 3.50k | 20 |
536+
+----------------------------+-------+---------+
537537
EOT
538538
}

0 commit comments

Comments
 (0)