fix golangci-lint errors

akhilerm · akhilerm · commit 926ceb036223 · 2024-03-01T14:50:39.000+05:30
Signed-off-by: Akhil Mohan &lt;akhilerm@gmail.com&gt;
diff --git a/content/helpers_test.go b/content/helpers_test.go
@@ -143,6 +143,7 @@ func TestCopy(t *testing.T) {
 	}
 
 	for _, testcase := range testcases {
+		testcase := testcase
 		t.Run(testcase.name, func(t *testing.T) {
 			err := Copy(context.Background(),
 				&testcase.writer,
diff --git a/metadata/containers_test.go b/metadata/containers_test.go
@@ -619,6 +619,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) {
 			},
 		},
 	} {
+		testcase := testcase
 		t.Run(testcase.name, func(t *testing.T) {
 			testcase.original.ID = testcase.name
 			if testcase.input.ID == "" {
diff --git a/metadata/images_test.go b/metadata/images_test.go
@@ -479,6 +479,7 @@ func TestImagesCreateUpdateDelete(t *testing.T) {
 			cause: errdefs.ErrNotFound,
 		},
 	} {
+		testcase := testcase
 		t.Run(testcase.name, func(t *testing.T) {
 			testcase.original.Name = testcase.name
 			if testcase.input.Name == "" {
diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go
@@ -141,10 +141,9 @@ func newExporter(ctx context.Context, cfg *OTLPConfig) (*otlptrace.Exporter, err
 			opts = append(opts, otlptracegrpc.WithInsecure())
 		}
 		return otlptracegrpc.New(ctx, opts...)
-	} else {
-		// Other protocols such as "http/json" are not supported.
-		return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented)
 	}
+	// Other protocols such as "http/json" are not supported.
+	return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented)
 }
 
 // newTracer configures protocol-agonostic tracing settings such as
diff --git a/tracing/plugin/otlp_test.go b/tracing/plugin/otlp_test.go
@@ -70,6 +70,7 @@ func TestNewExporter(t *testing.T) {
 			output: errdefs.ErrNotImplemented,
 		},
 	} {
+		testcase := testcase
 		t.Run(testcase.name, func(t *testing.T) {
 			t.Logf("input: %v", testcase.input)
 

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ func TestCopy(t *testing.T) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`for _, testcase := range testcases {`
	`146`	`+ testcase := testcase`
`146`	`147`	`t.Run(testcase.name, func(t *testing.T) {`
`147`	`148`	`err := Copy(context.Background(),`
`148`	`149`	`&testcase.writer,`
Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,9 @@ func newExporter(ctx context.Context, cfg OTLPConfig) (otlptrace.Exporter, err`
`141`	`141`	`opts = append(opts, otlptracegrpc.WithInsecure())`
`142`	`142`	`}`
`143`	`143`	`return otlptracegrpc.New(ctx, opts...)`
`144`		`- } else {`
`145`		`- // Other protocols such as "http/json" are not supported.`
`146`		`- return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented)`
`147`	`144`	`}`
	`145`	`+ // Other protocols such as "http/json" are not supported.`
	`146`	`+ return nil, fmt.Errorf("OpenTelemetry protocol %q : %w", cfg.Protocol, errdefs.ErrNotImplemented)`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`// newTracer configures protocol-agonostic tracing settings such as`