chore(lint): upadate linting

* updated linter config
* relinter code

Signed-off-by: Frédéric BIDON <[email protected]>

Author: fredbi

.github/dependabot.yaml

@@ -37,7 +37,7 @@ updates:
         patterns:
           - "github.com/stretchr/testify"
 
-      golang.org-dependencies:
+      golang-org-dependencies:
         patterns:
           - "golang.org/*"
 

.github/workflows/auto-merge.yml

@@ -35,7 +35,7 @@ jobs:
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Auto-merge dependabot PRs for golang.org updates
-        if: contains(steps.metadata.outputs.dependency-group, 'golang.org-dependencies')
+        if: contains(steps.metadata.outputs.dependency-group, 'golang-org-dependencies')
         run: gh pr merge --auto --rebase "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}

.golangci.yml

@@ -14,15 +14,19 @@ linters:
     - gocognit
     - godot
     - godox
+    - gomoddirectives
     - gosmopolitan
     - inamedparam
+    - intrange # disabled while < go1.22
     - ireturn
     - lll
     - musttag
     - nestif
     - nlreturn
     - nonamedreturns
+    - noinlineerr
     - paralleltest
+    - recvcheck
     - testpackage
     - thelper
     - tparallel
@@ -31,6 +35,7 @@ linters:
     - whitespace
     - wrapcheck
     - wsl
+    - wsl_v5
   settings:
     dupl:
       threshold: 200
@@ -60,3 +65,12 @@ formatters:
       - third_party$
       - builtin$
       - examples$
+issues:
+  # Maximum issues count per one linter.
+  # Set to 0 to disable.
+  # Default: 50
+  max-issues-per-linter: 0
+  # Maximum count of issues with the same text.
+  # Set to 0 to disable.
+  # Default: 3
+  max-same-issues: 0

default_validator.go

@@ -29,6 +29,18 @@ type defaultValidator struct {
 	schemaOptions  *SchemaValidatorOptions
 }
 
+// Validate validates the default values declared in the swagger spec
+func (d *defaultValidator) Validate() *Result {
+	errs := pools.poolOfResults.BorrowResult() // will redeem when merged
+
+	if d == nil || d.SpecValidator == nil {
+		return errs
+	}
+	d.resetVisited()
+	errs.Merge(d.validateDefaultValueValidAgainstSchema()) // error -
+	return errs
+}
+
 // resetVisited resets the internal state of visited schemas
 func (d *defaultValidator) resetVisited() {
 	if d.visitedSchemas == nil {
@@ -82,18 +94,6 @@ func (d *defaultValidator) isVisited(path string) bool {
 	return isVisited(path, d.visitedSchemas)
 }
 
-// Validate validates the default values declared in the swagger spec
-func (d *defaultValidator) Validate() *Result {
-	errs := pools.poolOfResults.BorrowResult() // will redeem when merged
-
-	if d == nil || d.SpecValidator == nil {
-		return errs
-	}
-	d.resetVisited()
-	errs.Merge(d.validateDefaultValueValidAgainstSchema()) // error -
-	return errs
-}
-
 func (d *defaultValidator) validateDefaultValueValidAgainstSchema() *Result {
 	// every default value that is specified must validate against the schema for that property
 	// headers, items, parameters, schema
@@ -285,7 +285,7 @@ func (d *defaultValidator) validateDefaultValueSchemaAgainstSchema(path, in stri
 
 // TODO: Temporary duplicated code. Need to refactor with examples
 
-func (d *defaultValidator) validateDefaultValueItemsAgainstSchema(path, in string, root interface{}, items *spec.Items) *Result {
+func (d *defaultValidator) validateDefaultValueItemsAgainstSchema(path, in string, root any, items *spec.Items) *Result {
 	res := pools.poolOfResults.BorrowResult()
 	s := d.SpecValidator
 	if items != nil {

example_validator.go

@@ -27,6 +27,25 @@ type exampleValidator struct {
 	schemaOptions  *SchemaValidatorOptions
 }
 
+// Validate validates the example values declared in the swagger spec
+// Example values MUST conform to their schema.
+//
+// With Swagger 2.0, examples are supported in:
+//   - schemas
+//   - individual property
+//   - responses
+func (ex *exampleValidator) Validate() *Result {
+	errs := pools.poolOfResults.BorrowResult()
+
+	if ex == nil || ex.SpecValidator == nil {
+		return errs
+	}
+	ex.resetVisited()
+	errs.Merge(ex.validateExampleValueValidAgainstSchema()) // error -
+
+	return errs
+}
+
 // resetVisited resets the internal state of visited schemas
 func (ex *exampleValidator) resetVisited() {
 	if ex.visitedSchemas == nil {
@@ -51,25 +70,6 @@ func (ex *exampleValidator) isVisited(path string) bool {
 	return isVisited(path, ex.visitedSchemas)
 }
 
-// Validate validates the example values declared in the swagger spec
-// Example values MUST conform to their schema.
-//
-// With Swagger 2.0, examples are supported in:
-//   - schemas
-//   - individual property
-//   - responses
-func (ex *exampleValidator) Validate() *Result {
-	errs := pools.poolOfResults.BorrowResult()
-
-	if ex == nil || ex.SpecValidator == nil {
-		return errs
-	}
-	ex.resetVisited()
-	errs.Merge(ex.validateExampleValueValidAgainstSchema()) // error -
-
-	return errs
-}
-
 func (ex *exampleValidator) validateExampleValueValidAgainstSchema() *Result {
 	// every example value that is specified must validate against the schema for that property
 	// in: schemas, properties, object, items
@@ -278,7 +278,7 @@ func (ex *exampleValidator) validateExampleValueSchemaAgainstSchema(path, in str
 // TODO: Temporary duplicated code. Need to refactor with examples
 //
 
-func (ex *exampleValidator) validateExampleValueItemsAgainstSchema(path, in string, root interface{}, items *spec.Items) *Result {
+func (ex *exampleValidator) validateExampleValueItemsAgainstSchema(path, in string, root any, items *spec.Items) *Result {
 	res := pools.poolOfResults.BorrowResult()
 	s := ex.SpecValidator
 	if items != nil {

helpers.go

@@ -273,7 +273,7 @@ func (h *paramHelper) checkExpandedParam(pr *spec.Parameter, path, in, operation
 	simpleZero := spec.SimpleSchema{}
 	// Try to explain why... best guess
 	switch {
-	case pr.In == swaggerBody && (pr.SimpleSchema != simpleZero && pr.SimpleSchema.Type != objectType):
+	case pr.In == swaggerBody && (pr.SimpleSchema != simpleZero && pr.Type != objectType):
 		if isRef {
 			// Most likely, a $ref with a sibling is an unwanted situation: in itself this is a warning...
 			// but we detect it because of the following error: