mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ea61dac9e6
This fix is an attempt to address https://github.com/docker/docker/pull/28213#issuecomment-273840405 Currently when specify table format with table `--format "table {{.ID}}..."`, the delimiter in the header section of the table is always `"\t"`. That is actually different from the content of the table as the delimiter could be anything (or even contatenated with `.`, for example): ``` $ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc NAME ID web.1.inyhxhvjcijl0hdbu8lgrwwh7 \_ web.1.p9m4kx2srjqmfms4igam0uqlb ``` This fix is an attampt to address the skewness of the table when delimiter is not `"\t"`. The basic idea is that, when header consists of `table` key, the header section will be redendered the same way as content section. A map mapping each placeholder name to the HEADER entry name is used for the context of the header. Unit tests have been updated and added to cover the changes. This fix is related to #28313. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
183 lines
4.2 KiB
Go
183 lines
4.2 KiB
Go
package formatter
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/pkg/testutil/assert"
|
|
)
|
|
|
|
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, ",") {
|
|
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
|
|
`,
|
|
},
|
|
}
|
|
|
|
for _, testcase := range cases {
|
|
volumes := []*types.Volume{
|
|
{Name: "foobar_baz", Driver: "foo"},
|
|
{Name: "foobar_bar", Driver: "bar"},
|
|
}
|
|
out := bytes.NewBufferString("")
|
|
testcase.context.Output = out
|
|
err := VolumeWrite(testcase.context, volumes)
|
|
if err != nil {
|
|
assert.Error(t, err, testcase.expected)
|
|
} else {
|
|
assert.Equal(t, out.String(), testcase.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") {
|
|
t.Logf("Output: line %d: %s", i, line)
|
|
var m map[string]interface{}
|
|
if err := json.Unmarshal([]byte(line), &m); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
assert.DeepEqual(t, m, expectedJSONs[i])
|
|
}
|
|
}
|
|
|
|
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") {
|
|
t.Logf("Output: line %d: %s", i, line)
|
|
var s string
|
|
if err := json.Unmarshal([]byte(line), &s); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
assert.Equal(t, s, volumes[i].Name)
|
|
}
|
|
}
|