Fix linter issues for golangci-lint 1.54.2

ktock · estesp · commit 2370a2842318 · 2023-12-01T10:54:41.000-05:00
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com> (cherry picked from commit 6169433)
diff --git a/content/helpers_test.go b/content/helpers_test.go
@@ -144,6 +144,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
@@ -625,6 +625,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
@@ -481,6 +481,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/metrics/cgroups/v1/oom.go b/metrics/cgroups/v1/oom.go
@@ -99,6 +99,7 @@ func (o *oomCollector) Collect(ch chan<- prometheus.Metric) {
 	o.mu.Lock()
 	defer o.mu.Unlock()
 	for _, t := range o.set {
+		t := t
 		c := atomic.LoadInt64(&t.count)
 		ch <- prometheus.MustNewConstMetric(o.desc, prometheus.CounterValue, float64(c), t.id, t.namespace)
 	}
diff --git a/pkg/cri/server/image_status_test.go b/pkg/cri/server/image_status_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 func TestImageStatus(t *testing.T) {
-	testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4"
+	testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" // #nosec G101
 	image := imagestore.Image{
 		ID:      testID,
 		ChainID: "test-chain-id",

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ func TestCopy(t *testing.T) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`for _, testcase := range testcases {`
	`147`	`+ testcase := testcase`
`147`	`148`	`t.Run(testcase.name, func(t *testing.T) {`
`148`	`149`	`err := Copy(context.Background(),`
`149`	`150`	`&testcase.writer,`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ func (o *oomCollector) Collect(ch chan<- prometheus.Metric) {`
`99`	`99`	`o.mu.Lock()`
`100`	`100`	`defer o.mu.Unlock()`
`101`	`101`	`for _, t := range o.set {`
	`102`	`+ t := t`
`102`	`103`	`c := atomic.LoadInt64(&t.count)`
`103`	`104`	`ch <- prometheus.MustNewConstMetric(o.desc, prometheus.CounterValue, float64(c), t.id, t.namespace)`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`func TestImageStatus(t *testing.T) {`
`32`		`- testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4"`
	`32`	`+ testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" // #nosec G101`
`33`	`33`	`image := imagestore.Image{`
`34`	`34`	`ID: testID,`
`35`	`35`	`ChainID: "test-chain-id",`