build(deps): bump github.com/ldez/gomoddirectives from 0.4.2 to 0.5.0 (…

…#5187) Co-authored-by: Fernandez Ludovic <ldez@users.noreply.github.com>
golangci · Dec 2, 2024 · 794a340 · 794a340
1 parent 9686758
commit 794a340
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 14 deletions.
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -1355,17 +1355,29 @@ linters-settings:
   gomoddirectives:
     # Allow local `replace` directives.
     # Default: false
-    replace-local: false
+    replace-local: true
     # List of allowed `replace` directives.
     # Default: []
     replace-allow-list:
       - launchpad.net/gocheck
     # Allow to not explain why the version has been retracted in the `retract` directives.
     # Default: false
-    retract-allow-no-explanation: false
+    retract-allow-no-explanation: true
     # Forbid the use of the `exclude` directives.
     # Default: false
-    exclude-forbidden: false
+    exclude-forbidden: true
+    # Forbid the use of the `toolchain` directive.
+    # Default: false
+    toolchain-forbidden: true
+    # Forbid the use of the `tool` directives.
+    # Default: false
+    tool-forbidden: true
+    # Forbid the use of the `godebug` directive.
+    # Default: false
+    go-debug-forbidden: true
+    # Defines a pattern to validate `go` minimum version directive.
+    # Default: '' (no match)
+    go-version-pattern: '\d\.\d+(\.0)?'
 
   gomodguard:
     allowed:

diff --git a/.golangci.reference.yml b/.golangci.reference.yml
@@ -1353,17 +1353,19 @@ linters-settings:
   gomoddirectives:
     # Allow local `replace` directives.
     # Default: false
-    replace-local: false
+    replace-local: true
+
     # List of allowed `replace` directives.
     # Default: []
     replace-allow-list:
       - launchpad.net/gocheck
     # Allow to not explain why the version has been retracted in the `retract` directives.
     # Default: false
-    retract-allow-no-explanation: false
+    retract-allow-no-explanation: true
+
     # Forbid the use of the `exclude` directives.
     # Default: false
-    exclude-forbidden: false
+    exclude-forbidden: true
 
   gomodguard:
     allowed:

diff --git a/go.mod b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/kunwardeep/paralleltest v1.0.10
 	github.com/kyoh86/exportloopref v0.1.11
 	github.com/lasiar/canonicalheader v1.1.2
-	github.com/ldez/gomoddirectives v0.4.2
+	github.com/ldez/gomoddirectives v0.5.0
 	github.com/ldez/grignotin v0.6.0
 	github.com/ldez/tagliatelle v0.6.0
 	github.com/ldez/usetesting v0.2.1

diff --git a/go.sum b/go.sum
diff --git a/jsonschema/golangci.jsonschema.json b/jsonschema/golangci.jsonschema.json
@@ -1638,7 +1638,7 @@
             "replace-local": {
               "description": "Allow local `replace` directives.",
               "type": "boolean",
-              "default": true
+              "default": false
             },
             "replace-allow-list": {
               "description": "List of allowed `replace` directives.",
@@ -1650,12 +1650,12 @@
             "retract-allow-no-explanation": {
               "description": "Allow to not explain why the version has been retracted in the `retract` directives.",
               "type": "boolean",
-              "default": true
+              "default": false
             },
             "exclude-forbidden": {
               "description": "Forbid the use of the `exclude` directives.",
               "type": "boolean",
-              "default": true
+              "default": false
             }
           }
         },

diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -1668,12 +1668,32 @@
             "retract-allow-no-explanation": {
               "description": "Allow to not explain why the version has been retracted in the `retract` directives.",
               "type": "boolean",
-              "default": true
+              "default": false
             },
             "exclude-forbidden": {
               "description": "Forbid the use of the `exclude` directives.",
               "type": "boolean",
-              "default": true
+              "default": false
+            },
+            "toolchain-forbidden": {
+              "description": "Forbid the use of the `toolchain` directive.",
+              "type": "boolean",
+              "default": false
+            },
+            "tool-forbidden": {
+              "description": "Forbid the use of the `tool` directives.",
+              "type": "boolean",
+              "default": false
+            },
+            "go-debug-forbidden": {
+              "description": "Forbid the use of the `godebug` directive.",
+              "type": "boolean",
+              "default": false
+            },
+            "go-version-pattern": {
+              "description": "Defines a pattern to validate `go` minimum version directive.",
+              "type": "string",
+              "default": ""
             }
           }
         },

diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -585,6 +585,10 @@ type GoModDirectivesSettings struct {
 	ReplaceLocal              bool     `mapstructure:"replace-local"`
 	ExcludeForbidden          bool     `mapstructure:"exclude-forbidden"`
 	RetractAllowNoExplanation bool     `mapstructure:"retract-allow-no-explanation"`
+	ToolchainForbidden        bool     `mapstructure:"toolchain-forbidden"`
+	ToolForbidden             bool     `mapstructure:"tool-forbidden"`
+	GoDebugForbidden          bool     `mapstructure:"go-debug-forbidden"`
+	GoVersionPattern          string   `mapstructure:"go-version-pattern"`
 }
 
 type GoModGuardSettings struct {

diff --git a/pkg/golinters/gomoddirectives/gomoddirectives.go b/pkg/golinters/gomoddirectives/gomoddirectives.go
@@ -1,13 +1,15 @@
 package gomoddirectives
 
 import (
+	"regexp"
 	"sync"
 
 	"github.com/ldez/gomoddirectives"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
+	"github.com/golangci/golangci-lint/pkg/golinters/internal"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
@@ -24,6 +26,18 @@ func New(settings *config.GoModDirectivesSettings) *goanalysis.Linter {
 		opts.ReplaceAllowList = settings.ReplaceAllowList
 		opts.RetractAllowNoExplanation = settings.RetractAllowNoExplanation
 		opts.ExcludeForbidden = settings.ExcludeForbidden
+		opts.ToolchainForbidden = settings.ToolchainForbidden
+		opts.ToolForbidden = settings.ToolForbidden
+		opts.GoDebugForbidden = settings.GoDebugForbidden
+
+		if settings.GoVersionPattern != "" {
+			exp, err := regexp.Compile(settings.GoVersionPattern)
+			if err != nil {
+				internal.LinterLogger.Fatalf("%s: invalid Go version pattern: %v", linterName, err)
+			} else {
+				opts.GoVersionPattern = exp
+			}
+		}
 	}
 
 	analyzer := &analysis.Analyzer{