Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Mar 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
332f3ab
Makefile: bump golangci-lint version
flavianmissi Mar 13, 2024
d3cc89b
pkg,test: gofumpt files
flavianmissi Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion pkg/operator/finalizer.go
View file
Open in desktop
Expand Up @@ -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)
}
Expand Down
1 change: 0 additions & 1 deletion pkg/storage/ibmcos/ibmcos.go
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions pkg/storage/oss/oss.go
View file
Open in desktop
Expand Up @@ -281,7 +281,6 @@ func (d *driver) bucketExists(bucketName string) (bool, error) {
}

_, err = svc.GetBucketInfo(bucketName)

if err != nil {
return false, err
}
Expand Down Expand Up @@ -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" {
Expand Down
1 change: 0 additions & 1 deletion pkg/storage/s3/s3.go
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion test/e2e/aws_test.go
View file
Open in desktop
Expand Up @@ -795,7 +795,6 @@ func createAWSConfigFile(awsSecret *corev1.Secret, kubeClient *framework.Clients
ExpirationSeconds: &twoHoursAsSeconds,
},
}, metav1.CreateOptions{})

if err != nil {
return
}
Expand Down
1 change: 0 additions & 1 deletion test/e2e/azure_test.go
View file
Open in desktop
Expand Up @@ -137,7 +137,6 @@ func TestAzurePrivateStorageAccount(t *testing.T) {
return true, nil
},
)

if err != nil {
t.Fatalf("failed to poll CR: %q", err)
}
Expand Down