Fix linter issues for golangci-lint 1.54.2

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
This commit is contained in:
Kohei Tokunaga 2023-10-03 21:56:47 +09:00
parent 28fa2751f2
commit 6169433b6b
No known key found for this signature in database
GPG Key ID: 6CE0A04690DB3FB3
11 changed files with 11 additions and 6 deletions

View File

@ -143,6 +143,7 @@ func TestCopy(t *testing.T) {
} }
for _, testcase := range testcases { for _, testcase := range testcases {
testcase := testcase
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
err := Copy(context.Background(), err := Copy(context.Background(),
&testcase.writer, &testcase.writer,

View File

@ -619,6 +619,7 @@ func TestContainersCreateUpdateDelete(t *testing.T) {
}, },
}, },
} { } {
testcase := testcase
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
testcase.original.ID = testcase.name testcase.original.ID = testcase.name
if testcase.input.ID == "" { if testcase.input.ID == "" {

View File

@ -479,6 +479,7 @@ func TestImagesCreateUpdateDelete(t *testing.T) {
cause: errdefs.ErrNotFound, cause: errdefs.ErrNotFound,
}, },
} { } {
testcase := testcase
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
testcase.original.Name = testcase.name testcase.original.Name = testcase.name
if testcase.input.Name == "" { if testcase.input.Name == "" {

View File

@ -98,6 +98,7 @@ func (o *oomCollector) Collect(ch chan<- prometheus.Metric) {
o.mu.Lock() o.mu.Lock()
defer o.mu.Unlock() defer o.mu.Unlock()
for _, t := range o.set { for _, t := range o.set {
t := t
c := atomic.LoadInt64(&t.count) c := atomic.LoadInt64(&t.count)
ch <- prometheus.MustNewConstMetric(o.desc, prometheus.CounterValue, float64(c), t.id, t.namespace) ch <- prometheus.MustNewConstMetric(o.desc, prometheus.CounterValue, float64(c), t.id, t.namespace)
} }

View File

@ -29,7 +29,7 @@ import (
) )
func TestImageStatus(t *testing.T) { func TestImageStatus(t *testing.T) {
testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" // #nosec G101
image := imagestore.Image{ image := imagestore.Image{
ID: testID, ID: testID,
ChainID: "test-chain-id", ChainID: "test-chain-id",

View File

@ -35,7 +35,7 @@ const (
// Use an image id as test sandbox image to avoid image name resolve. // Use an image id as test sandbox image to avoid image name resolve.
// TODO(random-liu): Change this to image name after we have complete image // TODO(random-liu): Change this to image name after we have complete image
// management unit test framework. // management unit test framework.
testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" // #nosec G101
) )
// newTestCRIService creates a fake criService for test. // newTestCRIService creates a fake criService for test.

View File

@ -34,7 +34,7 @@ const (
// Use an image id as test sandbox image to avoid image name resolve. // Use an image id as test sandbox image to avoid image name resolve.
// TODO(random-liu): Change this to image name after we have complete image // TODO(random-liu): Change this to image name after we have complete image
// management unit test framework. // management unit test framework.
testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" // #nosec G101
) )
var testConfig = criconfig.Config{ var testConfig = criconfig.Config{

View File

@ -24,7 +24,7 @@ const (
// Use an image id as test sandbox image to avoid image name resolve. // Use an image id as test sandbox image to avoid image name resolve.
// TODO(random-liu): Change this to image name after we have complete image // TODO(random-liu): Change this to image name after we have complete image
// management unit test framework. // management unit test framework.
testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" // #nosec G101
) )
var testConfig = criconfig.Config{ var testConfig = criconfig.Config{

View File

@ -29,7 +29,7 @@ import (
) )
func TestImageStatus(t *testing.T) { func TestImageStatus(t *testing.T) {
testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" testID := "sha256:d848ce12891bf78792cda4a23c58984033b0c397a55e93a1556202222ecc5ed4" // #nosec G101
image := imagestore.Image{ image := imagestore.Image{
ID: testID, ID: testID,
ChainID: "test-chain-id", ChainID: "test-chain-id",

View File

@ -24,7 +24,7 @@ const (
// Use an image id as test sandbox image to avoid image name resolve. // Use an image id as test sandbox image to avoid image name resolve.
// TODO(random-liu): Change this to image name after we have complete image // TODO(random-liu): Change this to image name after we have complete image
// management unit test framework. // management unit test framework.
testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" testSandboxImage = "sha256:c75bebcdd211f41b3a460c7bf82970ed6c75acaab9cd4c9a4e125b03ca113798" // #nosec G101
testImageFSPath = "/test/image/fs/path" testImageFSPath = "/test/image/fs/path"
) )

View File

@ -70,6 +70,7 @@ func TestNewExporter(t *testing.T) {
output: errdefs.ErrNotImplemented, output: errdefs.ErrNotImplemented,
}, },
} { } {
testcase := testcase
t.Run(testcase.name, func(t *testing.T) { t.Run(testcase.name, func(t *testing.T) {
t.Logf("input: %v", testcase.input) t.Logf("input: %v", testcase.input)