Skip to content

Commit 701b678

Browse files
austinvazquezaustinvazquez
authored
Merge pull request #6255 from thaJeztah/bump_modules
vendor: github.com/moby/moby/api, moby/moby/client 7145e7666b8f (master)
2 parents 212deb4 + 7118f1f commit 701b678

File tree

183 files changed

+808
-850
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+808
-850
lines changed

‎cli/command/completion/functions.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"github.com/docker/cli/cli/command/formatter"
88
"github.com/moby/moby/api/types/container"
99
"github.com/moby/moby/api/types/image"
10-
"github.com/moby/moby/api/types/network"
11-
"github.com/moby/moby/api/types/volume"
1210
"github.com/moby/moby/client"
1311
"github.com/spf13/cobra"
1412
)
@@ -79,7 +77,7 @@ func ContainerNames(dockerCLI APIClientProvider, all bool, filters ...func(conta
7977
// VolumeNames offers completion for volumes
8078
func VolumeNames(dockerCLI APIClientProvider) cobra.CompletionFunc {
8179
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
82-
list, err := dockerCLI.Client().VolumeList(cmd.Context(), volume.ListOptions{})
80+
list, err := dockerCLI.Client().VolumeList(cmd.Context(), client.VolumeListOptions{})
8381
if err != nil {
8482
return nil, cobra.ShellCompDirectiveError
8583
}
@@ -94,7 +92,7 @@ func VolumeNames(dockerCLI APIClientProvider) cobra.CompletionFunc {
9492
// NetworkNames offers completion for networks
9593
func NetworkNames(dockerCLI APIClientProvider) cobra.CompletionFunc {
9694
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
97-
list, err := dockerCLI.Client().NetworkList(cmd.Context(), network.ListOptions{})
95+
list, err := dockerCLI.Client().NetworkList(cmd.Context(), client.NetworkListOptions{})
9896
if err != nil {
9997
return nil, cobra.ShellCompDirectiveError
10098
}

‎cli/command/completion/functions_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type fakeClient struct {
3232
client.Client
3333
containerListFunc func(options container.ListOptions) ([]container.Summary, error)
3434
imageListFunc func(options image.ListOptions) ([]image.Summary, error)
35-
networkListFunc func(ctx context.Context, options network.ListOptions) ([]network.Summary, error)
35+
networkListFunc func(ctx context.Context, options client.NetworkListOptions) ([]network.Summary, error)
3636
volumeListFunc func(filter filters.Args) (volume.ListResponse, error)
3737
}
3838

@@ -50,14 +50,14 @@ func (c *fakeClient) ImageList(_ context.Context, options image.ListOptions) ([]
5050
return []image.Summary{}, nil
5151
}
5252

53-
func (c *fakeClient) NetworkList(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
53+
func (c *fakeClient) NetworkList(ctx context.Context, options client.NetworkListOptions) ([]network.Summary, error) {
5454
if c.networkListFunc != nil {
5555
return c.networkListFunc(ctx, options)
5656
}
5757
return []network.Inspect{}, nil
5858
}
5959

60-
func (c *fakeClient) VolumeList(_ context.Context, options volume.ListOptions) (volume.ListResponse, error) {
60+
func (c *fakeClient) VolumeList(_ context.Context, options client.VolumeListOptions) (volume.ListResponse, error) {
6161
if c.volumeListFunc != nil {
6262
return c.volumeListFunc(options.Filters)
6363
}
@@ -273,7 +273,7 @@ func TestCompleteNetworkNames(t *testing.T) {
273273
for _, tc := range tests {
274274
t.Run(tc.doc, func(t *testing.T) {
275275
comp := NetworkNames(fakeCLI{&fakeClient{
276-
networkListFunc: func(ctx context.Context, options network.ListOptions) ([]network.Summary, error) {
276+
networkListFunc: func(ctx context.Context, options client.NetworkListOptions) ([]network.Summary, error) {
277277
if tc.expDirective == cobra.ShellCompDirectiveError {
278278
return nil, errors.New("some error occurred")
279279
}

‎cli/command/config/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type fakeClient struct {
1111
client.Client
1212
configCreateFunc func(context.Context, swarm.ConfigSpec) (swarm.ConfigCreateResponse, error)
1313
configInspectFunc func(context.Context, string) (swarm.Config, []byte, error)
14-
configListFunc func(context.Context, swarm.ConfigListOptions) ([]swarm.Config, error)
14+
configListFunc func(context.Context, client.ConfigListOptions) ([]swarm.Config, error)
1515
configRemoveFunc func(string) error
1616
}
1717

@@ -29,7 +29,7 @@ func (c *fakeClient) ConfigInspectWithRaw(ctx context.Context, id string) (swarm
2929
return swarm.Config{}, nil, nil
3030
}
3131

32-
func (c *fakeClient) ConfigList(ctx context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
32+
func (c *fakeClient) ConfigList(ctx context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
3333
if c.configListFunc != nil {
3434
return c.configListFunc(ctx, options)
3535
}

‎cli/command/config/cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/docker/cli/cli/command"
66
"github.com/docker/cli/cli/command/completion"
77
"github.com/docker/cli/internal/commands"
8-
"github.com/moby/moby/api/types/swarm"
8+
"github.com/moby/moby/client"
99
"github.com/spf13/cobra"
1010
)
1111

@@ -37,7 +37,7 @@ func newConfigCommand(dockerCLI command.Cli) *cobra.Command {
3737
// completeNames offers completion for swarm configs
3838
func completeNames(dockerCLI completion.APIClientProvider) cobra.CompletionFunc {
3939
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
40-
list, err := dockerCLI.Client().ConfigList(cmd.Context(), swarm.ConfigListOptions{})
40+
list, err := dockerCLI.Client().ConfigList(cmd.Context(), client.ConfigListOptions{})
4141
if err != nil {
4242
return nil, cobra.ShellCompDirectiveError
4343
}

‎cli/command/config/ls.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
flagsHelper "github.com/docker/cli/cli/flags"
1212
"github.com/docker/cli/opts"
1313
"github.com/fvbommel/sortorder"
14-
"github.com/moby/moby/api/types/swarm"
14+
"github.com/moby/moby/client"
1515
"github.com/spf13/cobra"
1616
)
1717

@@ -48,7 +48,7 @@ func newConfigListCommand(dockerCLI command.Cli) *cobra.Command {
4848
func runList(ctx context.Context, dockerCLI command.Cli, options listOptions) error {
4949
apiClient := dockerCLI.Client()
5050

51-
configs, err := apiClient.ConfigList(ctx, swarm.ConfigListOptions{Filters: options.filter.Value()})
51+
configs, err := apiClient.ConfigList(ctx, client.ConfigListOptions{Filters: options.filter.Value()})
5252
if err != nil {
5353
return err
5454
}

‎cli/command/config/ls_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/docker/cli/internal/test"
1212
"github.com/docker/cli/internal/test/builders"
1313
"github.com/moby/moby/api/types/swarm"
14+
"github.com/moby/moby/client"
1415
"gotest.tools/v3/assert"
1516
is "gotest.tools/v3/assert/cmp"
1617
"gotest.tools/v3/golden"
@@ -19,15 +20,15 @@ import (
1920
func TestConfigListErrors(t *testing.T) {
2021
testCases := []struct {
2122
args []string
22-
configListFunc func(context.Context, swarm.ConfigListOptions) ([]swarm.Config, error)
23+
configListFunc func(context.Context, client.ConfigListOptions) ([]swarm.Config, error)
2324
expectedError string
2425
}{
2526
{
2627
args: []string{"foo"},
2728
expectedError: "accepts no argument",
2829
},
2930
{
30-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
31+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
3132
return []swarm.Config{}, errors.New("error listing configs")
3233
},
3334
expectedError: "error listing configs",
@@ -48,7 +49,7 @@ func TestConfigListErrors(t *testing.T) {
4849

4950
func TestConfigList(t *testing.T) {
5051
cli := test.NewFakeCli(&fakeClient{
51-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
52+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
5253
return []swarm.Config{
5354
*builders.Config(builders.ConfigID("ID-1-foo"),
5455
builders.ConfigName("1-foo"),
@@ -78,7 +79,7 @@ func TestConfigList(t *testing.T) {
7879

7980
func TestConfigListWithQuietOption(t *testing.T) {
8081
cli := test.NewFakeCli(&fakeClient{
81-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
82+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
8283
return []swarm.Config{
8384
*builders.Config(builders.ConfigID("ID-foo"), builders.ConfigName("foo")),
8485
*builders.Config(builders.ConfigID("ID-bar"), builders.ConfigName("bar"), builders.ConfigLabels(map[string]string{
@@ -95,7 +96,7 @@ func TestConfigListWithQuietOption(t *testing.T) {
9596

9697
func TestConfigListWithConfigFormat(t *testing.T) {
9798
cli := test.NewFakeCli(&fakeClient{
98-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
99+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
99100
return []swarm.Config{
100101
*builders.Config(builders.ConfigID("ID-foo"), builders.ConfigName("foo")),
101102
*builders.Config(builders.ConfigID("ID-bar"), builders.ConfigName("bar"), builders.ConfigLabels(map[string]string{
@@ -114,7 +115,7 @@ func TestConfigListWithConfigFormat(t *testing.T) {
114115

115116
func TestConfigListWithFormat(t *testing.T) {
116117
cli := test.NewFakeCli(&fakeClient{
117-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
118+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
118119
return []swarm.Config{
119120
*builders.Config(builders.ConfigID("ID-foo"), builders.ConfigName("foo")),
120121
*builders.Config(builders.ConfigID("ID-bar"), builders.ConfigName("bar"), builders.ConfigLabels(map[string]string{
@@ -131,7 +132,7 @@ func TestConfigListWithFormat(t *testing.T) {
131132

132133
func TestConfigListWithFilter(t *testing.T) {
133134
cli := test.NewFakeCli(&fakeClient{
134-
configListFunc: func(_ context.Context, options swarm.ConfigListOptions) ([]swarm.Config, error) {
135+
configListFunc: func(_ context.Context, options client.ConfigListOptions) ([]swarm.Config, error) {
135136
assert.Check(t, is.Equal("foo", options.Filters.Get("name")[0]))
136137
assert.Check(t, is.Equal("lbl1=Label-bar", options.Filters.Get("label")[0]))
137138
return []swarm.Config{

‎cli/command/container/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type fakeClient struct {
3232
waitFunc func(string) (<-chan container.WaitResponse, <-chan error)
3333
containerListFunc func(container.ListOptions) ([]container.Summary, error)
3434
containerExportFunc func(string) (io.ReadCloser, error)
35-
containerExecResizeFunc func(id string, options container.ResizeOptions) error
35+
containerExecResizeFunc func(id string, options client.ContainerResizeOptions) error
3636
containerRemoveFunc func(ctx context.Context, containerID string, options container.RemoveOptions) error
3737
containerRestartFunc func(ctx context.Context, containerID string, options container.StopOptions) error
3838
containerStopFunc func(ctx context.Context, containerID string, options container.StopOptions) error
@@ -159,7 +159,7 @@ func (f *fakeClient) ContainerExport(_ context.Context, containerID string) (io.
159159
return nil, nil
160160
}
161161

162-
func (f *fakeClient) ContainerExecResize(_ context.Context, id string, options container.ResizeOptions) error {
162+
func (f *fakeClient) ContainerExecResize(_ context.Context, id string, options client.ContainerResizeOptions) error {
163163
if f.containerExecResizeFunc != nil {
164164
return f.containerExecResizeFunc(id, options)
165165
}

‎cli/command/container/opts_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ func TestParseLabelfileVariables(t *testing.T) {
10161016
func TestParseEntryPoint(t *testing.T) {
10171017
config, _, _, err := parseRun([]string{"--entrypoint=anything", "cmd", "img"})
10181018
assert.NilError(t, err)
1019-
assert.Check(t, is.DeepEqual([]string(config.Entrypoint), []string{"anything"}))
1019+
assert.Check(t, is.DeepEqual(config.Entrypoint, []string{"anything"}))
10201020
}
10211021

10221022
func TestValidateDevice(t *testing.T) {

‎cli/command/container/stats.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/moby/moby/api/types/container"
1919
"github.com/moby/moby/api/types/events"
2020
"github.com/moby/moby/api/types/filters"
21+
"github.com/moby/moby/client"
2122
"github.com/sirupsen/logrus"
2223
"github.com/spf13/cobra"
2324
)
@@ -164,7 +165,7 @@ func RunStats(ctx context.Context, dockerCLI command.Cli, options *StatsOptions)
164165
// is not valid for filtering containers.
165166
f := options.Filters.Clone()
166167
f.Add("type", string(events.ContainerEventType))
167-
eventChan, errChan := apiClient.Events(ctx, events.ListOptions{
168+
eventChan, errChan := apiClient.Events(ctx, client.EventsListOptions{
168169
Filters: f,
169170
})
170171

‎cli/command/container/tty.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"github.com/docker/cli/cli/command"
12-
"github.com/moby/moby/api/types/container"
1312
"github.com/moby/moby/client"
1413
"github.com/moby/sys/signal"
1514
"github.com/sirupsen/logrus"
@@ -21,7 +20,7 @@ func resizeTtyTo(ctx context.Context, apiClient client.ContainerAPIClient, id st
2120
return nil
2221
}
2322

24-
options := container.ResizeOptions{
23+
options := client.ContainerResizeOptions{
2524
Height: height,
2625
Width: width,
2726
}

0 commit comments

Comments
 (0)