build(deps): bump github.com/mgechev/revive from 1.12.0 to 1.13.0 (#6195)

Co-authored-by: Fernandez Ludovic <[email protected]>

Author: dependabot[bot]

.golangci.next.reference.yml

@@ -2382,6 +2382,12 @@ linters:
       # Default: false
       enable-all-rules: true
 
+      # By default, the default rules are enabled,
+      # but if you provide a custom configuration, the default rules will be disabled.
+      # This option allows you to not explicitly enable the default rules.
+      # Default: false
+      enable-default-rules: true
+
       # Enable validation of comment directives.
       # See https://github.com/mgechev/revive#comment-directives
       directives:
@@ -2644,6 +2650,11 @@ linters:
           severity: warning
           disabled: false
           exclude: [""]
+        # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#forbidden-call-in-wg-go
+        - name: forbidden-call-in-wg-go
+          severity: warning
+          disabled: false
+          exclude: [""]
         # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#function-length
         - name: function-length
           severity: warning
@@ -2726,6 +2737,11 @@ linters:
           exclude: [""]
           arguments:
             - "preserve-scope"
+        # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#inefficient-map-lookup
+        - name: inefficient-map-lookup
+          severity: warning
+          disabled: false
+          exclude: [""]
         # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#line-length-limit
         - name: line-length-limit
           severity: warning
@@ -2844,6 +2860,7 @@ linters:
           disabled: false
           exclude: [""]
           arguments:
+            - "!validate"
             - "json,inline"
             - "bson,outline,gnu"
         # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#superfluous-else
@@ -2903,6 +2920,11 @@ linters:
           severity: warning
           disabled: false
           exclude: [""]
+        # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#unnecessary-if
+        - name: unnecessary-if
+          severity: warning
+          disabled: false
+          exclude: [""]
         # https://github.com/mgechev/revive/blob/HEAD/RULES_DESCRIPTIONS.md#unnecessary-stmt
         - name: unnecessary-stmt
           severity: warning
@@ -2978,6 +3000,7 @@ linters:
             - - skip-initialism-name-checks: true
                 upper-case-const: true
                 skip-package-name-checks: true
+                skip-package-name-collision-with-go-std: true
                 extra-bad-package-names:
                   - helpers
                   - models

go.mod

@@ -86,7 +86,7 @@ require (
 	github.com/maratori/testpackage v1.1.2
 	github.com/matoous/godox v1.1.0
 	github.com/mattn/go-colorable v0.1.14
-	github.com/mgechev/revive v1.12.0
+	github.com/mgechev/revive v1.13.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/moricho/tparallel v0.3.2
 	github.com/nakabonne/nestif v0.3.1
@@ -204,7 +204,7 @@ require (
 	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/spf13/afero v1.14.0 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect

go.sum

@@ -622,6 +622,7 @@
         "file-length-limit",
         "filename-format",
         "flag-parameter",
+        "forbidden-call-in-wg-go",
         "function-length",
         "function-result-limit",
         "get-return",
@@ -636,6 +637,7 @@
         "imports-blocklist",
         "increment-decrement",
         "indent-error-flow",
+        "inefficient-map-lookup",
         "line-length-limit",
         "max-control-nesting",
         "max-public-structs",
@@ -666,6 +668,7 @@
         "unexported-return",
         "unhandled-error",
         "unnecessary-format",
+        "unnecessary-if",
         "unnecessary-stmt",
         "unreachable-code",
         "unsecure-url-scheme",
@@ -3159,6 +3162,10 @@
               "type": "boolean",
               "default": false
             },
+            "enable-default-rules": {
+              "type": "boolean",
+              "default": false
+            },
             "directives": {
               "type": "array",
               "items": {

jsonschema/golangci.next.jsonschema.json

@@ -834,15 +834,16 @@ type RecvcheckSettings struct {
 }
 
 type ReviveSettings struct {
-	Go             string            `mapstructure:"-"`
-	MaxOpenFiles   int               `mapstructure:"max-open-files"`
-	Confidence     float64           `mapstructure:"confidence"`
-	Severity       string            `mapstructure:"severity"`
-	EnableAllRules bool              `mapstructure:"enable-all-rules"`
-	Rules          []ReviveRule      `mapstructure:"rules"`
-	ErrorCode      int               `mapstructure:"error-code"`
-	WarningCode    int               `mapstructure:"warning-code"`
-	Directives     []ReviveDirective `mapstructure:"directives"`
+	Go                 string            `mapstructure:"-"`
+	MaxOpenFiles       int               `mapstructure:"max-open-files"`
+	Confidence         float64           `mapstructure:"confidence"`
+	Severity           string            `mapstructure:"severity"`
+	EnableAllRules     bool              `mapstructure:"enable-all-rules"`
+	EnableDefaultRules bool              `mapstructure:"enable-default-rules"`
+	Rules              []ReviveRule      `mapstructure:"rules"`
+	ErrorCode          int               `mapstructure:"error-code"`
+	WarningCode        int               `mapstructure:"warning-code"`
+	Directives         []ReviveDirective `mapstructure:"directives"`
 }
 
 type ReviveRule struct {

pkg/config/linters_settings.go

@@ -169,8 +169,8 @@ func (w *wrapper) toIssue(pass *analysis.Pass, failure *lint.Failure) *goanalysi
 // This function mimics the GetConfig function of revive.
 // This allows to get default values and right types.
 // https://github.com/golangci/golangci-lint/issues/1745
-// https://github.com/mgechev/revive/blob/v1.6.0/config/config.go#L230
-// https://github.com/mgechev/revive/blob/v1.6.0/config/config.go#L182-L188
+// https://github.com/mgechev/revive/blob/v1.13.0/config/config.go#L249
+// https://github.com/mgechev/revive/blob/v1.13.0/config/config.go#L198-L204
 func getConfig(cfg *config.ReviveSettings) (*lint.Config, error) {
 	conf := defaultConfig()
 
@@ -269,7 +269,7 @@ func safeTomlSlice(r []any) []any {
 }
 
 // This element is not exported by revive, so we need copy the code.
-// Extracted from https://github.com/mgechev/revive/blob/v1.12.0/config/config.go#L16
+// Extracted from https://github.com/mgechev/revive/blob/v1.13.0/config/config.go#L16
 var defaultRules = []lint.Rule{
 	&rule.VarDeclarationsRule{},
 	&rule.PackageCommentsRule{},
@@ -325,6 +325,7 @@ var allRules = append([]lint.Rule{
 	&rule.FileLengthLimitRule{},
 	&rule.FilenameFormatRule{},
 	&rule.FlagParamRule{},
+	&rule.ForbiddenCallInWgGoRule{},
 	&rule.FunctionLength{},
 	&rule.FunctionResultsLimitRule{},
 	&rule.GetReturnRule{},
@@ -337,6 +338,7 @@ var allRules = append([]lint.Rule{
 	&rule.ImportAliasNamingRule{},
 	&rule.ImportsBlocklistRule{},
 	&rule.ImportShadowingRule{},
+	&rule.InefficientMapLookupRule{},
 	&rule.LineLengthLimitRule{},
 	&rule.MaxControlNestingRule{},
 	&rule.MaxPublicStructsRule{},
@@ -360,6 +362,7 @@ var allRules = append([]lint.Rule{
 	&rule.UnexportedNamingRule{},
 	&rule.UnhandledErrorRule{},
 	&rule.UnnecessaryFormatRule{},
+	&rule.UnnecessaryIfRule{},
 	&rule.UnnecessaryStmtRule{},
 	&rule.UnsecureURLSchemeRule{},
 	&rule.UnusedReceiverRule{},
@@ -375,7 +378,7 @@ var allRules = append([]lint.Rule{
 const defaultConfidence = 0.8
 
 // This element is not exported by revive, so we need copy the code.
-// Extracted from https://github.com/mgechev/revive/blob/v1.12.0/config/config.go#L206
+// Extracted from https://github.com/mgechev/revive/blob/v1.13.0/config/config.go#L209
 func normalizeConfig(cfg *lint.Config) {
 	// NOTE(ldez): this custom section for golangci-lint should be kept.
 	// ---
@@ -386,19 +389,22 @@ func normalizeConfig(cfg *lint.Config) {
 	if len(cfg.Rules) == 0 {
 		cfg.Rules = map[string]lint.RuleConfig{}
 	}
-	if cfg.EnableAllRules {
-		// Add to the configuration all rules not yet present in it
-		for _, r := range allRules {
+
+	addRules := func(config *lint.Config, rules []lint.Rule) {
+		for _, r := range rules {
 			ruleName := r.Name()
-			_, alreadyInConf := cfg.Rules[ruleName]
-			if alreadyInConf {
-				continue
+			if _, ok := config.Rules[ruleName]; !ok {
+				config.Rules[ruleName] = lint.RuleConfig{}
 			}
-			// Add the rule with an empty conf for
-			cfg.Rules[ruleName] = lint.RuleConfig{}
 		}
 	}
 
+	if cfg.EnableAllRules {
+		addRules(cfg, allRules)
+	} else if cfg.EnableDefaultRules {
+		addRules(cfg, defaultRules)
+	}
+
 	severity := cfg.Severity
 	if severity != "" {
 		for k, v := range cfg.Rules {
@@ -417,7 +423,7 @@ func normalizeConfig(cfg *lint.Config) {
 }
 
 // This element is not exported by revive, so we need copy the code.
-// Extracted from https://github.com/mgechev/revive/blob/v1.12.0/config/config.go#L274
+// Extracted from https://github.com/mgechev/revive/blob/v1.13.0/config/config.go#L280
 func defaultConfig() *lint.Config {
 	defaultConfig := lint.Config{
 		Confidence: defaultConfidence,
@@ -463,7 +469,7 @@ func extractRulesName(rules []lint.Rule) []string {
 	return names
 }
 
-// Extracted from https://github.com/mgechev/revive/blob/v1.12.0/formatter/severity.go
+// Extracted from https://github.com/mgechev/revive/blob/v1.13.0/formatter/severity.go
 // Modified to use pointers (related to hugeParam rule).
 func severity(cfg *lint.Config, failure *lint.Failure) lint.Severity {
 	if cfg, ok := cfg.Rules[failure.RuleName]; ok && cfg.Severity == lint.SeverityError {

pkg/golinters/revive/revive.go

@@ -1,5 +1,5 @@
-// Package pkg ...
-package pkg
+// Package pkgunsafe ...
+package pkgunsafe
 
 import (
 	"log"