Fix linter issues for golangci-lint 1.54.2

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com> (cherry picked from commit 6169433)
containerd · Dec 1, 2023 · 2370a28 · 2370a28
1 parent 8a65e2e
commit 2370a28
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
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",