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>
220 lines
5.6 KiB
Go
220 lines
5.6 KiB
Go
package network
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
"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 TestNetworkContext(t *testing.T) {
|
|
networkID := stringid.GenerateRandomID()
|
|
|
|
var ctx networkContext
|
|
cases := []struct {
|
|
networkCtx networkContext
|
|
expValue string
|
|
call func() string
|
|
}{
|
|
{networkContext{
|
|
n: types.NetworkResource{ID: networkID},
|
|
trunc: false,
|
|
}, networkID, ctx.ID},
|
|
{networkContext{
|
|
n: types.NetworkResource{ID: networkID},
|
|
trunc: true,
|
|
}, stringid.TruncateID(networkID), ctx.ID},
|
|
{networkContext{
|
|
n: types.NetworkResource{Name: "network_name"},
|
|
}, "network_name", ctx.Name},
|
|
{networkContext{
|
|
n: types.NetworkResource{Driver: "driver_name"},
|
|
}, "driver_name", ctx.Driver},
|
|
{networkContext{
|
|
n: types.NetworkResource{EnableIPv6: true},
|
|
}, "true", ctx.IPv6},
|
|
{networkContext{
|
|
n: types.NetworkResource{EnableIPv6: false},
|
|
}, "false", ctx.IPv6},
|
|
{networkContext{
|
|
n: types.NetworkResource{Internal: true},
|
|
}, "true", ctx.Internal},
|
|
{networkContext{
|
|
n: types.NetworkResource{Internal: false},
|
|
}, "false", ctx.Internal},
|
|
{networkContext{
|
|
n: types.NetworkResource{},
|
|
}, "", ctx.Labels},
|
|
{networkContext{
|
|
n: types.NetworkResource{Labels: map[string]string{"label1": "value1", "label2": "value2"}},
|
|
}, "label1=value1,label2=value2", ctx.Labels},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
ctx = c.networkCtx
|
|
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 TestNetworkContextWrite(t *testing.T) {
|
|
cases := []struct {
|
|
context formatter.Context
|
|
expected string
|
|
}{
|
|
|
|
// Errors
|
|
{
|
|
formatter.Context{Format: "{{InvalidFunction}}"},
|
|
`Template parsing error: template: :1: function "InvalidFunction" not defined
|
|
`,
|
|
},
|
|
{
|
|
formatter.Context{Format: "{{nil}}"},
|
|
`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
|
|
`,
|
|
},
|
|
// Table format
|
|
{
|
|
formatter.Context{Format: NewFormat("table", false)},
|
|
`NETWORK ID NAME DRIVER SCOPE
|
|
networkID1 foobar_baz foo local
|
|
networkID2 foobar_bar bar local
|
|
`,
|
|
},
|
|
{
|
|
formatter.Context{Format: NewFormat("table", true)},
|
|
`networkID1
|
|
networkID2
|
|
`,
|
|
},
|
|
{
|
|
formatter.Context{Format: NewFormat("table {{.Name}}", false)},
|
|
`NAME
|
|
foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
{
|
|
formatter.Context{Format: NewFormat("table {{.Name}}", true)},
|
|
`NAME
|
|
foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
// Raw Format
|
|
{
|
|
formatter.Context{Format: NewFormat("raw", false)},
|
|
`network_id: networkID1
|
|
name: foobar_baz
|
|
driver: foo
|
|
scope: local
|
|
|
|
network_id: networkID2
|
|
name: foobar_bar
|
|
driver: bar
|
|
scope: local
|
|
|
|
`,
|
|
},
|
|
{
|
|
formatter.Context{Format: NewFormat("raw", true)},
|
|
`network_id: networkID1
|
|
network_id: networkID2
|
|
`,
|
|
},
|
|
// Custom Format
|
|
{
|
|
formatter.Context{Format: NewFormat("{{.Name}}", false)},
|
|
`foobar_baz
|
|
foobar_bar
|
|
`,
|
|
},
|
|
// Custom Format with CreatedAt
|
|
{
|
|
formatter.Context{Format: NewFormat("{{.Name}} {{.CreatedAt}}", false)},
|
|
`foobar_baz 2016-01-01 00:00:00 +0000 UTC
|
|
foobar_bar 2017-01-01 00:00:00 +0000 UTC
|
|
`,
|
|
},
|
|
}
|
|
|
|
timestamp1, _ := time.Parse("2006-01-02", "2016-01-01")
|
|
timestamp2, _ := time.Parse("2006-01-02", "2017-01-01")
|
|
|
|
networks := []types.NetworkResource{
|
|
{ID: "networkID1", Name: "foobar_baz", Driver: "foo", Scope: "local", Created: timestamp1},
|
|
{ID: "networkID2", Name: "foobar_bar", Driver: "bar", Scope: "local", Created: timestamp2},
|
|
}
|
|
|
|
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 := FormatWrite(tc.context, networks)
|
|
if err != nil {
|
|
assert.Error(t, err, tc.expected)
|
|
} else {
|
|
assert.Equal(t, out.String(), tc.expected)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNetworkContextWriteJSON(t *testing.T) {
|
|
networks := []types.NetworkResource{
|
|
{ID: "networkID1", Name: "foobar_baz"},
|
|
{ID: "networkID2", Name: "foobar_bar"},
|
|
}
|
|
expectedJSONs := []map[string]interface{}{
|
|
{"Driver": "", "ID": "networkID1", "IPv6": "false", "Internal": "false", "Labels": "", "Name": "foobar_baz", "Scope": "", "CreatedAt": "0001-01-01 00:00:00 +0000 UTC"},
|
|
{"Driver": "", "ID": "networkID2", "IPv6": "false", "Internal": "false", "Labels": "", "Name": "foobar_bar", "Scope": "", "CreatedAt": "0001-01-01 00:00:00 +0000 UTC"},
|
|
}
|
|
|
|
out := bytes.NewBufferString("")
|
|
err := FormatWrite(formatter.Context{Format: "{{json .}}", Output: out}, networks)
|
|
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 TestNetworkContextWriteJSONField(t *testing.T) {
|
|
networks := []types.NetworkResource{
|
|
{ID: "networkID1", Name: "foobar_baz"},
|
|
{ID: "networkID2", Name: "foobar_bar"},
|
|
}
|
|
out := bytes.NewBufferString("")
|
|
err := FormatWrite(formatter.Context{Format: "{{json .ID}}", Output: out}, networks)
|
|
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(networks[i].ID, s), msg)
|
|
}
|
|
}
|