BUILD/MEDIUM: ci: add local linter, increase Go version to 1.20

Author: oktalz

.github/workflows/actions.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.20
       - name: Generating the files
         run: |
           make generate
@@ -33,8 +33,21 @@ jobs:
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: docker://ghcr.io/haproxytech/go-linter:1.50.0
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.20
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: Lint
+        run: |
+          make lint
   tidy:
     name: go mod tidy
     needs: ["generate"]
@@ -45,7 +58,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.20
       - name: tidy
         run: go mod tidy
       - name: changes
@@ -55,10 +68,10 @@ jobs:
     needs: ["lint","tidy"]
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Go 1.19
+    - name: Set up Go 1.20
       uses: actions/setup-go@v1
       with:
-        go-version: 1.19
+        go-version: 1.20
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2

.gitlab-ci.yml

@@ -1,11 +1,13 @@
+variables:
+ GO_VERSION: "1.20"
 stages:
   - diff
   - lint
   - test
 diff:
   stage: diff
   image:
-    name: $CI_REGISTRY_GO/golang:1.19
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
@@ -17,15 +19,15 @@ diff:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push'
-golangci_lint:
+lint:
   stage: lint
   image:
-    name: $CI_REGISTRY_GO/lint:1.50.0
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
   script:
-    - golangci-lint run --enable-all
+    - make lint
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push'
@@ -43,7 +45,7 @@ lint-commit-msg:
 tidy:
   stage: lint
   image:
-    name: $CI_REGISTRY_GO/golang:1.19
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
@@ -56,7 +58,7 @@ tidy:
 test:
   stage: test
   image:
-    name: $CI_REGISTRY_GO/golang:1.19
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go

.golangci.yml

@@ -16,9 +16,6 @@ linters-settings:
 linters:
   enable-all: true
   disable:
-    - golint # deprecated, replaced with revive
-    - interfacer # deprecated
-    - maligned # deprecated
     - wrapcheck
     - nlreturn
     - gomnd
@@ -38,13 +35,21 @@ linters:
     - goconst
     - exhaustruct
     - dupword
+    - interfacebloat
+    - gci
+
+    - ifshort # deprecated
+    - structcheck # deprecated
+    - deadcode # deprecated
+    - nosnakecase # deprecated
+    - varcheck # deprecated
+    - rowserrcheck # deprecated
+    - sqlclosecheck # deprecated
+    - wastedassign # deprecated
+    - golint # deprecated
+    - interfacer # deprecated
+    - maligned # deprecated
 
 run:
   skip-dirs:
     - test
-
-issues:
-  exclude-rules:
-    - linters:
-        - gosec
-      text: "G[501]"

Makefile

@@ -1,4 +1,5 @@
 PROJECT_PATH=${PWD}
+GOLANGCI_LINT_VERSION=1.51.0
 
 .PHONY: generate
 generate:
@@ -17,8 +18,5 @@ test:
 
 .PHONY: lint
 lint:
-	docker run --rm -v ${PROJECT_PATH}:/app -w /app ghcr.io/haproxytech/go-linter:1.50.0 -v --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0
-
-.PHONY: lint-local
-lint-local:
-	golangci-lint run
+	cd bin;GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION} sh lint-check.sh
+	bin/golangci-lint run --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0

bin/lint-check.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+V=$(./golangci-lint --version)
+
+case "$V" in
+  *$GOLANGCI_LINT_VERSION*) echo "$V" ;;
+  *)          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(pwd) "v$GOLANGCI_LINT_VERSION" ;;
+esac

parser-type.go

@@ -21,8 +21,7 @@ import (
 	"github.com/haproxytech/config-parser/v4/errors"
 )
 
-//nolint:golint,revive,interfacebloat
-type ParserInterface interface {
+type ParserInterface interface { //nolint:revive
 	Init()
 	Parse(line string, parts []string, comment string) (changeState string, err error)
 	PreParse(line string, parts []string, preComments []string, comment string) (changeState string, err error)

parser.go

@@ -59,7 +59,6 @@ const (
 
 var DefaultSectionName = "" //nolint:gochecknoglobals
 
-//nolint:interfacebloat
 type Parser interface {
 	LoadData(path string) error
 	Process(reader io.Reader) error

parsers/errorfile.go

@@ -26,7 +26,7 @@ import (
 
 // 200, 400, 401, 403, 404, 405, 407, 408, 410,
 // 413, 425, 429, 500, 501, 502, 503, and 504
-var errorFileAllowedCode = map[string]struct{}{
+var errorFileAllowedCode = map[string]struct{}{ //nolint:gochecknoglobals
 	"200": {},
 	"400": {},
 	"401": {},

spoe/types/types.go

@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:godot
 package types
 
 //name:spoe-section

writer.go

@@ -17,7 +17,8 @@ limitations under the License.
 package parser
 
 import (
-	"crypto/md5"
+	//nolint:gosec
+	"crypto/md5" // G501: Blocklisted import crypto/md5: weak cryptographic primitive
 	"fmt"
 	"io"
 	"strings"