Hugging Face's logo

Datasets:
CrossSWE
/
CrossSWE-Bench

Tasks:
Text Generation
Modalities:
Tabular
Text
Formats:
parquet
Languages:
English
Size:
< 1K
Tags:
software-engineering
cross-repository
code-repair
patch-generation
benchmark
docker
Libraries:
Datasets
pandas
Polars
License:
Dataset card Data Studio Files
xet
 Community
1
CrossSWE-Bench / instances /cloudnative-docker-cli-6580 /gold /cli.patch
Silin-Chen's picture
Silin-Chen
CrossSWE-Bench: current 171-instance release
0e239c6
Raw History Blame Contribute Delete
9.43 kB
diff --git a/cli/command/image/load.go b/cli/command/image/load.go
index 4bbf26069e..4fc9394661 100644
--- a/cli/command/image/load.go
+++ b/cli/command/image/load.go
@@ -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())
}
diff --git a/cli/command/image/load_test.go b/cli/command/image/load_test.go
index 91f4273cdd..78c1ca0452 100644
--- a/cli/command/image/load_test.go
+++ b/cli/command/image/load_test.go
@@ -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
},
},
}
diff --git a/cli/command/image/testdata/load-command-success.input-file.golden b/cli/command/image/testdata/load-command-success.input-file.golden
index 51da4200ab..0f454425f4 100644
--- a/cli/command/image/testdata/load-command-success.input-file.golden
+++ b/cli/command/image/testdata/load-command-success.input-file.golden
@@ -1 +1 @@
-Success
\ No newline at end of file
+input-file: success
diff --git a/cli/command/image/testdata/load-command-success.json.golden b/cli/command/image/testdata/load-command-success.json.golden
deleted file mode 100644
index c17f16ecd7..0000000000
--- a/cli/command/image/testdata/load-command-success.json.golden
+++ /dev/null
@@ -1 +0,0 @@
-1:
diff --git a/cli/command/image/testdata/load-command-success.simple.golden b/cli/command/image/testdata/load-command-success.simple.golden
index 51da4200ab..f503a70c61 100644
--- a/cli/command/image/testdata/load-command-success.simple.golden
+++ b/cli/command/image/testdata/load-command-success.simple.golden
@@ -1 +1 @@
-Success
\ No newline at end of file
+simple: success
diff --git a/cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden b/cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden
index 51da4200ab..9cd1f6fc34 100644
--- a/cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden
+++ b/cli/command/image/testdata/load-command-success.with-comma-separated-platforms.golden
@@ -1 +1 @@
-Success
\ No newline at end of file
+with-comma-separated-platforms: success
diff --git a/cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden b/cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden
index 51da4200ab..172a51a1aa 100644
--- a/cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden
+++ b/cli/command/image/testdata/load-command-success.with-multiple-platform-options.golden
@@ -1 +1 @@
-Success
\ No newline at end of file
+with-multiple-platform-options: success
diff --git a/cli/command/image/testdata/load-command-success.with-single-platform.golden b/cli/command/image/testdata/load-command-success.with-single-platform.golden
index 51da4200ab..59ff47762f 100644
--- a/cli/command/image/testdata/load-command-success.with-single-platform.golden
+++ b/cli/command/image/testdata/load-command-success.with-single-platform.golden
@@ -1 +1 @@
-Success
\ No newline at end of file
+single-platform: success
diff --git a/cli/command/telemetry.go b/cli/command/telemetry.go
index f4107c3863..e8e6296b5a 100644
--- a/cli/command/telemetry.go
+++ b/cli/command/telemetry.go
@@ -11,7 +11,6 @@ import (
"github.com/google/uuid"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/metric"
- otelsdk "go.opentelemetry.io/otel/sdk"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
@@ -147,7 +146,7 @@ func defaultResourceOptions() []resource.Option {
semconv.ServiceInstanceID(uuid.NewString()),
),
resource.WithFromEnv(),
- resource.WithDetectors(telemetrySDK{}),
+ resource.WithTelemetrySDK(),
}
}
@@ -158,10 +157,7 @@ func (r *telemetryResource) AppendOptions(opts ...resource.Option) {
r.opts = append(r.opts, opts...)
}
-type (
- serviceNameDetector struct{}
- telemetrySDK struct{}
-)
+type serviceNameDetector struct{}
func (serviceNameDetector) Detect(ctx context.Context) (*resource.Resource, error) {
return resource.StringDetector(
@@ -173,16 +169,6 @@ func (serviceNameDetector) Detect(ctx context.Context) (*resource.Resource, erro
).Detect(ctx)
}
-// Detect returns a *Resource that describes the OpenTelemetry SDK used.
-func (telemetrySDK) Detect(context.Context) (*resource.Resource, error) {
- return resource.NewWithAttributes(
- semconv.SchemaURL,
- semconv.TelemetrySDKName("opentelemetry"),
- semconv.TelemetrySDKLanguageGo,
- semconv.TelemetrySDKVersion(otelsdk.Version()),
- ), nil
-}
-
// cliReader is an implementation of Reader that will automatically
// report to a designated Exporter when Shutdown is called.
type cliReader struct {