Skip to content

Commit 8444c91

Browse files
vvolandvvoland
committed
vendor: github.com/moby/moby master
Signed-off-by: Paweł Gronowski <[email protected]>
1 parent 96bc39b commit 8444c91

File tree

12 files changed

+74
-125
lines changed

12 files changed

+74
-125
lines changed

‎cli/command/network/client_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package network
33
import (
44
"context"
55

6-
"github.com/moby/moby/api/types/network"
76
"github.com/moby/moby/client"
87
)
98

109
type fakeClient struct {
1110
client.Client
12-
networkCreateFunc func(ctx context.Context, name string, options client.NetworkCreateOptions) (network.CreateResponse, error)
11+
networkCreateFunc func(ctx context.Context, name string, options client.NetworkCreateOptions) (client.NetworkCreateResult, error)
1312
networkConnectFunc func(ctx context.Context, networkID string, options client.NetworkConnectOptions) (client.NetworkConnectResult, error)
1413
networkDisconnectFunc func(ctx context.Context, networkID string, options client.NetworkDisconnectOptions) (client.NetworkDisconnectResult, error)
1514
networkRemoveFunc func(ctx context.Context, networkID string) error
@@ -18,11 +17,11 @@ type fakeClient struct {
1817
networkInspectFunc func(ctx context.Context, networkID string, options client.NetworkInspectOptions) (client.NetworkInspectResult, error)
1918
}
2019

21-
func (c *fakeClient) NetworkCreate(ctx context.Context, name string, options client.NetworkCreateOptions) (network.CreateResponse, error) {
20+
func (c *fakeClient) NetworkCreate(ctx context.Context, name string, options client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
2221
if c.networkCreateFunc != nil {
2322
return c.networkCreateFunc(ctx, name, options)
2423
}
25-
return network.CreateResponse{}, nil
24+
return client.NetworkCreateResult{}, nil
2625
}
2726

2827
func (c *fakeClient) NetworkConnect(ctx context.Context, networkID string, options client.NetworkConnectOptions) (client.NetworkConnectResult, error) {

‎cli/command/network/create.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ func runCreate(ctx context.Context, apiClient client.NetworkAPIClient, output io
108108
return err
109109
}
110110

111-
var configFrom *network.ConfigReference
112-
if options.configFrom != "" {
113-
configFrom = &network.ConfigReference{
114-
Network: options.configFrom,
115-
}
116-
}
117111
resp, err := apiClient.NetworkCreate(ctx, options.name, client.NetworkCreateOptions{
118112
Driver: options.driver,
119113
Options: options.driverOpts.GetAll(),
@@ -125,7 +119,7 @@ func runCreate(ctx context.Context, apiClient client.NetworkAPIClient, output io
125119
Ingress: options.ingress,
126120
Scope: options.scope,
127121
ConfigOnly: options.configOnly,
128-
ConfigFrom: configFrom,
122+
ConfigFrom: options.configFrom,
129123
Labels: opts.ConvertKVStringsToMap(options.labels.GetSlice()),
130124
})
131125
if err != nil {

‎cli/command/network/create_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ func TestNetworkCreateErrors(t *testing.T) {
2020
testCases := []struct {
2121
args []string
2222
flags map[string]string
23-
networkCreateFunc func(ctx context.Context, name string, options client.NetworkCreateOptions) (network.CreateResponse, error)
23+
networkCreateFunc func(ctx context.Context, name string, options client.NetworkCreateOptions) (client.NetworkCreateResult, error)
2424
expectedError string
2525
}{
2626
{
2727
expectedError: "1 argument",
2828
},
2929
{
3030
args: []string{"toto"},
31-
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (network.CreateResponse, error) {
32-
return network.CreateResponse{}, errors.New("error creating network")
31+
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
32+
return client.NetworkCreateResult{}, errors.New("error creating network")
3333
},
3434
expectedError: "error creating network",
3535
},
@@ -166,10 +166,10 @@ func TestNetworkCreateWithFlags(t *testing.T) {
166166
},
167167
}
168168
cli := test.NewFakeCli(&fakeClient{
169-
networkCreateFunc: func(ctx context.Context, name string, options client.NetworkCreateOptions) (network.CreateResponse, error) {
169+
networkCreateFunc: func(ctx context.Context, name string, options client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
170170
assert.Check(t, is.Equal(expectedDriver, options.Driver), "not expected driver error")
171171
assert.Check(t, is.DeepEqual(expectedOpts, options.IPAM.Config, cmpopts.EquateComparable(netip.Addr{}, netip.Prefix{})), "not expected driver error")
172-
return network.CreateResponse{
172+
return client.NetworkCreateResult{
173173
ID: name,
174174
}, nil
175175
},
@@ -224,9 +224,9 @@ func TestNetworkCreateIPv4(t *testing.T) {
224224
for _, tc := range tests {
225225
t.Run(tc.doc, func(t *testing.T) {
226226
cli := test.NewFakeCli(&fakeClient{
227-
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (network.CreateResponse, error) {
227+
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
228228
assert.Check(t, is.DeepEqual(createBody.EnableIPv4, tc.expected))
229-
return network.CreateResponse{ID: name}, nil
229+
return client.NetworkCreateResult{ID: name}, nil
230230
},
231231
})
232232
cmd := newCreateCommand(cli)
@@ -278,9 +278,9 @@ func TestNetworkCreateIPv6(t *testing.T) {
278278
for _, tc := range tests {
279279
t.Run(tc.doc, func(t *testing.T) {
280280
cli := test.NewFakeCli(&fakeClient{
281-
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (network.CreateResponse, error) {
281+
networkCreateFunc: func(ctx context.Context, name string, createBody client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
282282
assert.Check(t, is.DeepEqual(tc.expected, createBody.EnableIPv6))
283-
return network.CreateResponse{ID: name}, nil
283+
return client.NetworkCreateResult{ID: name}, nil
284284
},
285285
})
286286
cmd := newCreateCommand(cli)

‎vendor.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
github.com/google/uuid v1.6.0
2929
github.com/mattn/go-runewidth v0.0.17
3030
github.com/moby/go-archive v0.1.0
31-
github.com/moby/moby/api v1.52.0-beta.3.0.20251031021517-d96f50518f8d // master
32-
github.com/moby/moby/client v0.1.0-beta.2.0.20251031021517-d96f50518f8d // master
31+
github.com/moby/moby/api v1.52.0-beta.3.0.20251031153638-76ba3b6a4bb7 // master
32+
github.com/moby/moby/client v0.1.0-beta.2.0.20251031153638-76ba3b6a4bb7 // master
3333
github.com/moby/patternmatcher v0.6.0
3434
github.com/moby/swarmkit/v2 v2.1.0
3535
github.com/moby/sys/atomicwriter v0.1.0

‎vendor.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
170170
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
171171
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
172172
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
173-
github.com/moby/moby/api v1.52.0-beta.3.0.20251031021517-d96f50518f8d h1:yv97052L6n+B7nwsJSms4aC8qDJcFKEuAoyNQAjJcUg=
174-
github.com/moby/moby/api v1.52.0-beta.3.0.20251031021517-d96f50518f8d/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
175-
github.com/moby/moby/client v0.1.0-beta.2.0.20251031021517-d96f50518f8d h1:wXNr/8nLcBwLH9RujUs3KgAxmGkpQ0AvQlTAnVaigoA=
176-
github.com/moby/moby/client v0.1.0-beta.2.0.20251031021517-d96f50518f8d/go.mod h1:1YrJTvhL771Q4xiwwe72NSS17lgsCF67xu8fEfSd77g=
173+
github.com/moby/moby/api v1.52.0-beta.3.0.20251031153638-76ba3b6a4bb7 h1:8zjAJN+JNF1UMPcy7MnC13B+TkpQcfMHbkLA8NuioHY=
174+
github.com/moby/moby/api v1.52.0-beta.3.0.20251031153638-76ba3b6a4bb7/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
175+
github.com/moby/moby/client v0.1.0-beta.2.0.20251031153638-76ba3b6a4bb7 h1:KHuqsXpsM/0PZdT+Hc+t1mrObGr1b8h9YEICaY77w14=
176+
github.com/moby/moby/client v0.1.0-beta.2.0.20251031153638-76ba3b6a4bb7/go.mod h1:1YrJTvhL771Q4xiwwe72NSS17lgsCF67xu8fEfSd77g=
177177
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
178178
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
179179
github.com/moby/swarmkit/v2 v2.1.0 h1:u+cJ5hSyF3HnzsyI+NtegYxdIPQIuibk7IbpXNxuISM=

‎vendor/github.com/moby/moby/client/client_interfaces.go‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/client/image_create.go‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎vendor/github.com/moby/moby/client/image_create_opts.go‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎vendor/github.com/moby/moby/client/image_pull.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/client/network_create.go‎

Lines changed: 36 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)