Relint

* updated linter config
* fixed linting issues

Signed-off-by: Frederic BIDON <[email protected]>

Author: fredbi

.golangci.yml

@@ -1,12 +1,6 @@
 linters-settings:
-  govet:
-    check-shadowing: true
-  golint:
-    min-confidence: 0
   gocyclo:
     min-complexity: 45
-  maligned:
-    suggest-new: true
   dupl:
     threshold: 200
   goconst:
@@ -16,7 +10,7 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - maligned
+    - recvcheck
     - unparam
     - lll
     - gochecknoinits
@@ -29,17 +23,13 @@ linters:
     - wrapcheck
     - testpackage
     - nlreturn
-    - gomnd
-    - exhaustivestruct
-    - goerr113
     - errorlint
     - nestif
     - godot
     - gofumpt
     - paralleltest
     - tparallel
     - thelper
-    - ifshort
     - exhaustruct
     - varnamelen
     - gci
@@ -52,10 +42,15 @@ linters:
     - forcetypeassert
     - cyclop
     # deprecated linters
-    - deadcode
-    - interfacer
-    - scopelint
-    - varcheck
-    - structcheck
-    - golint
-    - nosnakecase
+    #- deadcode
+    #- interfacer
+    #- scopelint
+    #- varcheck
+    #- structcheck
+    #- golint
+    #- nosnakecase
+    #- maligned
+    #- goerr113
+    #- ifshort
+    #- gomnd
+    #- exhaustivestruct

debug_test.go

@@ -31,7 +31,10 @@ func TestDebug(t *testing.T) {
 		skipNotify(t)
 		t.SkipNow()
 	}
-	tmpFile, _ := os.CreateTemp("", "debug-test")
+
+	// standard lib t.TempDir() is still subject to an issue https://github.com/golang/go/issues/71544
+	// Hence: usetesting linter disabled
+	tmpFile, _ := os.CreateTemp("", "debug-test") //nolint:usetesting
 	tmpName := tmpFile.Name()
 	defer func() {
 		Debug = false

default_validator.go

@@ -54,7 +54,8 @@ func isVisited(path string, visitedSchemas map[string]struct{}) bool {
 		parent string
 		suffix string
 	)
-	for i := len(path) - 2; i >= 0; i-- {
+	const backtrackFromEnd = 2
+	for i := len(path) - backtrackFromEnd; i >= 0; i-- {
 		r := path[i]
 		if r != '.' {
 			continue

helpers.go

@@ -169,7 +169,7 @@ func (h *valueHelper) asInt64(val interface{}) int64 {
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 		return v.Int()
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return int64(v.Uint())
+		return int64(v.Uint()) //nolint:gosec
 	case reflect.Float32, reflect.Float64:
 		return int64(v.Float())
 	default:
@@ -184,7 +184,7 @@ func (h *valueHelper) asUint64(val interface{}) uint64 {
 	v := reflect.ValueOf(val)
 	switch v.Kind() { //nolint:exhaustive
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return uint64(v.Int())
+		return uint64(v.Int()) //nolint:gosec
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
 		return v.Uint()
 	case reflect.Float32, reflect.Float64:

helpers_test.go

@@ -22,14 +22,17 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var errMyError = errors.New("my error")
+
 func TestHelpers_addPointerError(t *testing.T) {
 	res := new(Result)
-	r := errorHelp.addPointerError(res, errors.New("my error"), "my ref", "path")
+	r := errorHelp.addPointerError(res, errMyError, "my ref", "path")
 	require.NotEmpty(t, r.Errors)
 	msg := r.Errors[0].Error()
 	assert.Contains(t, msg, "could not resolve reference in path to $ref my ref: my error")
 }
 
+//nolint:gosec
 func integerFactory(base int) []interface{} {
 	return []interface{}{
 		base,

messages_test.go

@@ -307,7 +307,7 @@ func reportTest(t *testing.T, path string, res *Result, expectedMessages []Expec
 	if len(lines) > 0 {
 		sort.Strings(lines)
 		for _, line := range lines {
-			t.Logf(line)
+			t.Log(line)
 		}
 	}
 }

post/defaulter_test.go

@@ -16,7 +16,6 @@ package post
 
 import (
 	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -39,7 +38,7 @@ func TestDefaulter(t *testing.T) {
 	t.Logf("Before: %v", x)
 
 	r := validator.Validate(x)
-	assert.False(t, r.HasErrors(), fmt.Sprintf("unexpected validation error: %v", r.AsError()))
+	assert.Falsef(t, r.HasErrors(), "unexpected validation error: %v", r.AsError())
 
 	ApplyDefaults(r)
 	t.Logf("After: %v", x)
@@ -79,7 +78,7 @@ func TestDefaulterSimple(t *testing.T) {
 	x := map[string]interface{}{}
 	t.Logf("Before: %v", x)
 	r := validator.Validate(x)
-	assert.False(t, r.HasErrors(), fmt.Sprintf("unexpected validation error: %v", r.AsError()))
+	assert.Falsef(t, r.HasErrors(), "unexpected validation error: %v", r.AsError())
 
 	ApplyDefaults(r)
 	t.Logf("After: %v", x)
@@ -102,7 +101,7 @@ func BenchmarkDefaulting(b *testing.B) {
 		validator := validate.NewSchemaValidator(schema, nil, "", strfmt.Default)
 		x := defaulterFixtureInput()
 		r := validator.Validate(x)
-		assert.False(b, r.HasErrors(), fmt.Sprintf("unexpected validation error: %v", r.AsError()))
+		assert.Falsef(b, r.HasErrors(), "unexpected validation error: %v", r.AsError())
 		ApplyDefaults(r)
 	}
 }

post/prune_test.go

@@ -16,7 +16,6 @@ package post
 
 import (
 	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -76,7 +75,7 @@ func TestPrune(t *testing.T) {
 
 	validator := validate.NewSchemaValidator(schema, nil, "", strfmt.Default)
 	r := validator.Validate(x)
-	assert.False(t, r.HasErrors(), fmt.Sprintf("unexpected validation error: %v", r.AsError()))
+	assert.Falsef(t, r.HasErrors(), "unexpected validation error: %v", r.AsError())
 
 	Prune(r)
 	t.Logf("After: %v", x)

result.go

@@ -371,6 +371,14 @@ func (r *Result) AddWarnings(warnings ...error) {
 	}
 }
 
+func isImportant(err error) bool {
+	return strings.HasPrefix(err.Error(), "IMPORTANT!")
+}
+
+func stripImportantTag(err error) error {
+	return stderrors.New(strings.TrimPrefix(err.Error(), "IMPORTANT!")) //nolint:err113
+}
+
 func (r *Result) keepRelevantErrors() *Result {
 	// TODO: this one is going to disapear...
 	// keepRelevantErrors strips a result from standard errors and keeps
@@ -386,14 +394,14 @@ func (r *Result) keepRelevantErrors() *Result {
 	// placeholders.
 	strippedErrors := []error{}
 	for _, e := range r.Errors {
-		if strings.HasPrefix(e.Error(), "IMPORTANT!") {
-			strippedErrors = append(strippedErrors, stderrors.New(strings.TrimPrefix(e.Error(), "IMPORTANT!")))
+		if isImportant(e) {
+			strippedErrors = append(strippedErrors, stripImportantTag(e))
 		}
 	}
 	strippedWarnings := []error{}
 	for _, e := range r.Warnings {
-		if strings.HasPrefix(e.Error(), "IMPORTANT!") {
-			strippedWarnings = append(strippedWarnings, stderrors.New(strings.TrimPrefix(e.Error(), "IMPORTANT!")))
+		if isImportant(e) {
+			strippedWarnings = append(strippedWarnings, stripImportantTag(e))
 		}
 	}
 	var strippedResult *Result