Skip to content

Commit 5aae44b

Browse files
authored
Merge pull request #5226 from thaJeztah/bump_engine_temp
vendor: github.com/docker/docker 508cc7c61226 (master)
2 parents f5ce584 + b194274 commit 5aae44b

38 files changed

+601
-703
lines changed

cli/command/completion/functions.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"os"
55

66
"github.com/docker/cli/cli/command/formatter"
7-
"github.com/docker/docker/api/types"
87
"github.com/docker/docker/api/types/container"
98
"github.com/docker/docker/api/types/image"
109
"github.com/docker/docker/api/types/network"
@@ -44,7 +43,7 @@ func ImageNames(dockerCLI APIClientProvider) ValidArgsFn {
4443
// ContainerNames offers completion for container names and IDs
4544
// By default, only names are returned.
4645
// Set DOCKER_COMPLETION_SHOW_CONTAINER_IDS=yes to also complete IDs.
47-
func ContainerNames(dockerCLI APIClientProvider, all bool, filters ...func(types.Container) bool) ValidArgsFn {
46+
func ContainerNames(dockerCLI APIClientProvider, all bool, filters ...func(container.Summary) bool) ValidArgsFn {
4847
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
4948
list, err := dockerCLI.Client().ContainerList(cmd.Context(), container.ListOptions{
5049
All: all,

cli/command/container/attach.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/docker/cli/cli"
88
"github.com/docker/cli/cli/command"
99
"github.com/docker/cli/cli/command/completion"
10-
"github.com/docker/docker/api/types"
1110
"github.com/docker/docker/api/types/container"
1211
"github.com/docker/docker/client"
1312
"github.com/moby/sys/signal"
@@ -23,7 +22,7 @@ type AttachOptions struct {
2322
DetachKeys string
2423
}
2524

26-
func inspectContainerAndCheckState(ctx context.Context, apiClient client.APIClient, args string) (*types.ContainerJSON, error) {
25+
func inspectContainerAndCheckState(ctx context.Context, apiClient client.APIClient, args string) (*container.InspectResponse, error) {
2726
c, err := apiClient.ContainerInspect(ctx, args)
2827
if err != nil {
2928
return nil, err
@@ -56,7 +55,7 @@ func NewAttachCommand(dockerCLI command.Cli) *cobra.Command {
5655
Annotations: map[string]string{
5756
"aliases": "docker container attach, docker attach",
5857
},
59-
ValidArgsFunction: completion.ContainerNames(dockerCLI, false, func(ctr types.Container) bool {
58+
ValidArgsFunction: completion.ContainerNames(dockerCLI, false, func(ctr container.Summary) bool {
6059
return ctr.State != "paused"
6160
}),
6261
}

cli/command/container/attach_test.go

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/docker/cli/cli"
88
"github.com/docker/cli/internal/test"
9-
"github.com/docker/docker/api/types"
109
"github.com/docker/docker/api/types/container"
1110
"github.com/pkg/errors"
1211
"gotest.tools/v3/assert"
@@ -17,24 +16,24 @@ func TestNewAttachCommandErrors(t *testing.T) {
1716
name string
1817
args []string
1918
expectedError string
20-
containerInspectFunc func(img string) (types.ContainerJSON, error)
19+
containerInspectFunc func(img string) (container.InspectResponse, error)
2120
}{
2221
{
2322
name: "client-error",
2423
args: []string{"5cb5bb5e4a3b"},
2524
expectedError: "something went wrong",
26-
containerInspectFunc: func(containerID string) (types.ContainerJSON, error) {
27-
return types.ContainerJSON{}, errors.Errorf("something went wrong")
25+
containerInspectFunc: func(containerID string) (container.InspectResponse, error) {
26+
return container.InspectResponse{}, errors.Errorf("something went wrong")
2827
},
2928
},
3029
{
3130
name: "client-stopped",
3231
args: []string{"5cb5bb5e4a3b"},
3332
expectedError: "You cannot attach to a stopped container",
34-
containerInspectFunc: func(containerID string) (types.ContainerJSON, error) {
35-
return types.ContainerJSON{
36-
ContainerJSONBase: &types.ContainerJSONBase{
37-
State: &types.ContainerState{
33+
containerInspectFunc: func(containerID string) (container.InspectResponse, error) {
34+
return container.InspectResponse{
35+
ContainerJSONBase: &container.ContainerJSONBase{
36+
State: &container.State{
3837
Running: false,
3938
},
4039
},
@@ -45,10 +44,10 @@ func TestNewAttachCommandErrors(t *testing.T) {
4544
name: "client-paused",
4645
args: []string{"5cb5bb5e4a3b"},
4746
expectedError: "You cannot attach to a paused container",
48-
containerInspectFunc: func(containerID string) (types.ContainerJSON, error) {
49-
return types.ContainerJSON{
50-
ContainerJSONBase: &types.ContainerJSONBase{
51-
State: &types.ContainerState{
47+
containerInspectFunc: func(containerID string) (container.InspectResponse, error) {
48+
return container.InspectResponse{
49+
ContainerJSONBase: &container.ContainerJSONBase{
50+
State: &container.State{
5251
Running: true,
5352
Paused: true,
5453
},
@@ -60,10 +59,10 @@ func TestNewAttachCommandErrors(t *testing.T) {
6059
name: "client-restarting",
6160
args: []string{"5cb5bb5e4a3b"},
6261
expectedError: "You cannot attach to a restarting container",
63-
containerInspectFunc: func(containerID string) (types.ContainerJSON, error) {
64-
return types.ContainerJSON{
65-
ContainerJSONBase: &types.ContainerJSONBase{
66-
State: &types.ContainerState{
62+
containerInspectFunc: func(containerID string) (container.InspectResponse, error) {
63+
return container.InspectResponse{
64+
ContainerJSONBase: &container.ContainerJSONBase{
65+
State: &container.State{
6766
Running: true,
6867
Paused: false,
6968
Restarting: true,

cli/command/container/client_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
type fakeClient struct {
1818
client.Client
19-
inspectFunc func(string) (types.ContainerJSON, error)
19+
inspectFunc func(string) (container.InspectResponse, error)
2020
execInspectFunc func(execID string) (container.ExecInspect, error)
2121
execCreateFunc func(containerID string, options container.ExecOptions) (types.IDResponse, error)
2222
createContainerFunc func(config *container.Config,
@@ -31,7 +31,7 @@ type fakeClient struct {
3131
containerCopyFromFunc func(containerID, srcPath string) (io.ReadCloser, container.PathStat, error)
3232
logFunc func(string, container.LogsOptions) (io.ReadCloser, error)
3333
waitFunc func(string) (<-chan container.WaitResponse, <-chan error)
34-
containerListFunc func(container.ListOptions) ([]types.Container, error)
34+
containerListFunc func(container.ListOptions) ([]container.Summary, error)
3535
containerExportFunc func(string) (io.ReadCloser, error)
3636
containerExecResizeFunc func(id string, options container.ResizeOptions) error
3737
containerRemoveFunc func(ctx context.Context, containerID string, options container.RemoveOptions) error
@@ -41,18 +41,18 @@ type fakeClient struct {
4141
Version string
4242
}
4343

44-
func (f *fakeClient) ContainerList(_ context.Context, options container.ListOptions) ([]types.Container, error) {
44+
func (f *fakeClient) ContainerList(_ context.Context, options container.ListOptions) ([]container.Summary, error) {
4545
if f.containerListFunc != nil {
4646
return f.containerListFunc(options)
4747
}
48-
return []types.Container{}, nil
48+
return []container.Summary{}, nil
4949
}
5050

51-
func (f *fakeClient) ContainerInspect(_ context.Context, containerID string) (types.ContainerJSON, error) {
51+
func (f *fakeClient) ContainerInspect(_ context.Context, containerID string) (container.InspectResponse, error) {
5252
if f.inspectFunc != nil {
5353
return f.inspectFunc(containerID)
5454
}
55-
return types.ContainerJSON{}, nil
55+
return container.InspectResponse{}, nil
5656
}
5757

5858
func (f *fakeClient) ContainerExecCreate(_ context.Context, containerID string, config container.ExecOptions) (types.IDResponse, error) {

cli/command/container/exec.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/docker/cli/cli/command/completion"
1212
"github.com/docker/cli/cli/config/configfile"
1313
"github.com/docker/cli/opts"
14-
"github.com/docker/docker/api/types"
1514
"github.com/docker/docker/api/types/container"
1615
"github.com/docker/docker/client"
1716
"github.com/pkg/errors"
@@ -54,7 +53,7 @@ func NewExecCommand(dockerCli command.Cli) *cobra.Command {
5453
options.Command = args[1:]
5554
return RunExec(cmd.Context(), dockerCli, containerIDorName, options)
5655
},
57-
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr types.Container) bool {
56+
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool {
5857
return ctr.State != "paused"
5958
}),
6059
Annotations: map[string]string{

cli/command/container/exec_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ func TestRunExec(t *testing.T) {
178178
doc: "inspect error",
179179
options: NewExecOptions(),
180180
client: &fakeClient{
181-
inspectFunc: func(string) (types.ContainerJSON, error) {
182-
return types.ContainerJSON{}, errors.New("failed inspect")
181+
inspectFunc: func(string) (container.InspectResponse, error) {
182+
return container.InspectResponse{}, errors.New("failed inspect")
183183
},
184184
},
185185
expectedError: "failed inspect",
@@ -252,14 +252,14 @@ func TestNewExecCommandErrors(t *testing.T) {
252252
name string
253253
args []string
254254
expectedError string
255-
containerInspectFunc func(img string) (types.ContainerJSON, error)
255+
containerInspectFunc func(img string) (container.InspectResponse, error)
256256
}{
257257
{
258258
name: "client-error",
259259
args: []string{"5cb5bb5e4a3b", "-t", "-i", "bash"},
260260
expectedError: "something went wrong",
261-
containerInspectFunc: func(containerID string) (types.ContainerJSON, error) {
262-
return types.ContainerJSON{}, errors.Errorf("something went wrong")
261+
containerInspectFunc: func(containerID string) (container.InspectResponse, error) {
262+
return container.InspectResponse{}, errors.Errorf("something went wrong")
263263
},
264264
},
265265
}

cli/command/container/list_test.go

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/docker/cli/internal/test"
1010
"github.com/docker/cli/internal/test/builders"
1111
"github.com/docker/cli/opts"
12-
"github.com/docker/docker/api/types"
1312
"github.com/docker/docker/api/types/container"
1413
"gotest.tools/v3/assert"
1514
is "gotest.tools/v3/assert/cmp"
@@ -130,7 +129,7 @@ func TestContainerListErrors(t *testing.T) {
130129
testCases := []struct {
131130
args []string
132131
flags map[string]string
133-
containerListFunc func(container.ListOptions) ([]types.Container, error)
132+
containerListFunc func(container.ListOptions) ([]container.Summary, error)
134133
expectedError string
135134
}{
136135
{
@@ -146,7 +145,7 @@ func TestContainerListErrors(t *testing.T) {
146145
expectedError: `wrong number of args for join`,
147146
},
148147
{
149-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
148+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
150149
return nil, errors.New("error listing containers")
151150
},
152151
expectedError: "error listing containers",
@@ -170,8 +169,8 @@ func TestContainerListErrors(t *testing.T) {
170169

171170
func TestContainerListWithoutFormat(t *testing.T) {
172171
cli := test.NewFakeCli(&fakeClient{
173-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
174-
return []types.Container{
172+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
173+
return []container.Summary{
175174
*builders.Container("c1"),
176175
*builders.Container("c2", builders.WithName("foo")),
177176
*builders.Container("c3", builders.WithPort(80, 80, builders.TCP), builders.WithPort(81, 81, builders.TCP), builders.WithPort(82, 82, builders.TCP)),
@@ -187,8 +186,8 @@ func TestContainerListWithoutFormat(t *testing.T) {
187186

188187
func TestContainerListNoTrunc(t *testing.T) {
189188
cli := test.NewFakeCli(&fakeClient{
190-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
191-
return []types.Container{
189+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
190+
return []container.Summary{
192191
*builders.Container("c1"),
193192
*builders.Container("c2", builders.WithName("foo/bar")),
194193
}, nil
@@ -203,8 +202,8 @@ func TestContainerListNoTrunc(t *testing.T) {
203202
// Test for GitHub issue docker/docker#21772
204203
func TestContainerListNamesMultipleTime(t *testing.T) {
205204
cli := test.NewFakeCli(&fakeClient{
206-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
207-
return []types.Container{
205+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
206+
return []container.Summary{
208207
*builders.Container("c1"),
209208
*builders.Container("c2", builders.WithName("foo/bar")),
210209
}, nil
@@ -219,8 +218,8 @@ func TestContainerListNamesMultipleTime(t *testing.T) {
219218
// Test for GitHub issue docker/docker#30291
220219
func TestContainerListFormatTemplateWithArg(t *testing.T) {
221220
cli := test.NewFakeCli(&fakeClient{
222-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
223-
return []types.Container{
221+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
222+
return []container.Summary{
224223
*builders.Container("c1", builders.WithLabel("some.label", "value")),
225224
*builders.Container("c2", builders.WithName("foo/bar"), builders.WithLabel("foo", "bar")),
226225
}, nil
@@ -270,9 +269,9 @@ func TestContainerListFormatSizeSetsOption(t *testing.T) {
270269
tc := tc
271270
t.Run(tc.doc, func(t *testing.T) {
272271
cli := test.NewFakeCli(&fakeClient{
273-
containerListFunc: func(options container.ListOptions) ([]types.Container, error) {
272+
containerListFunc: func(options container.ListOptions) ([]container.Summary, error) {
274273
assert.Check(t, is.Equal(options.Size, tc.sizeExpected))
275-
return []types.Container{}, nil
274+
return []container.Summary{}, nil
276275
},
277276
})
278277
cmd := newListCommand(cli)
@@ -287,8 +286,8 @@ func TestContainerListFormatSizeSetsOption(t *testing.T) {
287286

288287
func TestContainerListWithConfigFormat(t *testing.T) {
289288
cli := test.NewFakeCli(&fakeClient{
290-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
291-
return []types.Container{
289+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
290+
return []container.Summary{
292291
*builders.Container("c1", builders.WithLabel("some.label", "value"), builders.WithSize(10700000)),
293292
*builders.Container("c2", builders.WithName("foo/bar"), builders.WithLabel("foo", "bar"), builders.WithSize(3200000)),
294293
}, nil
@@ -304,8 +303,8 @@ func TestContainerListWithConfigFormat(t *testing.T) {
304303

305304
func TestContainerListWithFormat(t *testing.T) {
306305
cli := test.NewFakeCli(&fakeClient{
307-
containerListFunc: func(_ container.ListOptions) ([]types.Container, error) {
308-
return []types.Container{
306+
containerListFunc: func(_ container.ListOptions) ([]container.Summary, error) {
307+
return []container.Summary{
309308
*builders.Container("c1", builders.WithLabel("some.label", "value")),
310309
*builders.Container("c2", builders.WithName("foo/bar"), builders.WithLabel("foo", "bar")),
311310
}, nil

cli/command/container/logs_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"testing"
88

99
"github.com/docker/cli/internal/test"
10-
"github.com/docker/docker/api/types"
1110
"github.com/docker/docker/api/types/container"
1211
"gotest.tools/v3/assert"
1312
is "gotest.tools/v3/assert/cmp"
@@ -20,10 +19,10 @@ var logFn = func(expectedOut string) func(string, container.LogsOptions) (io.Rea
2019
}
2120

2221
func TestRunLogs(t *testing.T) {
23-
inspectFn := func(containerID string) (types.ContainerJSON, error) {
24-
return types.ContainerJSON{
22+
inspectFn := func(containerID string) (container.InspectResponse, error) {
23+
return container.InspectResponse{
2524
Config: &container.Config{Tty: true},
26-
ContainerJSONBase: &types.ContainerJSONBase{State: &types.ContainerState{Running: false}},
25+
ContainerJSONBase: &container.ContainerJSONBase{State: &container.State{Running: false}},
2726
}, nil
2827
}
2928

cli/command/container/pause.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/docker/cli/cli"
99
"github.com/docker/cli/cli/command"
1010
"github.com/docker/cli/cli/command/completion"
11-
"github.com/docker/docker/api/types"
11+
"github.com/docker/docker/api/types/container"
1212
"github.com/pkg/errors"
1313
"github.com/spf13/cobra"
1414
)
@@ -32,7 +32,7 @@ func NewPauseCommand(dockerCli command.Cli) *cobra.Command {
3232
Annotations: map[string]string{
3333
"aliases": "docker container pause, docker pause",
3434
},
35-
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr types.Container) bool {
35+
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool {
3636
return ctr.State != "paused"
3737
}),
3838
}

cli/command/container/port_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/docker/cli/internal/test"
8-
"github.com/docker/docker/api/types"
8+
"github.com/docker/docker/api/types/container"
99
"github.com/docker/go-connections/nat"
1010
"gotest.tools/v3/assert"
1111
"gotest.tools/v3/golden"
@@ -46,8 +46,8 @@ func TestNewPortCommandOutput(t *testing.T) {
4646
tc := tc
4747
t.Run(tc.name, func(t *testing.T) {
4848
cli := test.NewFakeCli(&fakeClient{
49-
inspectFunc: func(string) (types.ContainerJSON, error) {
50-
ci := types.ContainerJSON{NetworkSettings: &types.NetworkSettings{}}
49+
inspectFunc: func(string) (container.InspectResponse, error) {
50+
ci := container.InspectResponse{NetworkSettings: &container.NetworkSettings{}}
5151
ci.NetworkSettings.Ports = nat.PortMap{
5252
"80/tcp": make([]nat.PortBinding, len(tc.ips)),
5353
"443/tcp": make([]nat.PortBinding, len(tc.ips)),

cli/command/container/start.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/docker/cli/cli"
1010
"github.com/docker/cli/cli/command"
1111
"github.com/docker/cli/cli/command/completion"
12-
"github.com/docker/docker/api/types"
1312
"github.com/docker/docker/api/types/container"
1413
"github.com/moby/sys/signal"
1514
"github.com/moby/term"
@@ -43,7 +42,7 @@ func NewStartCommand(dockerCli command.Cli) *cobra.Command {
4342
Annotations: map[string]string{
4443
"aliases": "docker container start, docker start",
4544
},
46-
ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr types.Container) bool {
45+
ValidArgsFunction: completion.ContainerNames(dockerCli, true, func(ctr container.Summary) bool {
4746
return ctr.State == "exited" || ctr.State == "created"
4847
}),
4948
}

cli/command/container/unpause.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/docker/cli/cli"
99
"github.com/docker/cli/cli/command"
1010
"github.com/docker/cli/cli/command/completion"
11-
"github.com/docker/docker/api/types"
11+
"github.com/docker/docker/api/types/container"
1212
"github.com/pkg/errors"
1313
"github.com/spf13/cobra"
1414
)
@@ -32,7 +32,7 @@ func NewUnpauseCommand(dockerCli command.Cli) *cobra.Command {
3232
Annotations: map[string]string{
3333
"aliases": "docker container unpause, docker unpause",
3434
},
35-
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr types.Container) bool {
35+
ValidArgsFunction: completion.ContainerNames(dockerCli, false, func(ctr container.Summary) bool {
3636
return ctr.State == "paused"
3737
}),
3838
}

0 commit comments

Comments
 (0)