Skip to content

Commit 7f11540

Browse files
fujiwarafujiwara
authored
Merge pull request #99 from fujiwara/update-tablewriter-v1
Update olekukonko/tablewriter to v1
2 parents 36059b5 + 440aeca commit 7f11540

File tree

5 files changed

+41
-18
lines changed

5 files changed

+41
-18
lines changed

‎format.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/aws/aws-sdk-go-v2/service/ecs/types"
1212
"github.com/itchyny/gojq"
1313
"github.com/olekukonko/tablewriter"
14+
"github.com/olekukonko/tablewriter/tw"
1415
)
1516

1617
var taskFormatterColumns = []string{
@@ -90,14 +91,19 @@ type taskFormatterTable struct {
9091
}
9192

9293
func newTaskFormatterTable(w io.Writer, opt formatterOption) (taskFormatter, error) {
94+
table := tablewriter.NewTable(w,
95+
tablewriter.WithRendition(tw.Rendition{
96+
Symbols: tw.NewSymbols(tw.StyleASCII),
97+
Borders: tw.Border{Left: tw.On, Top: tw.Off, Right: tw.On, Bottom: tw.Off},
98+
}),
99+
)
93100
t := &taskFormatterTable{
94-
table: tablewriter.NewWriter(w),
101+
table: table,
95102
opt: &opt,
96103
}
97104
if opt.HasHeader {
98-
t.table.SetHeader(opt.Columns())
105+
t.table.Header(opt.Columns())
99106
}
100-
t.table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
101107
return t, nil
102108
}
103109

‎go.mod‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/google/go-cmp v0.7.0
2020
github.com/itchyny/gojq v0.12.17
2121
github.com/mattn/go-isatty v0.0.20
22-
github.com/olekukonko/tablewriter v0.0.5
22+
github.com/olekukonko/tablewriter v1.1.3
2323
github.com/samber/lo v1.50.0
2424
github.com/schollz/progressbar/v3 v3.18.0
2525
github.com/tkuchiki/parsetime v0.3.0
@@ -41,11 +41,17 @@ require (
4141
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.8 // indirect
4242
github.com/aws/aws-sdk-go-v2/service/sts v1.41.1 // indirect
4343
github.com/aws/smithy-go v1.23.2 // indirect
44+
github.com/clipperhouse/displaywidth v0.6.2 // indirect
45+
github.com/clipperhouse/stringish v0.1.1 // indirect
46+
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
4447
github.com/fatih/color v1.18.0 // indirect
4548
github.com/itchyny/timefmt-go v0.1.6 // indirect
4649
github.com/mattn/go-colorable v0.1.14 // indirect
47-
github.com/mattn/go-runewidth v0.0.16 // indirect
50+
github.com/mattn/go-runewidth v0.0.19 // indirect
4851
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
52+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
53+
github.com/olekukonko/errors v1.1.0 // indirect
54+
github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0 // indirect
4955
github.com/rivo/uniseg v0.4.7 // indirect
5056
github.com/tkuchiki/go-timezone v0.2.3 // indirect
5157
golang.org/x/sys v0.33.0 // indirect

‎go.sum‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
4848
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
4949
github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
5050
github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
51+
github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo=
52+
github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
53+
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
54+
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
55+
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
56+
github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
5157
github.com/crackcomm/go-clitable v0.0.0-20151121230230-53bcff2fea36/go.mod h1:XiV36mPegOHv+dlkCSCazuGdQR2BUTgIZ2FKqTTHles=
5258
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
5359
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
@@ -72,15 +78,20 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
7278
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
7379
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
7480
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
75-
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
7681
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
77-
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
78-
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
82+
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
83+
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
7984
github.com/mattn/goveralls v0.0.9/go.mod h1:FRbM1PS8oVsOe9JtdzAAXM+DsvDMMHcM1C7drGJD8HY=
8085
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
8186
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
82-
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
83-
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
87+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj4EljqMiZsIcE09mmF8XsD5AYOJc=
88+
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
89+
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
90+
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
91+
github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0 h1:jrYnow5+hy3WRDCBypUFvVKNSPPCdqgSXIE9eJDD8LM=
92+
github.com/olekukonko/ll v0.1.4-0.20260115111900-9e59c2286df0/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
93+
github.com/olekukonko/tablewriter v1.1.3 h1:VSHhghXxrP0JHl+0NnKid7WoEmd9/urKRJLysb70nnA=
94+
github.com/olekukonko/tablewriter v1.1.3/go.mod h1:9VU0knjhmMkXjnMKrZ3+L2JhhtsQ/L38BbL3CRNE8tM=
8495
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
8596
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8697
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

‎testdata/tasks.table‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| ID | TASKDEFINITION | INSTANCE | LASTSTATUS | DESIREDSTATUS | CREATEDAT | GROUP | TYPE |
2-
+--------------------------------------+------------------+--------------------------------------+------------+---------------+---------------------------+----------------------+---------+
3-
| 045a0639-1dc5-4d17-8101-2dd3fd339e91 | taskdef-name:123 | 2ee1c131-7f61-43ab-884a-379e668d31fb | PENDING | RUNNING | 2022-01-01T09:00:00+09:00 | family:taskdef-name | EC2 |
4-
| 8f431e68-a57d-41db-ae8d-5eb700a134dc | taskdef-name:999 | 70d14568-f853-4c03-92a5-86ef9b3c0077 | PENDING | RUNNING | 2023-01-01T09:00:00+09:00 | service:service-name | FARGATE |
1+
| ID | TASK DEFINITION | INSTANCE | LAST STATUS | DESIRED STATUS | CREATED AT | GROUP | TYPE |
2+
+--------------------------------------+------------------+--------------------------------------+-------------+----------------+---------------------------+----------------------+---------+
3+
| 045a0639-1dc5-4d17-8101-2dd3fd339e91 | taskdef-name:123 | 2ee1c131-7f61-43ab-884a-379e668d31fb | PENDING | RUNNING | 2022-01-01T09:00:00+09:00 | family:taskdef-name | EC2 |
4+
| 8f431e68-a57d-41db-ae8d-5eb700a134dc | taskdef-name:999 | 70d14568-f853-4c03-92a5-86ef9b3c0077 | PENDING | RUNNING | 2023-01-01T09:00:00+09:00 | service:service-name | FARGATE |

‎testdata/tasks_withtags.table‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| ID | TASKDEFINITION | INSTANCE | LASTSTATUS | DESIREDSTATUS | CREATEDAT | GROUP | TYPE | TAGS |
2-
+--------------------------------------+------------------+--------------------------------------+------------+---------------+---------------------------+----------------------+---------+-------------------------+
3-
| 045a0639-1dc5-4d17-8101-2dd3fd339e91 | taskdef-name:123 | 2ee1c131-7f61-43ab-884a-379e668d31fb | PENDING | RUNNING | 2022-01-01T09:00:00+09:00 | family:taskdef-name | EC2 | Name=task-name,Env=prod |
4-
| 8f431e68-a57d-41db-ae8d-5eb700a134dc | taskdef-name:999 | 70d14568-f853-4c03-92a5-86ef9b3c0077 | PENDING | RUNNING | 2023-01-01T09:00:00+09:00 | service:service-name | FARGATE | Name=task-name,Env=dev |
1+
| ID | TASK DEFINITION | INSTANCE | LAST STATUS | DESIRED STATUS | CREATED AT | GROUP | TYPE | TAGS |
2+
+--------------------------------------+------------------+--------------------------------------+-------------+----------------+---------------------------+----------------------+---------+-------------------------+
3+
| 045a0639-1dc5-4d17-8101-2dd3fd339e91 | taskdef-name:123 | 2ee1c131-7f61-43ab-884a-379e668d31fb | PENDING | RUNNING | 2022-01-01T09:00:00+09:00 | family:taskdef-name | EC2 | Name=task-name,Env=prod |
4+
| 8f431e68-a57d-41db-ae8d-5eb700a134dc | taskdef-name:999 | 70d14568-f853-4c03-92a5-86ef9b3c0077 | PENDING | RUNNING | 2023-01-01T09:00:00+09:00 | service:service-name | FARGATE | Name=task-name,Env=dev |

0 commit comments

Comments
 (0)