From 71f70870976cf304cdb3942a871c15a20f5d35c5 Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <mmorel-35@users.noreply.github.com>
Date: Tue, 21 Sep 2021 09:22:21 +0200
Subject: [PATCH] golangci(lint) : more linters (#2870)

---
 .github/workflows/gin.yml |  1 +
 .golangci.yml             | 13 +++++++++++++
 binding/form.go           |  3 ++-
 context.go                |  5 +++--
 context_test.go           |  3 +--
 recovery.go               |  4 +++-
 render/render_test.go     |  3 +--
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/gin.yml b/.github/workflows/gin.yml
index 6eb5a64d..15c2530a 100644
--- a/.github/workflows/gin.yml
+++ b/.github/workflows/gin.yml
@@ -24,6 +24,7 @@ jobs:
           version: v1.42.1
           args: --verbose
   test:
+    needs: lint
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
diff --git a/.golangci.yml b/.golangci.yml
index 78a4259a..ba5f4d1e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,9 +2,22 @@ run:
   timeout: 5m
 linters:
   enable:
+  - asciicheck
+  - depguard
+  - dogsled
+  - durationcheck
+  - errcheck
+  - errorlint
+  - exportloopref
+  - gci 
   - gofmt
+  - goimports
   - misspell
+  - nakedret
+  - nilerr
+  - nolintlint
   - revive
+  - wastedassign
 issues:
   exclude-rules:
   - linters:
diff --git a/binding/form.go b/binding/form.go
index 040af9e2..fa2a6540 100644
--- a/binding/form.go
+++ b/binding/form.go
@@ -5,6 +5,7 @@
 package binding
 
 import (
+	"errors"
 	"net/http"
 )
 
@@ -22,7 +23,7 @@ func (formBinding) Bind(req *http.Request, obj interface{}) error {
 	if err := req.ParseForm(); err != nil {
 		return err
 	}
-	if err := req.ParseMultipartForm(defaultMemory); err != nil && err != http.ErrNotMultipart {
+	if err := req.ParseMultipartForm(defaultMemory); err != nil && !errors.Is(err, http.ErrNotMultipart) {
 		return err
 	}
 	if err := mapForm(obj, req.Form); err != nil {
diff --git a/context.go b/context.go
index 62849488..8a2f46d1 100644
--- a/context.go
+++ b/context.go
@@ -220,7 +220,8 @@ func (c *Context) Error(err error) *Error {
 		panic("err is nil")
 	}
 
-	parsedError, ok := err.(*Error)
+	var parsedError *Error
+	ok := errors.As(err, &parsedError)
 	if !ok {
 		parsedError = &Error{
 			Err:  err,
@@ -515,7 +516,7 @@ func (c *Context) initFormCache() {
 		c.formCache = make(url.Values)
 		req := c.Request
 		if err := req.ParseMultipartForm(c.engine.MaxMultipartMemory); err != nil {
-			if err != http.ErrNotMultipart {
+			if !errors.Is(err, http.ErrNotMultipart) {
 				debugPrint("error on parse multipart form array: %v", err)
 			}
 		}
diff --git a/context_test.go b/context_test.go
index f9792e32..ad16fbb1 100644
--- a/context_test.go
+++ b/context_test.go
@@ -23,10 +23,9 @@ import (
 
 	"github.com/gin-contrib/sse"
 	"github.com/gin-gonic/gin/binding"
+	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
-
-	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 )
 
 var _ context.Context = &Context{}
diff --git a/recovery.go b/recovery.go
index 3101fe28..39f13551 100644
--- a/recovery.go
+++ b/recovery.go
@@ -6,6 +6,7 @@ package gin
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -60,7 +61,8 @@ func CustomRecoveryWithWriter(out io.Writer, handle RecoveryFunc) HandlerFunc {
 				// condition that warrants a panic stack trace.
 				var brokenPipe bool
 				if ne, ok := err.(*net.OpError); ok {
-					if se, ok := ne.Err.(*os.SyscallError); ok {
+					var se *os.SyscallError
+					if errors.As(ne, &se) {
 						if strings.Contains(strings.ToLower(se.Error()), "broken pipe") || strings.Contains(strings.ToLower(se.Error()), "connection reset by peer") {
 							brokenPipe = true
 						}
diff --git a/render/render_test.go b/render/render_test.go
index 22e7d5ab..e417731a 100644
--- a/render/render_test.go
+++ b/render/render_test.go
@@ -14,10 +14,9 @@ import (
 	"strings"
 	"testing"
 
+	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
-
-	testdata "github.com/gin-gonic/gin/testdata/protoexample"
 )
 
 // TODO unit tests