diff --git a/.golangci.yaml b/.golangci.yaml index f3eed8c74d..85e6ebf357 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -85,92 +85,57 @@ linters-settings: # Optimizes into strings concatenation. strconcat: true revive: + # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md rules: - # Blank import should be only in a main or test package, or have a comment justifying it. + - name: bool-literal-in-expr - name: blank-imports disabled: true - # context.Context() should be the first parameter of a function when provided as argument. - name: context-as-argument - disabled: false arguments: - # Allow functions with test or bench signatures. - allowTypesBefore: "*testing.T,testing.TB" - # Basic types should not be used as a key in `context.WithValue` - name: context-keys-type disabled: true - # Importing with `.` makes the programs much harder to understand - name: dot-imports disabled: true - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#duplicated-imports - name: duplicated-imports - disabled: false - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#early-return - name: early-return - disabled: false arguments: - "preserveScope" - # Empty blocks make code less readable and could be a symptom of a bug or unfinished refactoring. - name: empty-block disabled: true - # for better readability, variables of type `error` must be named with the prefix `err`. - name: error-naming disabled: true - # for better readability, the errors should be last in the list of returned values by a function. - name: error-return - disabled: false - # for better readability, error messages should not be capitalized or end with punctuation or a newline. - name: error-strings disabled: true - # report when replacing `errors.New(fmt.Sprintf())` with `fmt.Errorf()` is possible - name: errorf - disabled: false - # incrementing an integer variable by 1 is recommended to be done using the `++` operator + - name: identical-branches + - name: if-return - name: increment-decrement - disabled: false - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#indent-error-flow - name: indent-error-flow - disabled: false arguments: - "preserveScope" - # This rule suggests a shorter way of writing ranges that do not use the second value. + - name: modifies-parameter + - name: optimize-operands-order - name: range - disabled: false - # receiver names in a method should reflect the struct name (p for Person, for example) - name: receiver-naming - disabled: false - # redefining built in names (true, false, append, make) can lead to bugs very difficult to detect. - name: redefines-builtin-id disabled: true - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#redundant-import-alias - name: redundant-import-alias - disabled: false - # redundant else-blocks that can be eliminated from the code. - name: superfluous-else - disabled: false arguments: - "preserveScope" - # prevent confusing name for variables when using `time` package + - name: time-equal - name: time-naming disabled: true - # warns when an exported function or method returns a value of an un-exported type. - name: unexported-return disabled: true - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unnecessary-stmt - name: unnecessary-stmt - disabled: false - # spots and proposes to remove unreachable code. also helps to spot errors - name: unreachable-code - disabled: false - # Functions or methods with unused parameters can be a symptom of an unfinished refactoring or a bug. - name: unused-parameter - disabled: false - # Since Go 1.18, interface{} has an alias: any. This rule proposes to replace instances of interface{} with any. - name: use-any - disabled: false - # report when a variable declaration can be simplified + - name: useless-break - name: var-declaration - disabled: false - # warns when initialism, variable or package naming conventions are not followed. - name: var-naming disabled: true testifylint: diff --git a/applicationset/services/pull_request/bitbucket_server_test.go b/applicationset/services/pull_request/bitbucket_server_test.go index e556ed95c8..19b9eb9e46 100644 --- a/applicationset/services/pull_request/bitbucket_server_test.go +++ b/applicationset/services/pull_request/bitbucket_server_test.go @@ -277,7 +277,7 @@ func TestListPullRequestTLS(t *testing.T) { defer ts.Close() var certs []byte - if test.passCerts == true { + if test.passCerts { for _, cert := range ts.TLS.Certificates { for _, c := range cert.Certificate { parsedCert, err := x509.ParseCertificate(c) diff --git a/applicationset/services/pull_request/gitlab_test.go b/applicationset/services/pull_request/gitlab_test.go index f46982823e..36ec039a6a 100644 --- a/applicationset/services/pull_request/gitlab_test.go +++ b/applicationset/services/pull_request/gitlab_test.go @@ -167,7 +167,7 @@ func TestListWithStateTLS(t *testing.T) { defer ts.Close() var certs []byte - if test.passCerts == true { + if test.passCerts { for _, cert := range ts.TLS.Certificates { for _, c := range cert.Certificate { parsedCert, err := x509.ParseCertificate(c) diff --git a/applicationset/services/scm_provider/bitbucket_server_test.go b/applicationset/services/scm_provider/bitbucket_server_test.go index 753e8f75f7..3b468d5ecd 100644 --- a/applicationset/services/scm_provider/bitbucket_server_test.go +++ b/applicationset/services/scm_provider/bitbucket_server_test.go @@ -452,7 +452,7 @@ func TestListReposTLS(t *testing.T) { defer ts.Close() var certs []byte - if test.passCerts == true { + if test.passCerts { for _, cert := range ts.TLS.Certificates { for _, c := range cert.Certificate { parsedCert, err := x509.ParseCertificate(c) diff --git a/applicationset/services/scm_provider/gitlab_test.go b/applicationset/services/scm_provider/gitlab_test.go index 6750278967..a4d92b9224 100644 --- a/applicationset/services/scm_provider/gitlab_test.go +++ b/applicationset/services/scm_provider/gitlab_test.go @@ -1310,7 +1310,7 @@ func TestGetBranchesTLS(t *testing.T) { defer ts.Close() var certs []byte - if test.passCerts == true { + if test.passCerts { for _, cert := range ts.TLS.Certificates { for _, c := range cert.Certificate { parsedCert, err := x509.ParseCertificate(c) diff --git a/controller/metrics/clustercollector.go b/controller/metrics/clustercollector.go index 7b7d431650..cb48c79075 100644 --- a/controller/metrics/clustercollector.go +++ b/controller/metrics/clustercollector.go @@ -60,13 +60,11 @@ type clusterCollector struct { } func (c *clusterCollector) Run(ctx context.Context) { - // FIXME: complains about SA1015 - //nolint:staticcheck + //nolint:staticcheck // FIXME: complains about SA1015 tick := time.Tick(metricsCollectionInterval) for { select { case <-ctx.Done(): - break case <-tick: info := c.infoSource.GetClustersInfo() diff --git a/hack/gen-resources/util/sizedwaitgroup.go b/hack/gen-resources/util/sizedwaitgroup.go index 6c6d4fb1c5..4ddb5192d2 100644 --- a/hack/gen-resources/util/sizedwaitgroup.go +++ b/hack/gen-resources/util/sizedwaitgroup.go @@ -87,7 +87,6 @@ func (s *SizedWaitGroup) AddWithContext(ctx context.Context) error { case <-ctx.Done(): return ctx.Err() case s.current <- struct{}{}: - break } s.wg.Add(1) return nil diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go index d15721065e..de6fff988c 100644 --- a/server/cluster/cluster.go +++ b/server/cluster/cluster.go @@ -380,10 +380,7 @@ func enforceAndDelete(ctx context.Context, s *Server, server, project string) er log.WithField("cluster", server).Warnf("encountered permissions issue while processing request: %v", err) return common.PermissionDeniedAPIError } - if err := s.db.DeleteCluster(ctx, server); err != nil { - return err - } - return nil + return s.db.DeleteCluster(ctx, server) } // RotateAuth rotates the bearer token used for a cluster diff --git a/util/git/client.go b/util/git/client.go index a3468f91ef..f116312d04 100644 --- a/util/git/client.go +++ b/util/git/client.go @@ -472,10 +472,7 @@ func (m *nativeGitClient) Submodule() error { if err := m.runCredentialedCmd("submodule", "sync", "--recursive"); err != nil { return err } - if err := m.runCredentialedCmd("submodule", "update", "--init", "--recursive"); err != nil { - return err - } - return nil + return m.runCredentialedCmd("submodule", "update", "--init", "--recursive") } // Checkout checks out the specified revision diff --git a/util/password/password_test.go b/util/password/password_test.go index bbdf1ebb51..3447cdf917 100644 --- a/util/password/password_test.go +++ b/util/password/password_test.go @@ -63,7 +63,7 @@ func TestPasswordHashing(t *testing.T) { } valid, _ = verifyPasswordWithHashers(blankPassword, "", hashers) - if valid != false { + if valid { t.Errorf("Blank password should have failed verification") } }