diff --git a/Makefile b/Makefile index b1e80543e..edcc80282 100644 --- a/Makefile +++ b/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 diff --git a/pkg/operator/finalizer.go b/pkg/operator/finalizer.go index 6cc73953b..7b10a46ce 100644 --- a/pkg/operator/finalizer.go +++ b/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) } diff --git a/pkg/storage/ibmcos/ibmcos.go b/pkg/storage/ibmcos/ibmcos.go index be50a37a5..7ddf6ae29 100644 --- a/pkg/storage/ibmcos/ibmcos.go +++ b/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 { diff --git a/pkg/storage/oss/oss.go b/pkg/storage/oss/oss.go index 8701cb138..b501a761c 100644 --- a/pkg/storage/oss/oss.go +++ b/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" { diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go index 4102d56bf..1220c6d9b 100644 --- a/pkg/storage/s3/s3.go +++ b/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 { diff --git a/test/e2e/aws_test.go b/test/e2e/aws_test.go index 3006ef388..c4e952b04 100644 --- a/test/e2e/aws_test.go +++ b/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 } diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go index 667eb1b0f..28a521604 100644 --- a/test/e2e/azure_test.go +++ b/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) }