Merge pull request #1013 from flavianmissi/fix-golangci-lint

NO-JIRA: bump golangci-lint to v1.56.2

Author: openshift-merge-bot[bot]

Makefile

@@ -4,7 +4,7 @@ PROG  := cluster-image-registry-operator
 
 GOLANGCI_LINT = _output/tools/golangci-lint
 GOLANGCI_LINT_CACHE = $(PWD)/_output/golangci-lint-cache
-GOLANGCI_LINT_VERSION = v1.51.0
+GOLANGCI_LINT_VERSION = v1.56.2
 
 GO_REQUIRED_MIN_VERSION = 1.16
 

pkg/operator/finalizer.go

@@ -128,7 +128,6 @@ func (c *Controller) finalizeResources(o *imageregistryv1.Config) error {
 			return true, nil
 		},
 	)
-
 	if err != nil {
 		return fmt.Errorf("unable to wait for %s deletion: %s", utilObjectInfo(o), err)
 	}

pkg/storage/ibmcos/ibmcos.go

@@ -653,7 +653,6 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
 	_, err = client.DeleteBucketWithContext(d.Context, &s3.DeleteBucketInput{
 		Bucket: aws.String(d.Config.Bucket),
 	})
-
 	if err != nil {
 		if aerr, ok := err.(awserr.Error); ok {
 			if aerr.Code() == s3.ErrCodeNoSuchBucket {

pkg/storage/oss/oss.go

@@ -281,7 +281,6 @@ func (d *driver) bucketExists(bucketName string) (bool, error) {
 	}
 
 	_, err = svc.GetBucketInfo(bucketName)
-
 	if err != nil {
 		return false, err
 	}
@@ -625,7 +624,6 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
 
 	// Delete bucket
 	err = svc.DeleteBucket(d.Config.Bucket)
-
 	if err != nil {
 		if oerr, ok := err.(oss.ServiceError); ok {
 			if oerr.Code == "NoSuchBucket" {

pkg/storage/s3/s3.go

@@ -886,7 +886,6 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
 	_, err = svc.DeleteBucketWithContext(d.Context, &s3.DeleteBucketInput{
 		Bucket: aws.String(d.Config.Bucket),
 	})
-
 	if err != nil {
 		if aerr, ok := err.(awserr.Error); ok {
 			if aerr.Code() == s3.ErrCodeNoSuchBucket {

test/e2e/aws_test.go

@@ -795,7 +795,6 @@ func createAWSConfigFile(awsSecret *corev1.Secret, kubeClient *framework.Clients
 				ExpirationSeconds: &twoHoursAsSeconds,
 			},
 		}, metav1.CreateOptions{})
-
 		if err != nil {
 			return
 		}

test/e2e/azure_test.go

@@ -137,7 +137,6 @@ func TestAzurePrivateStorageAccount(t *testing.T) {
 			return true, nil
 		},
 	)
-
 	if err != nil {
 		t.Fatalf("failed to poll CR: %q", err)
 	}