BUILD/MEDIUM: update linters, use local version

Author: oktalz

.github/workflows/actions.yml

@@ -51,13 +51,39 @@ jobs:
         run: go mod tidy
       - name: changes
         run: test -z "$(git diff 2> /dev/null)" || exit "Go modules not tidied, issue \`go mod tidy\` and commit the result"
+  gofumpt:
+    name: gofumpt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+      - 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: tidy
+        run: make gofumpt
+      - name: changes
+        run: test -z "$(git diff 2> /dev/null)" || exit "Go code not formatted, issue \`make gofumpt\` and commit the result"
   lint:
     name: golangci-lint
     needs: ["generate", "tidy"]
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
       - uses: actions/cache@v2
         with:
           path: |
@@ -66,10 +92,9 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - name: golangci-lint
-        uses: docker://ghcr.io/haproxytech/go-linter:1.50.0
-        with:
-          args: --timeout 5m
+      - name: Lint
+        run: |
+          make lint
   build:
     name: build
     runs-on: ubuntu-latest

.gitignore

@@ -3,3 +3,4 @@
 kubernetes-ingress
 dist/
 .code-generator/
+bin/golangci-lint

.gitlab-ci.yml

@@ -45,19 +45,33 @@ tidy:
   script:
     - go mod tidy
     - test -z "$(git diff 2> /dev/null)" || exit 'Go modules not tidied, issue \`go mod tidy\` and commit the result'
+gofumpt:
+  stage: lint
+  needs: []
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+  image:
+    name: $CI_REGISTRY_GO/golang:1.19
+    entrypoint: [""]
+  tags:
+    - go
+  script:
+    - make gofumpt
+    - test -z "$(git diff 2> /dev/null)" || exit 'Go code not formatted, issue \`make gofumpt\` and commit the result'
 golangci_lint:
   stage: lint
   needs: []
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push'
   image:
-    name: $CI_REGISTRY_GO/lint:1.50.0
+    name: $CI_REGISTRY_GO/golang:1.19
     entrypoint: [""]
   tags:
     - go
   script:
-    - golangci-lint run --enable-all --timeout=10m
+    - make lint
 lint-commit-msg:
   stage: lint
   needs: []
@@ -192,7 +206,6 @@ docker-build-sch:
   parallel:
     matrix:
       - TEST_PART: [ "18#e2e_parallel", "18#e2e_https", "1#e2e_sequential" ]
-        VAR_DUMMY: "YES"
   script:
     - CI_ENV=gitlab deploy/tests/create.sh
     - kubectl get pods -A

.golangci.yml

@@ -14,7 +14,6 @@ linters-settings:
     - name: var-naming
       severity: warning
       disabled: true
-
 linters:
   enable-all: true
   disable:
@@ -29,7 +28,6 @@ linters:
     - gocyclo
     - godot
     - goerr113
-    - gofumpt
     - gomnd
     - lll
     - nestif
@@ -39,9 +37,19 @@ linters:
     - nakedret
     - paralleltest
     - testpackage
-    - nonamedreturns
-    - nosnakecase
     - varnamelen
-    - staticcheck
+    - nosnakecase
     - exhaustruct
+    - nonamedreturns
     - forcetypeassert
+    - golint #deprecated
+    - varcheck #deprecated
+    - ifshort #deprecated
+    - structcheck #deprecated
+    - maligned #deprecated
+    - scopelint #deprecated
+    - interfacer #deprecated
+    - deadcode #deprecated
+    - rowserrcheck #rowserrcheck is disabled because of generics
+    - sqlclosecheck #rowserrcheck is disabled because of generics
+    - wastedassign #rowserrcheck is disabled because of generics

Makefile

@@ -1,5 +1,6 @@
 PROJECT_PATH=${PWD}
 TARGETPLATFORM?=linux/amd64
+GOLANGCI_LINT_VERSION=1.50.1
 
 .PHONY: test
 test:
@@ -21,8 +22,12 @@ doc:
 
 .PHONY: lint
 lint:
+	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
+
+.PHONY: yaml-lint
+yaml-lint:
 	docker run --rm -v $(pwd):/data cytopia/yamllint .
-	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: example
 example:
@@ -49,3 +54,8 @@ cr_generate:
 	crs/code-generator.sh
 	grep -lir defaultses crs/* | xargs sed -i 's/Defaultses/Defaults/g'
 	grep -lir defaultses crs/* | xargs sed -i 's/defaultses/defaults/g'
+
+.PHONY: gofumpt
+gofumpt:
+	go install mvdan.cc/gofumpt@latest
+	gofumpt -l -w .

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