Lint fixes

linode · Nov 11, 2024 · 8aa1d0a · 8aa1d0a
1 parent a755fe7
commit 8aa1d0a
Show file tree

Hide file tree

Showing 23 changed files with 1 addition and 49 deletions.
diff --git a/internal/controller/bucket/acl_test.go b/internal/controller/bucket/acl_test.go
@@ -228,7 +228,6 @@ func TestACLObserveBackend(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/create.go b/internal/controller/bucket/create.go
@@ -157,7 +157,6 @@ func (c *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 
 		c.log.Info("Creating bucket on backend", consts.KeyBucketName, originalBucket.Name, consts.KeyBackendName, beName)
 		// Launch a go routine for each backend, creating buckets concurrently.
-		beName := beName
 		go func() {
 			_, err := rgw.CreateBucket(ctx, cl, rgw.BucketToCreateBucketInput(originalBucket))
 			if err != nil {

diff --git a/internal/controller/bucket/create_test.go b/internal/controller/bucket/create_test.go
@@ -100,8 +100,6 @@ func TestCreateBasicErrors(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			s := runtime.NewScheme()
@@ -364,8 +362,6 @@ func TestCreate(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			s := runtime.NewScheme()
 			s.AddKnownTypes(v1alpha1.SchemeGroupVersion, &v1alpha1.Bucket{}, &v1alpha1.BucketList{})

diff --git a/internal/controller/bucket/delete_test.go b/internal/controller/bucket/delete_test.go
@@ -95,7 +95,6 @@ func TestDeleteBasicErrors(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -744,7 +743,6 @@ func TestDelete(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, bk)
 
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			kubeClient := fake.NewClientBuilder().
 				WithScheme(s).

diff --git a/internal/controller/bucket/helpers_test.go b/internal/controller/bucket/helpers_test.go
@@ -1543,7 +1543,6 @@ func TestIsPauseRequired(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/lifecycleconfiguration_test.go b/internal/controller/bucket/lifecycleconfiguration_test.go
@@ -443,7 +443,6 @@ func TestObserveBackend(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -777,7 +776,6 @@ func TestHandle(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/objectlockconfiguration_test.go b/internal/controller/bucket/objectlockconfiguration_test.go
@@ -189,7 +189,6 @@ func TestObjectLockConfigObserveBackend(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -488,7 +487,6 @@ func TestObjectLockConfigurationHandle(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/observe.go b/internal/controller/bucket/observe.go
@@ -102,8 +102,6 @@ func (c *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
 
 	// Check for the bucket on each backend in a separate go routine
 	for beName, backendClient := range backendClients {
-		beName := beName
-		backendClient := backendClient
 		g.Go(func() error {
 			bucketExists, err := rgw.BucketExists(ctxC, backendClient, bucket.Name)
 			if err != nil {

diff --git a/internal/controller/bucket/observe_test.go b/internal/controller/bucket/observe_test.go
@@ -88,7 +88,6 @@ func TestObserveBasicErrors(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -461,7 +460,6 @@ func TestObserve(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/policy_test.go b/internal/controller/bucket/policy_test.go
@@ -286,7 +286,6 @@ func TestPolicyObserveBackend(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/update_test.go b/internal/controller/bucket/update_test.go
@@ -100,8 +100,6 @@ func TestUpdateBasicErrors(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			e := external{
@@ -461,8 +459,6 @@ func TestUpdate(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, bk)
 
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -776,8 +772,6 @@ func TestUpdateLifecycleConfigSubResource(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, bk)
 
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1076,8 +1070,6 @@ func TestUpdateVersioningConfigSubResource(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, bk)
 
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1381,8 +1373,6 @@ func TestUpdateObjectLockConfigSubResource(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, bk)
 
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/bucket/versioningconfiguration_test.go b/internal/controller/bucket/versioningconfiguration_test.go
@@ -298,7 +298,6 @@ func TestVersioningConfigObserveBackend(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -631,7 +630,6 @@ func TestVersioningConfigurationHandle(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/providerconfig/healthcheck/healthcheck_controller.go b/internal/controller/providerconfig/healthcheck/healthcheck_controller.go
@@ -244,7 +244,6 @@ func (c *Controller) unpauseBuckets(ctx context.Context, s3BackendName string) {
 	}
 
 	for i := range buckets.Items {
-		i := i
 		c.log.Debug("Attempting to unpause bucket", consts.KeyBucketName, buckets.Items[i].Name)
 		err := retry.OnError(wait.Backoff{
 			Steps:    steps,

diff --git a/internal/controller/providerconfig/healthcheck/healthcheck_controller_test.go b/internal/controller/providerconfig/healthcheck/healthcheck_controller_test.go
@@ -477,7 +477,6 @@ func TestReconcile(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/providerconfig/healthcheck/helpers_test.go b/internal/controller/providerconfig/healthcheck/helpers_test.go
@@ -48,8 +48,6 @@ func TestErrNoRequestID(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			assert.Equal(t, tc.want.result, errNoRequestID(tc.args.err), "unexpected string")

diff --git a/internal/controller/s3clienthandler/role_session_name_test.go b/internal/controller/s3clienthandler/role_session_name_test.go
@@ -66,7 +66,6 @@ func TestRoleSessionNameGenerator_Generate(t *testing.T) {
 	}
 
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/controller/s3clienthandler/s3clienthandler_test.go b/internal/controller/s3clienthandler/s3clienthandler_test.go
@@ -427,7 +427,6 @@ func TestCreateAssumeRoleS3Client(t *testing.T) {
 	s.AddKnownTypes(apisv1alpha1.SchemeGroupVersion, pc)
 
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/rgw/acl_test.go b/internal/rgw/acl_test.go
@@ -136,7 +136,6 @@ func TestGenerateGrants(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -183,7 +182,6 @@ func TestGenerateOwner(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/rgw/bucket_helpers_test.go b/internal/rgw/bucket_helpers_test.go
@@ -30,8 +30,6 @@ func TestIsNotEmpty(t *testing.T) {
 	}
 
 	for name, tt := range testCases {
-		tt := tt
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/rgw/bucket_test.go b/internal/rgw/bucket_test.go
@@ -116,8 +116,6 @@ func TestDeleteBucket(t *testing.T) {
 	bucketName := "test-bucket"
 
 	for name, tt := range testCases {
-		tt := tt
-
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/rgw/lifecycleconfig_test.go b/internal/rgw/lifecycleconfig_test.go
@@ -177,7 +177,6 @@ func TestGenerateLifecycleConfigurationInput(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/utils/randomstring/randomstring_test.go b/internal/utils/randomstring/randomstring_test.go
@@ -43,7 +43,6 @@ func TestStandardGenerator_Generate(t *testing.T) {
 	}
 
 	for name, tt := range tests {
-		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go
@@ -72,13 +72,11 @@ func TestMissingStrings(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
-		n := name
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			missing := MissingStrings(tc.sliceA, tc.sliceB)
 			if diff := cmp.Diff(tc.missing, missing); diff != "" {
-				t.Errorf("\n%s\nMissingStrings(...): -want, +got:\n%s\n", n, diff)
+				t.Errorf("\n%s\nMissingStrings(...): -want, +got:\n%s\n", name, diff)
 			}
 		})
 	}
@@ -112,7 +110,6 @@ func TestMapConditionToHealthStatus(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			s := MapConditionToHealthStatus(tc.c)
@@ -163,7 +160,6 @@ func TestResolveHostBase(t *testing.T) {
 		},
 	}
 	for name, tc := range cases {
-		tc := tc
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()