Skip to content

Commit 0623331

Browse files
thaJeztahthaJeztah
committed
vendor: github.com/moby/moby/api, moby/moby/client master
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent c057f46 commit 0623331

File tree

91 files changed

+263
-337
lines changed

Some content is hidden

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

91 files changed

+263
-337
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/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
}

‎cli/command/container/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func legacyWaitExitOrRemoved(ctx context.Context, apiClient client.APIClient, co
6969
f.Add("container", containerID)
7070

7171
eventCtx, cancel := context.WithCancel(ctx)
72-
eventq, errq := apiClient.Events(eventCtx, events.ListOptions{
72+
eventq, errq := apiClient.Events(eventCtx, client.EventsListOptions{
7373
Filters: f,
7474
})
7575

‎cli/command/formatter/container.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ func (c *ContainerContext) Networks() string {
338338
// DisplayablePorts returns formatted string representing open ports of container
339339
// e.g. "0.0.0.0:80->9090/tcp, 9988/tcp"
340340
// it's used by command 'docker ps'
341-
func DisplayablePorts(ports []container.Port) string {
341+
func DisplayablePorts(ports []container.PortSummary) string {
342342
type portGroup struct {
343343
first uint16
344344
last uint16
@@ -404,7 +404,7 @@ func formGroup(key string, start, last uint16) string {
404404
return group + "/" + groupType
405405
}
406406

407-
func comparePorts(i, j container.Port) bool {
407+
func comparePorts(i, j container.PortSummary) bool {
408408
if i.PrivatePort != j.PrivatePort {
409409
return i.PrivatePort < j.PrivatePort
410410
}

‎cli/command/network/inspect.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/docker/cli/cli/command/completion"
1313
"github.com/docker/cli/cli/command/inspect"
1414
flagsHelper "github.com/docker/cli/cli/flags"
15-
"github.com/moby/moby/api/types/network"
1615
"github.com/moby/moby/client"
1716
"github.com/spf13/cobra"
1817
)
@@ -45,6 +44,6 @@ func newInspectCommand(dockerCLI command.Cli) *cobra.Command {
4544

4645
func runInspect(ctx context.Context, apiClient client.NetworkAPIClient, output io.Writer, opts inspectOptions) error {
4746
return inspect.Inspect(output, opts.names, opts.format, func(name string) (any, []byte, error) {
48-
return apiClient.NetworkInspectWithRaw(ctx, name, network.InspectOptions{Verbose: opts.verbose})
47+
return apiClient.NetworkInspectWithRaw(ctx, name, client.NetworkInspectOptions{Verbose: opts.verbose})
4948
})
5049
}

‎cli/command/network/list.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/network"
14+
"github.com/moby/moby/client"
1515
"github.com/spf13/cobra"
1616
)
1717

@@ -47,7 +47,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
4747

4848
func runList(ctx context.Context, dockerCLI command.Cli, options listOptions) error {
4949
apiClient := dockerCLI.Client()
50-
networkResources, err := apiClient.NetworkList(ctx, network.ListOptions{Filters: options.filter.Value()})
50+
networkResources, err := apiClient.NetworkList(ctx, client.NetworkListOptions{Filters: options.filter.Value()})
5151
if err != nil {
5252
return err
5353
}

‎cli/command/network/remove.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/docker/cli/cli/command"
1111
"github.com/docker/cli/cli/command/completion"
1212
"github.com/docker/cli/internal/prompt"
13-
"github.com/moby/moby/api/types/network"
13+
"github.com/moby/moby/client"
1414
"github.com/spf13/cobra"
1515
)
1616

@@ -48,7 +48,7 @@ func runRemove(ctx context.Context, dockerCLI command.Cli, networks []string, op
4848
status := 0
4949

5050
for _, name := range networks {
51-
nw, _, err := apiClient.NetworkInspectWithRaw(ctx, name, network.InspectOptions{})
51+
nw, _, err := apiClient.NetworkInspectWithRaw(ctx, name, client.NetworkInspectOptions{})
5252
if err == nil && nw.Ingress {
5353
r, err := prompt.Confirm(ctx, dockerCLI.In(), dockerCLI.Out(), ingressWarning)
5454
if err != nil {

‎cli/command/registry/search.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/docker/cli/internal/commands"
1212
"github.com/docker/cli/opts"
1313
registrytypes "github.com/moby/moby/api/types/registry"
14+
"github.com/moby/moby/client"
1415
"github.com/spf13/cobra"
1516
)
1617

@@ -62,7 +63,7 @@ func runSearch(ctx context.Context, dockerCli command.Cli, options searchOptions
6263
return err
6364
}
6465

65-
results, err := dockerCli.Client().ImageSearch(ctx, options.term, registrytypes.SearchOptions{
66+
results, err := dockerCli.Client().ImageSearch(ctx, options.term, client.ImageSearchOptions{
6667
RegistryAuth: encodedAuth,
6768
PrivilegeFunc: nil,
6869
Filters: options.filter.Value(),

0 commit comments

Comments
 (0)