The tabwriter was configured to have a min-width for columns of 20 positions.
This seemed quite wide, and caused smaller columns to be printed with a large
gap between.
Before:
docker container stats
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
29184b3ae391 amazing_shirley 0.00% 800KiB / 1.944GiB 0.04% 1.44kB / 0B 0B / 0B 1
403c101bad56 agitated_swartz 0.15% 34.31MiB / 1.944GiB 1.72% 10.2MB / 206kB 0B / 0B 51
0dc4b7f6c6be container2 0.00% 1.012MiB / 1.944GiB 0.05% 12.9kB / 0B 0B / 0B 5
2d99abcc6f62 container99 0.00% 972KiB / 1.944GiB 0.05% 13kB / 0B 0B / 0B 5
9f9aa90173ac foo 0.00% 820KiB / 1.944GiB 0.04% 13kB / 0B 0B / 0B 5
docker container ls
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
29184b3ae391 docker-cli-dev "ash" 4 hours ago Up 4 hours amazing_shirley
403c101bad56 docker-dev:master "hack/dind bash" 3 days ago Up 3 days agitated_swartz
0dc4b7f6c6be nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp container2
2d99abcc6f62 nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp container99
9f9aa90173ac nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp foo
docker image ls
REPOSITORY TAG IMAGE ID CREATED SIZE
docker-cli-dev latest 5f603caa04aa 4 hours ago 610MB
docker-cli-native latest 9dd29f8d387b 4 hours ago 519MB
docker-dev master 8132bf7a199e 3 days ago 2.02GB
docker-dev improve-build-errors 69e208994b3f 11 days ago 2.01GB
docker-dev refactor-idtools 69e208994b3f 11 days ago 2.01GB
After:
docker container stats
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
29184b3ae391 amazing_shirley 0.14% 5.703MiB / 1.944GiB 0.29% 1.44kB / 0B 0B / 0B 10
403c101bad56 agitated_swartz 0.15% 56.97MiB / 1.944GiB 2.86% 10.2MB / 206kB 0B / 0B 51
0dc4b7f6c6be container2 0.00% 1016KiB / 1.944GiB 0.05% 12.9kB / 0B 0B / 0B 5
2d99abcc6f62 container99 0.00% 956KiB / 1.944GiB 0.05% 13kB / 0B 0B / 0B 5
9f9aa90173ac foo 0.00% 980KiB / 1.944GiB 0.05% 13kB / 0B 0B / 0B 5
docker container ls
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
29184b3ae391 docker-cli-dev "ash" 12 minutes ago Up 12 minutes amazing_shirley
403c101bad56 docker-dev:master "hack/dind bash" 3 days ago Up 3 days agitated_swartz
0dc4b7f6c6be nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp container2
2d99abcc6f62 nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp container99
9f9aa90173ac nginx:alpine "/docker-entrypoint.…" 4 days ago Up 4 days 80/tcp foo
docker image ls
REPOSITORY TAG IMAGE ID CREATED SIZE
docker-cli-dev latest 5f603caa04aa 4 hours ago 610MB
docker-cli-native latest 9dd29f8d387b 4 hours ago 519MB
docker-dev master 8132bf7a199e 3 days ago 2.02GB
docker-dev improve-build-errors 69e208994b3f 11 days ago 2.01GB
docker-dev refactor-idtools 69e208994b3f 11 days ago 2.01GB
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
188 lines
4.3 KiB
Go
188 lines
4.3 KiB
Go
package formatter
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestVolumeContext(t *testing.T) {
|
|
volumeName := stringid.GenerateRandomID()
|
|
|
|
var ctx volumeContext
|
|
cases := []struct {
|
|
volumeCtx volumeContext
|
|
expValue string
|
|
call func() string
|
|
}{
|
|
{volumeContext{
|
|
v: types.Volume{Name: volumeName},
|
|
}, volumeName, ctx.Name},
|
|
{volumeContext{
|
|
v: types.Volume{Driver: "driver_name"},
|
|
}, "driver_name", ctx.Driver},
|
|
{volumeContext{
|
|
v: types.Volume{Scope: "local"},
|
|
}, "local", ctx.Scope},
|
|
{volumeContext{
|
|
v: types.Volume{Mountpoint: "mountpoint"},
|
|
}, "mountpoint", ctx.Mountpoint},
|
|
{volumeContext{
|
|
v: types.Volume{},
|
|
}, "", ctx.Labels},
|
|
{volumeContext{
|
|
v: types.Volume{Labels: map[string]string{"label1": "value1", "label2": "value2"}},
|
|
}, "label1=value1,label2=value2", ctx.Labels},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
ctx = c.volumeCtx
|
|
v := c.call()
|
|
if strings.Contains(v, ",") {
|
|
test.CompareMultipleValues(t, v, c.expValue)
|
|
} else if v != c.expValue {
|
|
t.Fatalf("Expected %s, was %s\n", c.expValue, v)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestVolumeContextWrite(t *testing.T) {
|
|
cases := []struct {
|
|
context Context
|
|
expected string
|
|
}{
|
|
// Errors
|
|
{
|
|
Context{Format: "{{InvalidFunction}}"},
|
|
`Template parsing error: template: :1: function "InvalidFunction" not defined
|
|
`,
|
|
},
|
|
{
|
|
Context{Format: "{{nil}}"},
|
|
`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
|
|
`,
|
|
},
|
|
// Table format
|
|
{
|
|
Context{Format: NewVolumeFormat("table", false)},
|
|
`DRIVER VOLUME NAME
|
|
foo foobar_baz
|
|
bar foobar_bar
|
|
`,
|
|
},
|
|
{
|
|
Context{Format: NewVolumeFormat("table", true)},
|
|
`foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
{
|
|
Context{Format: NewVolumeFormat("table {{.Name}}", false)},
|
|
`VOLUME NAME
|
|
foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
{
|
|
Context{Format: NewVolumeFormat("table {{.Name}}", true)},
|
|
`VOLUME NAME
|
|
foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
// Raw Format
|
|
{
|
|
Context{Format: NewVolumeFormat("raw", false)},
|
|
`name: foobar_baz
|
|
driver: foo
|
|
|
|
name: foobar_bar
|
|
driver: bar
|
|
|
|
`,
|
|
},
|
|
{
|
|
Context{Format: NewVolumeFormat("raw", true)},
|
|
`name: foobar_baz
|
|
name: foobar_bar
|
|
`,
|
|
},
|
|
// Custom Format
|
|
{
|
|
Context{Format: NewVolumeFormat("{{.Name}}", false)},
|
|
`foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
}
|
|
|
|
volumes := []*types.Volume{
|
|
{Name: "foobar_baz", Driver: "foo"},
|
|
{Name: "foobar_bar", Driver: "bar"},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
tc := tc
|
|
t.Run(string(tc.context.Format), func(t *testing.T) {
|
|
var out bytes.Buffer
|
|
tc.context.Output = &out
|
|
err := VolumeWrite(tc.context, volumes)
|
|
if err != nil {
|
|
assert.Error(t, err, tc.expected)
|
|
} else {
|
|
assert.Equal(t, out.String(), tc.expected)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestVolumeContextWriteJSON(t *testing.T) {
|
|
volumes := []*types.Volume{
|
|
{Driver: "foo", Name: "foobar_baz"},
|
|
{Driver: "bar", Name: "foobar_bar"},
|
|
}
|
|
expectedJSONs := []map[string]interface{}{
|
|
{"Driver": "foo", "Labels": "", "Links": "N/A", "Mountpoint": "", "Name": "foobar_baz", "Scope": "", "Size": "N/A"},
|
|
{"Driver": "bar", "Labels": "", "Links": "N/A", "Mountpoint": "", "Name": "foobar_bar", "Scope": "", "Size": "N/A"},
|
|
}
|
|
out := bytes.NewBufferString("")
|
|
err := VolumeWrite(Context{Format: "{{json .}}", Output: out}, volumes)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
|
|
msg := fmt.Sprintf("Output: line %d: %s", i, line)
|
|
var m map[string]interface{}
|
|
err := json.Unmarshal([]byte(line), &m)
|
|
assert.NilError(t, err, msg)
|
|
assert.Check(t, is.DeepEqual(expectedJSONs[i], m), msg)
|
|
}
|
|
}
|
|
|
|
func TestVolumeContextWriteJSONField(t *testing.T) {
|
|
volumes := []*types.Volume{
|
|
{Driver: "foo", Name: "foobar_baz"},
|
|
{Driver: "bar", Name: "foobar_bar"},
|
|
}
|
|
out := bytes.NewBufferString("")
|
|
err := VolumeWrite(Context{Format: "{{json .Name}}", Output: out}, volumes)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
|
|
msg := fmt.Sprintf("Output: line %d: %s", i, line)
|
|
var s string
|
|
err := json.Unmarshal([]byte(line), &s)
|
|
assert.NilError(t, err, msg)
|
|
assert.Check(t, is.Equal(volumes[i].Name, s), msg)
|
|
}
|
|
}
|