diff --git a/.golangci.yml b/.golangci.yml index 14f787d9b..221b6c875 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -66,6 +66,9 @@ linters-settings: # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#if-return - name: if-return disabled: true + - name: superfluous-else + arguments: + - preserveScope staticcheck: checks: - all diff --git a/pkg/karmadactl/util/genericresource/visitor.go b/pkg/karmadactl/util/genericresource/visitor.go index bf9bc76c7..ec5f683ba 100644 --- a/pkg/karmadactl/util/genericresource/visitor.go +++ b/pkg/karmadactl/util/genericresource/visitor.go @@ -285,10 +285,9 @@ func readHTTPWithRetries(get httpget, duration time.Duration, u string, attempts if statusCode >= 500 && statusCode < 600 { // Retry 500's continue - } else { - // Don't retry other StatusCodes - break } + // Don't retry other StatusCodes + break } return nil, err } diff --git a/test/e2e/framework/federatedresourcequota.go b/test/e2e/framework/federatedresourcequota.go index 8bb1175cc..46a251c2b 100644 --- a/test/e2e/framework/federatedresourcequota.go +++ b/test/e2e/framework/federatedresourcequota.go @@ -77,9 +77,8 @@ func WaitFederatedResourceQuotaCollectStatus(client karmada.Interface, namespace matched = true if reflect.DeepEqual(assign.Hard, aggregated.Hard) { break - } else { - return false, nil } + return false, nil } if !matched { return false, nil