toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vendor: github.com/moby/moby/api v1.52.0-beta.1, client v0.1.0-beta.0

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Co-authored-by: Austin Vazquez <austin.vazquez@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-08-28 19:36:34 +02:00
parent 9fb049c8b6
commit b55fed5ef6
110 changed files with 1036 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/network/client_test.go
View File

@ -44,7 +44,7 @@ func (c *fakeClient) NetworkList(ctx context.Context, options client.NetworkList
if c.networkListFunc != nil {
return c.networkListFunc(ctx, options)
}
return []network.Inspect{}, nil
return []network.Summary{}, nil
}
func (c *fakeClient) NetworkRemove(ctx context.Context, networkID string) error {

68
cli/command/network/formatter_test.go
View File

@ -28,39 +28,39 @@ func TestNetworkContext(t *testing.T) {
call func() string
}{
{networkContext{
n: network.Summary{ID: networkID},
n: network.Summary{Network: network.Network{ID: networkID}},
trunc: false,
}, networkID, ctx.ID},
{networkContext{
n: network.Summary{ID: networkID},
n: network.Summary{Network: network.Network{ID: networkID}},
trunc: true,
}, formatter.TruncateID(networkID), ctx.ID},
{networkContext{
n: network.Summary{Name: "network_name"},
n: network.Summary{Network: network.Network{Name: "network_name"}},
}, "network_name", ctx.Name},
{networkContext{
n: network.Summary{Driver: "driver_name"},
n: network.Summary{Network: network.Network{Driver: "driver_name"}},
}, "driver_name", ctx.Driver},
{networkContext{
n: network.Summary{EnableIPv4: true},
n: network.Summary{Network: network.Network{EnableIPv4: true}},
}, "true", ctx.IPv4},
{networkContext{
n: network.Summary{EnableIPv6: true},
n: network.Summary{Network: network.Network{EnableIPv6: true}},
}, "true", ctx.IPv6},
{networkContext{
n: network.Summary{EnableIPv6: false},
n: network.Summary{Network: network.Network{EnableIPv6: false}},
}, "false", ctx.IPv6},
{networkContext{
n: network.Summary{Internal: true},
n: network.Summary{Network: network.Network{Internal: true}},
}, "true", ctx.Internal},
{networkContext{
n: network.Summary{Internal: false},
n: network.Summary{Network: network.Network{Internal: false}},
}, "false", ctx.Internal},
{networkContext{
n: network.Summary{},
}, "", ctx.Labels},
{networkContext{
n: network.Summary{Labels: map[string]string{"label1": "value1", "label2": "value2"}},
n: network.Summary{Network: network.Network{Labels: map[string]string{"label1": "value1", "label2": "value2"}}},
}, "label1=value1,label2=value2", ctx.Labels},
}
@ -158,8 +158,24 @@ foobar_bar 2017-01-01 00:00:00 +0000 UTC
timestamp2, _ := time.Parse("2006-01-02", "2017-01-01")
networks := []network.Summary{
{ID: "networkID1", Name: "foobar_baz", Driver: "foo", Scope: "local", Created: timestamp1},
{ID: "networkID2", Name: "foobar_bar", Driver: "bar", Scope: "local", Created: timestamp2},
{
Network: network.Network{
ID: "networkID1",
Name: "foobar_baz",
Driver: "foo",
Scope: "local",
Created: timestamp1,
},
},
{
Network: network.Network{
ID: "networkID2",
Name: "foobar_bar",
Driver: "bar",
Scope: "local",
Created: timestamp2,
},
},
}
for _, tc := range cases {
@ -178,8 +194,18 @@ foobar_bar 2017-01-01 00:00:00 +0000 UTC
func TestNetworkContextWriteJSON(t *testing.T) {
networks := []network.Summary{
{ID: "networkID1", Name: "foobar_baz"},
{ID: "networkID2", Name: "foobar_bar"},
{
Network: network.Network{
ID: "networkID1",
Name: "foobar_baz",
},
},
{
Network: network.Network{
ID: "networkID2",
Name: "foobar_bar",
},
},
}
expectedJSONs := []map[string]any{
{"Driver": "", "ID": "networkID1", "IPv4": "false", "IPv6": "false", "Internal": "false", "Labels": "", "Name": "foobar_baz", "Scope": "", "CreatedAt": "0001-01-01 00:00:00 +0000 UTC"},
@ -202,8 +228,18 @@ func TestNetworkContextWriteJSON(t *testing.T) {
func TestNetworkContextWriteJSONField(t *testing.T) {
networks := []network.Summary{
{ID: "networkID1", Name: "foobar_baz"},
{ID: "networkID2", Name: "foobar_bar"},
{
Network: network.Network{
ID: "networkID1",
Name: "foobar_baz",
},
},
{
Network: network.Network{
ID: "networkID2",
Name: "foobar_bar",
},
},
}
out := bytes.NewBufferString("")
err := formatWrite(formatter.Context{Format: "{{json .ID}}", Output: out}, networks)

8
cli/command/network/remove_test.go
View File

@ -113,9 +113,11 @@ func TestNetworkRemovePromptTermination(t *testing.T) {
},
networkInspectFunc: func(ctx context.Context, networkID string, options client.NetworkInspectOptions) (network.Inspect, []byte, error) {
return network.Inspect{
ID: "existing-network",
Name: "existing-network",
Ingress: true,
Network: network.Network{
ID: "existing-network",
Name: "existing-network",
Ingress: true,
},
}, nil, nil
},
})