build(deps): bump github.com/nunnatsa/ginkgolinter from 0.17.0 to 0.18.0 (#5114)

dependabot[bot] · ldez · web-flow · commit c4b6d3716e75 · 2024-11-07T20:07:10.000+01:00
Co-authored-by: Fernandez Ludovic &lt;ldez@users.noreply.github.com&gt;
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -652,6 +652,10 @@ linters-settings:
     # Default: false
     forbid-spec-pollution: true
 
+    # Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.
+    # Default: false
+    force-succeed: true
+
   gochecksumtype:
     # Presence of `default` case in switch statements satisfies exhaustiveness, if all members are not listed.
     # Default: true
diff --git a/go.mod b/go.mod
@@ -82,7 +82,7 @@ require (
 	github.com/nakabonne/nestif v0.3.1
 	github.com/nishanths/exhaustive v0.12.0
 	github.com/nishanths/predeclared v0.2.2
-	github.com/nunnatsa/ginkgolinter v0.17.0
+	github.com/nunnatsa/ginkgolinter v0.18.0
 	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/polyfloyd/go-errorlint v1.6.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
diff --git a/go.sum b/go.sum
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -1180,6 +1180,11 @@
               "description": "Trigger a warning for variable assignments in ginkgo containers like `Describe`, `Context` and `When`, instead of in `BeforeEach()`.",
               "type": "boolean",
               "default": false
+            },
+            "force-succeed": {
+              "description": "Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.",
+              "type": "boolean",
+              "default": false
             }
           }
         },
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -488,6 +488,7 @@ type GinkgoLinterSettings struct {
 	ForceExpectTo              bool `mapstructure:"force-expect-to"`
 	ValidateAsyncIntervals     bool `mapstructure:"validate-async-intervals"`
 	ForbidSpecPollution        bool `mapstructure:"forbid-spec-pollution"`
+	ForceSucceedForFuncs       bool `mapstructure:"force-succeed"`
 }
 
 type GoChecksumTypeSettings struct {
diff --git a/pkg/golinters/ginkgolinter/ginkgolinter.go b/pkg/golinters/ginkgolinter/ginkgolinter.go
@@ -25,6 +25,7 @@ func New(settings *config.GinkgoLinterSettings) *goanalysis.Linter {
 			ForceExpectTo:          types.Boolean(settings.ForceExpectTo),
 			ValidateAsyncIntervals: types.Boolean(settings.ValidateAsyncIntervals),
 			ForbidSpecPollution:    types.Boolean(settings.ForbidSpecPollution),
+			ForceSucceedForFuncs:   types.Boolean(settings.ForceSucceedForFuncs),
 		}
 	}
 

-Original file line number
+Diff line change
 	github.com/nakabonne/nestif v0.3.1
 	github.com/nishanths/exhaustive v0.12.0
 	github.com/nishanths/predeclared v0.2.2
 -	github.com/nunnatsa/ginkgolinter v0.17.0
 +	github.com/nunnatsa/ginkgolinter v0.18.0
 	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/polyfloyd/go-errorlint v1.6.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
Original file line number	Diff line number	Diff line change
`@@ -1180,6 +1180,11 @@`
`1180`	`1180`	"description": "Trigger a warning for variable assignments in ginkgo containers like `Describe`, `Context` and `When`, instead of in `BeforeEach()`.",
`1181`	`1181`	`"type": "boolean",`
`1182`	`1182`	`"default": false`
	`1183`	`+ },`
	`1184`	`+ "force-succeed": {`
	`1185`	`+ "description": "Force using the Succeed matcher for error functions, and the HaveOccurred matcher for non-function error values.",`
	`1186`	`+ "type": "boolean",`
	`1187`	`+ "default": false`
`1183`	`1188`	`}`
`1184`	`1189`	`}`
`1185`	`1190`	`},`
Original file line number	Diff line number	Diff line change
`@@ -488,6 +488,7 @@ type GinkgoLinterSettings struct {`
`488`	`488`	ForceExpectTo bool `mapstructure:"force-expect-to"`
`489`	`489`	ValidateAsyncIntervals bool `mapstructure:"validate-async-intervals"`
`490`	`490`	ForbidSpecPollution bool `mapstructure:"forbid-spec-pollution"`
	`491`	+ ForceSucceedForFuncs bool `mapstructure:"force-succeed"`
`491`	`492`	`}`
`492`	`493`
`493`	`494`	`type GoChecksumTypeSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ func New(settings config.GinkgoLinterSettings) goanalysis.Linter {`
`25`	`25`	`ForceExpectTo: types.Boolean(settings.ForceExpectTo),`
`26`	`26`	`ValidateAsyncIntervals: types.Boolean(settings.ValidateAsyncIntervals),`
`27`	`27`	`ForbidSpecPollution: types.Boolean(settings.ForbidSpecPollution),`
	`28`	`+ ForceSucceedForFuncs: types.Boolean(settings.ForceSucceedForFuncs),`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`