p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6580 from thaJeztah/no_json

Browse Source 
cli/command/image: remove uses of JSON field
This commit is contained in:
Austin Vazquez
2025-10-27 21:42:29 -05:00
committed by GitHub
parent 715467c9d8 f594a7f09b
commit 93cd6793b3
8 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cli/command/image/load.go
View File

@ -70,7 +70,7 @@ func runLoad(ctx context.Context, dockerCli command.Cli, opts loadOptions) error
if err != nil {
return err
}
defer file.Close()
defer func() { _ = file.Close() }()
input = file
}
@ -95,12 +95,7 @@ func runLoad(ctx context.Context, dockerCli command.Cli, opts loadOptions) error
if err != nil {
return err
}
defer res.Close()
defer func() { _ = res.Close() }()
if res.JSON {
return jsonstream.Display(ctx, res, dockerCli.Out())
}
_, err = io.Copy(dockerCli.Out(), res)
return err
return jsonstream.Display(ctx, res, dockerCli.Out())
}

34
cli/command/image/load_test.go
View File

@ -74,8 +74,8 @@ func TestNewLoadCommandInvalidInput(t *testing.T) {
assert.ErrorContains(t, err, expectedError)
}
func mockImageLoadResult(content string, json bool) client.ImageLoadResult {
out := client.ImageLoadResult{JSON: json}
func mockImageLoadResult(content string) client.ImageLoadResult {
out := client.ImageLoadResult{}
// Set unexported field "body"
v := reflect.ValueOf(&out).Elem()
@ -94,22 +94,12 @@ func TestNewLoadCommandSuccess(t *testing.T) {
{
name: "simple",
args: []string{},
imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (client.ImageLoadResult, error) {
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader("Success"))}, nil
return mockImageLoadResult(`Success`, false), nil
},
},
{
name: "json",
args: []string{},
imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (client.ImageLoadResult, error) {
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{
// Body: io.NopCloser(strings.NewReader(`{"ID": "1"}`)),
// JSON: true,
// Body: io.NopCloser(strings.NewReader(`{"ID":"simple","Status":"success"}`)),
// }, nil
return mockImageLoadResult(`{"ID":"1"}`, true), nil
return mockImageLoadResult(`{"ID":"simple","Status":"success"}`), nil
},
},
{
@ -117,8 +107,8 @@ func TestNewLoadCommandSuccess(t *testing.T) {
args: []string{"--input", "testdata/load-command-success.input.txt"},
imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (client.ImageLoadResult, error) {
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader("Success"))}, nil
return mockImageLoadResult(`Success`, false), nil
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader(`{"ID":"input-file","Status":"success"}`))}, nil
return mockImageLoadResult(`{"ID":"input-file","Status":"success"}`), nil
},
},
{
@ -129,8 +119,8 @@ func TestNewLoadCommandSuccess(t *testing.T) {
assert.Check(t, len(options) > 0) // can be 1 or two depending on whether a terminal is attached :/
// assert.Check(t, is.Contains(options, client.ImageHistoryWithPlatform(ocispec.Platform{OS: "linux", Architecture: "amd64"})))
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader("Success"))}, nil
return mockImageLoadResult(`Success`, false), nil
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader(`{"ID":"single-platform","Status":"success"}`))}, nil
return mockImageLoadResult(`{"ID":"single-platform","Status":"success"}`), nil
},
},
{
@ -139,8 +129,8 @@ func TestNewLoadCommandSuccess(t *testing.T) {
imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (client.ImageLoadResult, error) {
assert.Check(t, len(options) > 0) // can be 1 or two depending on whether a terminal is attached :/
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader("Success"))}, nil
return mockImageLoadResult(`Success`, false), nil
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader(`{"ID":"with-comma-separated-platforms","Status":"success"}`))}, nil
return mockImageLoadResult(`{"ID":"with-comma-separated-platforms","Status":"success"}`), nil
},
},
{
@ -149,8 +139,8 @@ func TestNewLoadCommandSuccess(t *testing.T) {
imageLoadFunc: func(input io.Reader, options ...client.ImageLoadOption) (client.ImageLoadResult, error) {
assert.Check(t, len(options) > 0) // can be 1 or two depending on whether a terminal is attached :/
// FIXME(thaJeztah): how to mock this?
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader("Success"))}, nil
return mockImageLoadResult(`Success`, false), nil
// return client.ImageLoadResult{Body: io.NopCloser(strings.NewReader(`{"ID":"with-multiple-platform-options","Status":"success"}`))}, nil
return mockImageLoadResult(`{"ID":"with-multiple-platform-options","Status":"success"}`), nil
},
},
}

2
cli/command/image/testdata/load-command-success.input-file.golden vendored
View File

@ -1 +1 @@
Success
input-file: success

1
cli/command/image/testdata/load-command-success.json.golden vendored
View File

@ -1 +0,0 @@
1:

2
cli/command/image/testdata/load-command-success.simple.golden vendored
View File

@ -1 +1 @@
Success
simple: success

2
cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden vendored
View File

@ -1 +1 @@
Success
with-comma-separated-platforms: success

2
cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden vendored
View File

@ -1 +1 @@
Success
with-multiple-platform-options: success

2
cli/command/image/testdata/load-command-success.with-single-platform.golden vendored
View File

@ -1 +1 @@
Success
single-platform: success