Skip to content

Commit 162242c

Browse files
thaJeztahthaJeztah
committed
vendor: github.com/moby/moby/api, moby/client master
full diff: moby/moby@e988498...9a97f59 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 75f3c08 commit 162242c

File tree

14 files changed

+107
-37
lines changed

14 files changed

+107
-37
lines changed

‎cli/command/checkpoint/client_test.go‎

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

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

109
type fakeClient struct {
1110
client.Client
1211
checkpointCreateFunc func(container string, options client.CheckpointCreateOptions) error
1312
checkpointDeleteFunc func(container string, options client.CheckpointDeleteOptions) error
14-
checkpointListFunc func(container string, options client.CheckpointListOptions) ([]checkpoint.Summary, error)
13+
checkpointListFunc func(container string, options client.CheckpointListOptions) (client.CheckpointListResult, error)
1514
}
1615

1716
func (cli *fakeClient) CheckpointCreate(_ context.Context, container string, options client.CheckpointCreateOptions) error {
@@ -28,9 +27,9 @@ func (cli *fakeClient) CheckpointDelete(_ context.Context, container string, opt
2827
return nil
2928
}
3029

31-
func (cli *fakeClient) CheckpointList(_ context.Context, container string, options client.CheckpointListOptions) ([]checkpoint.Summary, error) {
30+
func (cli *fakeClient) CheckpointList(_ context.Context, container string, options client.CheckpointListOptions) (client.CheckpointListResult, error) {
3231
if cli.checkpointListFunc != nil {
3332
return cli.checkpointListFunc(container, options)
3433
}
35-
return []checkpoint.Summary{}, nil
34+
return client.CheckpointListResult{}, nil
3635
}

‎cli/command/checkpoint/list.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ func newListCommand(dockerCLI command.Cli) *cobra.Command {
3636
return cmd
3737
}
3838

39-
func runList(ctx context.Context, dockerCli command.Cli, container string, opts listOptions) error {
40-
checkpoints, err := dockerCli.Client().CheckpointList(ctx, container, client.CheckpointListOptions{
39+
func runList(ctx context.Context, dockerCLI command.Cli, container string, opts listOptions) error {
40+
checkpoints, err := dockerCLI.Client().CheckpointList(ctx, container, client.CheckpointListOptions{
4141
CheckpointDir: opts.checkpointDir,
4242
})
4343
if err != nil {
4444
return err
4545
}
4646

4747
cpCtx := formatter.Context{
48-
Output: dockerCli.Out(),
48+
Output: dockerCLI.Out(),
4949
Format: newFormat(formatter.TableFormatKey),
5050
}
51-
return formatWrite(cpCtx, checkpoints)
51+
return formatWrite(cpCtx, checkpoints.Checkpoints)
5252
}

‎cli/command/checkpoint/list_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
func TestCheckpointListErrors(t *testing.T) {
1717
testCases := []struct {
1818
args []string
19-
checkpointListFunc func(container string, options client.CheckpointListOptions) ([]checkpoint.Summary, error)
19+
checkpointListFunc func(container string, options client.CheckpointListOptions) (client.CheckpointListResult, error)
2020
expectedError string
2121
}{
2222
{
@@ -29,8 +29,8 @@ func TestCheckpointListErrors(t *testing.T) {
2929
},
3030
{
3131
args: []string{"foo"},
32-
checkpointListFunc: func(container string, options client.CheckpointListOptions) ([]checkpoint.Summary, error) {
33-
return []checkpoint.Summary{}, errors.New("error getting checkpoints for container foo")
32+
checkpointListFunc: func(container string, options client.CheckpointListOptions) (client.CheckpointListResult, error) {
33+
return client.CheckpointListResult{}, errors.New("error getting checkpoints for container foo")
3434
},
3535
expectedError: "error getting checkpoints for container foo",
3636
},
@@ -51,11 +51,13 @@ func TestCheckpointListErrors(t *testing.T) {
5151
func TestCheckpointListWithOptions(t *testing.T) {
5252
var containerID, checkpointDir string
5353
cli := test.NewFakeCli(&fakeClient{
54-
checkpointListFunc: func(container string, options client.CheckpointListOptions) ([]checkpoint.Summary, error) {
54+
checkpointListFunc: func(container string, options client.CheckpointListOptions) (client.CheckpointListResult, error) {
5555
containerID = container
5656
checkpointDir = options.CheckpointDir
57-
return []checkpoint.Summary{
58-
{Name: "checkpoint-foo"},
57+
return client.CheckpointListResult{
58+
Checkpoints: []checkpoint.Summary{
59+
{Name: "checkpoint-foo"},
60+
},
5961
}, nil
6062
},
6163
})

‎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.1.0.20250923190348-e98849831fc4 // master
32-
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4 // master
31+
github.com/moby/moby/api v1.52.0-beta.1.0.20250929144731-9a97f59e6e2d // master
32+
github.com/moby/moby/client v0.1.0-beta.0.0.20250929144731-9a97f59e6e2d // 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.1.0.20250923190348-e98849831fc4 h1:nwVKjkAlQJp32lsr/TZ4dGUIkj+Ga6ftle+IVov9HYs=
174-
github.com/moby/moby/api v1.52.0-beta.1.0.20250923190348-e98849831fc4/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
175-
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4 h1:fk0TcJJf4rrgD3I35xxPkb9R4S+KCToMNomydm/n2Pg=
176-
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4/go.mod h1:o5CkJu0RlmnLWRZRaEd7fL6wo0Ggr8Hw/UvgqdIUBuI=
173+
github.com/moby/moby/api v1.52.0-beta.1.0.20250929144731-9a97f59e6e2d h1:Aj0cTKlIyJh8hg5veIvuQEBQgFLtGJ5CJ9qqOV3TOpc=
174+
github.com/moby/moby/api v1.52.0-beta.1.0.20250929144731-9a97f59e6e2d/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
175+
github.com/moby/moby/client v0.1.0-beta.0.0.20250929144731-9a97f59e6e2d h1:sDDi6SlfhB2ld+fsS3+6rWxLwUL4+++on61QPLAgvtY=
176+
github.com/moby/moby/client v0.1.0-beta.0.0.20250929144731-9a97f59e6e2d/go.mod h1:o5CkJu0RlmnLWRZRaEd7fL6wo0Ggr8Hw/UvgqdIUBuI=
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/api/types/container/container.go‎

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/api/types/registry/authconfig.go‎

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

‎vendor/github.com/moby/moby/api/types/storage/root_f_s_storage.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/api/types/storage/root_f_s_storage_snapshot.go‎

Lines changed: 15 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/api/types/storage/storage.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.

0 commit comments

Comments
 (0)