Skip to content

Commit 0c2ce6d

Browse files
BotondGalxcBotondGalxc
authored
Merge pull request #285 from metal-stack/table-printers
Upgrade metal-lib with new tableprinter version
2 parents 6e237e4 + 6698a8e commit 0c2ce6d

24 files changed

+340
-352
lines changed

‎cmd/audit_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ func Test_AuditCmd_MultiResult(t *testing.T) {
8080
auditTrace1,
8181
},
8282
wantTable: pointer.Pointer(`
83-
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER
84-
2022-05-19 01:03:03 b5817ef7-980a-41ef-9ed3-741a143870b0 test POST /v1/audit 403 b-user
85-
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user
83+
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER
84+
2022-05-19 01:03:03 b5817ef7-980a-41ef-9ed3-741a143870b0 test POST /v1/audit 403 b-user
85+
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user
8686
`),
8787
wantWideTable: pointer.Pointer(`
88-
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER TENANT BODY
89-
2022-05-19 01:03:03 b5817ef7-980a-41ef-9ed3-741a143870b0 test POST /v1/audit 403 b-user b-tenant {"c": "d"}
90-
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user a-tenant {"a": "b"}
88+
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER TENANT BODY
89+
2022-05-19 01:03:03 b5817ef7-980a-41ef-9ed3-741a143870b0 test POST /v1/audit 403 b-user b-tenant {"c": "d"}
90+
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user a-tenant {"a": "b"}
9191
`),
9292
template: pointer.Pointer(`{{ date "02/01/2006" .timestamp }} {{ .rqid }}`),
9393
wantTemplate: pointer.Pointer(`
9494
19/05/2022 b5817ef7-980a-41ef-9ed3-741a143870b0
9595
19/05/2022 c40ad996-e1fd-4511-a7bf-418219cb8d91
9696
`),
9797
wantMarkdown: pointer.Pointer(`
98-
| TIME | REQUEST ID | COMPONENT | DETAIL | PATH | CODE | USER |
98+
| TIME | REQUEST ID | COMPONENT | DETAIL | PATH | CODE | USER |
9999
|---------------------|--------------------------------------|-----------|--------|-----------|------|--------|
100-
| 2022-05-19 01:03:03 | b5817ef7-980a-41ef-9ed3-741a143870b0 | test | POST | /v1/audit | 403 | b-user |
101-
| 2022-05-19 01:02:03 | c40ad996-e1fd-4511-a7bf-418219cb8d91 | example | GET | /v1/audit | 200 | a-user |
100+
| 2022-05-19 01:03:03 | b5817ef7-980a-41ef-9ed3-741a143870b0 | test | POST | /v1/audit | 403 | b-user |
101+
| 2022-05-19 01:02:03 | c40ad996-e1fd-4511-a7bf-418219cb8d91 | example | GET | /v1/audit | 200 | a-user |
102102
`),
103103
},
104104
{
@@ -155,21 +155,21 @@ TIME REQUEST ID COMPONENT DETAIL
155155
auditTrace1,
156156
},
157157
wantTable: pointer.Pointer(`
158-
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER
159-
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user
158+
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER
159+
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user
160160
`),
161161
wantWideTable: pointer.Pointer(`
162-
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER TENANT BODY
163-
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user a-tenant {"a": "b"}
162+
TIME REQUEST ID COMPONENT DETAIL PATH CODE USER TENANT BODY
163+
2022-05-19 01:02:03 c40ad996-e1fd-4511-a7bf-418219cb8d91 example GET /v1/audit 200 a-user a-tenant {"a": "b"}
164164
`),
165165
template: pointer.Pointer(`{{ date "02/01/2006" .timestamp }} {{ .rqid }}`),
166166
wantTemplate: pointer.Pointer(`
167167
19/05/2022 c40ad996-e1fd-4511-a7bf-418219cb8d91
168168
`),
169169
wantMarkdown: pointer.Pointer(`
170-
| TIME | REQUEST ID | COMPONENT | DETAIL | PATH | CODE | USER |
170+
| TIME | REQUEST ID | COMPONENT | DETAIL | PATH | CODE | USER |
171171
|---------------------|--------------------------------------|-----------|--------|-----------|------|--------|
172-
| 2022-05-19 01:02:03 | c40ad996-e1fd-4511-a7bf-418219cb8d91 | example | GET | /v1/audit | 200 | a-user |`),
172+
| 2022-05-19 01:02:03 | c40ad996-e1fd-4511-a7bf-418219cb8d91 | example | GET | /v1/audit | 200 | a-user |`),
173173
},
174174
}
175175
for _, tt := range tests {

‎cmd/filesystemlayout_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -149,28 +149,28 @@ func Test_FilesystemLayoutCmd_MultiResult(t *testing.T) {
149149
fsl2,
150150
},
151151
wantTable: pointer.Pointer(`
152-
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
153-
1 fsl 1 /tmp tmpfs size1 os-image *
154-
/boot/efi /dev/sda1
155-
2 fsl 2 /tmp tmpfs size1 os-image *
152+
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
153+
1 fsl 1 /tmp tmpfs size1 os-image *
154+
/boot/efi /dev/sda1
155+
2 fsl 2 /tmp tmpfs size1 os-image *
156156
`),
157157
wantWideTable: pointer.Pointer(`
158-
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
159-
1 fsl 1 /tmp tmpfs size1 os-image *
160-
/boot/efi /dev/sda1
161-
2 fsl 2 /tmp tmpfs size1 os-image *
158+
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
159+
1 fsl 1 /tmp tmpfs size1 os-image *
160+
/boot/efi /dev/sda1
161+
2 fsl 2 /tmp tmpfs size1 os-image *
162162
`),
163163
template: pointer.Pointer("{{ .id }} {{ .name }}"),
164164
wantTemplate: pointer.Pointer(`
165165
1 fsl1
166166
2 fsl2
167167
`),
168168
wantMarkdown: pointer.Pointer(`
169-
| ID | DESCRIPTION | FILESYSTEMS | SIZES | IMAGES |
169+
| ID | DESCRIPTION | FILESYSTEMS | SIZES | IMAGES |
170170
|----|-------------|----------------------|-------|------------|
171-
| 1 | fsl 1 | /tmp tmpfs | size1 | os-image * |
171+
| 1 | fsl 1 | /tmp tmpfs | size1 | os-image * |
172172
| | | /boot/efi /dev/sda1 | | |
173-
| 2 | fsl 2 | /tmp tmpfs | size1 | os-image * |
173+
| 2 | fsl 2 | /tmp tmpfs | size1 | os-image * |
174174
`),
175175
},
176176
{
@@ -276,23 +276,23 @@ func Test_FilesystemLayoutCmd_SingleResult(t *testing.T) {
276276
},
277277
want: fsl1,
278278
wantTable: pointer.Pointer(`
279-
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
280-
1 fsl 1 /tmp tmpfs size1 os-image *
281-
/boot/efi /dev/sda1
279+
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
280+
1 fsl 1 /tmp tmpfs size1 os-image *
281+
/boot/efi /dev/sda1
282282
`),
283283
wantWideTable: pointer.Pointer(`
284-
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
285-
1 fsl 1 /tmp tmpfs size1 os-image *
286-
/boot/efi /dev/sda1
284+
ID DESCRIPTION FILESYSTEMS SIZES IMAGES
285+
1 fsl 1 /tmp tmpfs size1 os-image *
286+
/boot/efi /dev/sda1
287287
`),
288288
template: pointer.Pointer("{{ .id }} {{ .name }}"),
289289
wantTemplate: pointer.Pointer(`
290290
1 fsl1
291291
`),
292292
wantMarkdown: pointer.Pointer(`
293-
| ID | DESCRIPTION | FILESYSTEMS | SIZES | IMAGES |
293+
| ID | DESCRIPTION | FILESYSTEMS | SIZES | IMAGES |
294294
|----|-------------|----------------------|-------|------------|
295-
| 1 | fsl 1 | /tmp tmpfs | size1 | os-image * |
295+
| 1 | fsl 1 | /tmp tmpfs | size1 | os-image * |
296296
| | | /boot/efi /dev/sda1 | | |
297297
`),
298298
},

‎cmd/firewall_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -213,25 +213,25 @@ func Test_FirewallCmd_MultiResult(t *testing.T) {
213213
firewall2,
214214
},
215215
wantTable: pointer.Pointer(`
216-
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
217-
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
218-
2 14d firewall-hostname-2 project-1 private 1.1.1.1 1
216+
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
217+
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
218+
2 14d firewall-hostname-2 project-1 private 1.1.1.1 1
219219
`),
220220
wantWideTable: pointer.Pointer(`
221-
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
222-
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
223-
2 14d firewall-hostname-2 project-1 private 1.1.1.1 1
221+
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
222+
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
223+
2 14d firewall-hostname-2 project-1 private 1.1.1.1 1
224224
`),
225225
template: pointer.Pointer("{{ .id }} {{ .name }}"),
226226
wantTemplate: pointer.Pointer(`
227227
1 firewall-1
228228
2 firewall-2
229229
`),
230230
wantMarkdown: pointer.Pointer(`
231-
| ID | AGE | HOSTNAME | PROJECT | NETWORKS | IPS | PARTITION |
231+
| ID | AGE | HOSTNAME | PROJECT | NETWORKS | IPS | PARTITION |
232232
|----|-----|---------------------|-----------|----------|---------|-----------|
233-
| 1 | 14d | firewall-hostname-1 | project-1 | private | 1.1.1.1 | 1 |
234-
| 2 | 14d | firewall-hostname-2 | project-1 | private | 1.1.1.1 | 1 |
233+
| 1 | 14d | firewall-hostname-1 | project-1 | private | 1.1.1.1 | 1 |
234+
| 2 | 14d | firewall-hostname-2 | project-1 | private | 1.1.1.1 | 1 |
235235
`),
236236
},
237237
}
@@ -256,21 +256,21 @@ func Test_FirewallCmd_SingleResult(t *testing.T) {
256256
},
257257
want: firewall1,
258258
wantTable: pointer.Pointer(`
259-
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
260-
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
259+
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
260+
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
261261
`),
262262
wantWideTable: pointer.Pointer(`
263-
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
264-
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
263+
ID AGE HOSTNAME PROJECT NETWORKS IPS PARTITION
264+
1 14d firewall-hostname-1 project-1 private 1.1.1.1 1
265265
`),
266266
template: pointer.Pointer("{{ .id }} {{ .name }}"),
267267
wantTemplate: pointer.Pointer(`
268268
1 firewall-1
269269
`),
270270
wantMarkdown: pointer.Pointer(`
271-
| ID | AGE | HOSTNAME | PROJECT | NETWORKS | IPS | PARTITION |
271+
| ID | AGE | HOSTNAME | PROJECT | NETWORKS | IPS | PARTITION |
272272
|----|-----|---------------------|-----------|----------|---------|-----------|
273-
| 1 | 14d | firewall-hostname-1 | project-1 | private | 1.1.1.1 | 1 |
273+
| 1 | 14d | firewall-hostname-1 | project-1 | private | 1.1.1.1 | 1 |
274274
`),
275275
},
276276
{

‎cmd/image_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,25 @@ func Test_ImageCmd_MultiResult(t *testing.T) {
6464
image2,
6565
},
6666
wantTable: pointer.Pointer(`
67-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
68-
debian debian-name debian-description machine 3d supported 1
69-
ubuntu ubuntu-name ubuntu-description machine 3d supported 1
67+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
68+
debian debian-name debian-description machine 3d supported 1
69+
ubuntu ubuntu-name ubuntu-description machine 3d supported 1
7070
`),
7171
wantWideTable: pointer.Pointer(`
72-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
73-
debian debian-name debian-description machine 3d supported abc-def
74-
ubuntu ubuntu-name ubuntu-description machine 3d supported 123
72+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
73+
debian debian-name debian-description machine 3d supported abc-def
74+
ubuntu ubuntu-name ubuntu-description machine 3d supported 123
7575
`),
7676
template: pointer.Pointer("{{ .id }} {{ .name }}"),
7777
wantTemplate: pointer.Pointer(`
7878
debian debian-name
7979
ubuntu ubuntu-name
8080
`),
8181
wantMarkdown: pointer.Pointer(`
82-
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USEDBY |
83-
|--------|-------------|--------------------|----------|------------|-----------|--------|
84-
| debian | debian-name | debian-description | machine | 3d | supported | 1 |
85-
| ubuntu | ubuntu-name | ubuntu-description | machine | 3d | supported | 1 |
82+
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USED BY |
83+
|--------|-------------|--------------------|----------|------------|-----------|---------|
84+
| debian | debian-name | debian-description | machine | 3d | supported | 1 |
85+
| ubuntu | ubuntu-name | ubuntu-description | machine | 3d | supported | 1 |
8686
`),
8787
},
8888
{
@@ -119,21 +119,21 @@ ubuntu ubuntu-name
119119
image1,
120120
},
121121
wantTable: pointer.Pointer(`
122-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
123-
debian debian-name debian-description machine 3d supported 1
122+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
123+
debian debian-name debian-description machine 3d supported 1
124124
`),
125125
wantWideTable: pointer.Pointer(`
126-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
127-
debian debian-name debian-description machine 3d supported abc-def
126+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
127+
debian debian-name debian-description machine 3d supported abc-def
128128
`),
129129
template: pointer.Pointer("{{ .id }} {{ .name }}"),
130130
wantTemplate: pointer.Pointer(`
131131
debian debian-name
132132
`),
133133
wantMarkdown: pointer.Pointer(`
134-
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USEDBY |
135-
|--------|-------------|--------------------|----------|------------|-----------|--------|
136-
| debian | debian-name | debian-description | machine | 3d | supported | 1 |
134+
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USED BY |
135+
|--------|-------------|--------------------|----------|------------|-----------|---------|
136+
| debian | debian-name | debian-description | machine | 3d | supported | 1 |
137137
`),
138138
},
139139
{
@@ -239,21 +239,21 @@ func Test_ImageCmd_SingleResult(t *testing.T) {
239239
},
240240
want: image1,
241241
wantTable: pointer.Pointer(`
242-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
243-
debian debian-name debian-description machine 3d supported
242+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
243+
debian debian-name debian-description machine 3d supported
244244
`),
245245
wantWideTable: pointer.Pointer(`
246-
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USEDBY
247-
debian debian-name debian-description machine 3d supported
246+
ID NAME DESCRIPTION FEATURES EXPIRATION STATUS USED BY
247+
debian debian-name debian-description machine 3d supported
248248
`),
249249
template: pointer.Pointer("{{ .id }} {{ .name }}"),
250250
wantTemplate: pointer.Pointer(`
251251
debian debian-name
252252
`),
253253
wantMarkdown: pointer.Pointer(`
254-
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USEDBY |
255-
|--------|-------------|--------------------|----------|------------|-----------|--------|
256-
| debian | debian-name | debian-description | machine | 3d | supported | |
254+
| ID | NAME | DESCRIPTION | FEATURES | EXPIRATION | STATUS | USED BY |
255+
|--------|-------------|--------------------|----------|------------|-----------|---------|
256+
| debian | debian-name | debian-description | machine | 3d | supported | |
257257
`),
258258
},
259259
{

‎cmd/ip_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@ func Test_IPCmd_MultiResult(t *testing.T) {
6262
ip2,
6363
},
6464
wantTable: pointer.Pointer(`
65-
IP DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
66-
1.1.1.1 ip 1 ip-1 internet project-1 ephemeral a
67-
2.2.2.2 ip 2 ip-2 internet project-2 static b
65+
IP DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
66+
1.1.1.1 ip 1 ip-1 internet project-1 ephemeral a
67+
2.2.2.2 ip 2 ip-2 internet project-2 static b
6868
`),
6969
wantWideTable: pointer.Pointer(`
70-
IP ALLOCATION UUID DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
71-
1.1.1.1 1 ip 1 ip-1 internet project-1 ephemeral a
72-
2.2.2.2 2 ip 2 ip-2 internet project-2 static b
70+
IP ALLOCATION UUID DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
71+
1.1.1.1 1 ip 1 ip-1 internet project-1 ephemeral a
72+
2.2.2.2 2 ip 2 ip-2 internet project-2 static b
7373
`),
7474
template: pointer.Pointer("{{ .ipaddress }} {{ .name }}"),
7575
wantTemplate: pointer.Pointer(`
7676
1.1.1.1 ip-1
7777
2.2.2.2 ip-2
7878
`),
7979
wantMarkdown: pointer.Pointer(`
80-
| IP | DESCRIPTION | NAME | NETWORK | PROJECT | TYPE | TAGS |
80+
| IP | DESCRIPTION | NAME | NETWORK | PROJECT | TYPE | TAGS |
8181
|---------|-------------|------|----------|-----------|-----------|------|
8282
| 1.1.1.1 | ip 1 | ip-1 | internet | project-1 | ephemeral | a |
8383
| 2.2.2.2 | ip 2 | ip-2 | internet | project-2 | static | b |
@@ -186,19 +186,19 @@ func Test_IPCmd_SingleResult(t *testing.T) {
186186
},
187187
want: ip1,
188188
wantTable: pointer.Pointer(`
189-
IP DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
190-
1.1.1.1 ip 1 ip-1 internet project-1 ephemeral a
189+
IP DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
190+
1.1.1.1 ip 1 ip-1 internet project-1 ephemeral a
191191
`),
192192
wantWideTable: pointer.Pointer(`
193-
IP ALLOCATION UUID DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
194-
1.1.1.1 1 ip 1 ip-1 internet project-1 ephemeral a
193+
IP ALLOCATION UUID DESCRIPTION NAME NETWORK PROJECT TYPE TAGS
194+
1.1.1.1 1 ip 1 ip-1 internet project-1 ephemeral a
195195
`),
196196
template: pointer.Pointer("{{ .ipaddress }} {{ .name }}"),
197197
wantTemplate: pointer.Pointer(`
198198
1.1.1.1 ip-1
199199
`),
200200
wantMarkdown: pointer.Pointer(`
201-
| IP | DESCRIPTION | NAME | NETWORK | PROJECT | TYPE | TAGS |
201+
| IP | DESCRIPTION | NAME | NETWORK | PROJECT | TYPE | TAGS |
202202
|---------|-------------|------|----------|-----------|-----------|------|
203203
| 1.1.1.1 | ip 1 | ip-1 | internet | project-1 | ephemeral | a |
204204
`),

0 commit comments

Comments
 (0)