BUILD/MINOR: bump go version to 1.21

- update golanci-lint as required.
- update gitlab and github CI files to only declare the Go version in 2
  places: go.mod and .gitlab-ci.yml

Author: oliwer

.github/workflows/.goreleaser.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version-file: 'go.mod'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

.github/workflows/build.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.19
-      uses: actions/setup-go@v1
+    - name: Set up Go
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.19
+        go-version-file: 'go.mod'
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/e2e.yml

@@ -15,10 +15,10 @@ jobs:
       uses: actions/checkout@v2
     - name: Downloading required packages
       run: sudo apt-get install bats
-    - name: Set up Go 1.19
-      uses: actions/setup-go@v1
+    - name: Set up Go
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.19
+        go-version-file: 'go.mod'
     - run: make e2e
       env:
         HAPROXY_VERSION: ${{ matrix.haproxy_version }}

.github/workflows/lint.yml

@@ -4,6 +4,28 @@ on:
     branches:
       - master
 jobs:
+  gofumpt:
+    name: gofumpt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
+      - uses: actions/cache@v3
+        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"
   golangci-lint:
     name: runner / golangci-lint
     runs-on: ubuntu-latest
@@ -13,4 +35,15 @@ jobs:
       - name: golangci-lint
         uses: reviewdog/action-golangci-lint@v1
         with:
-          github_token: ${{ secrets.github_token }}
+          go-version-file: 'go.mod'
+      - uses: actions/cache@v3
+        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

.gitlab-ci.yml

@@ -6,11 +6,12 @@ variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-alpine
   BATS_VERSION: v1.4.1
+  GO_VERSION: '1.21'
 
 diff:
   stage: lint
   image:
-    name: $CI_REGISTRY_GO/docker:stable-go1.19
+    name: $CI_REGISTRY_GO/docker:stable-go$GO_VERSION
     entrypoint: [ "" ]
   services:
     - name: $CI_REGISTRY_GO/docker:20.10.5-dind
@@ -34,16 +35,28 @@ golangci-lint:
     paths:
       - build
   image:
-    name: $CI_REGISTRY_GO/lint:1.46.2
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
   script:
-    - golangci-lint cache clean && go clean -modcache -cache -i
-    - golangci-lint run --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0
-  only:
-    - merge_requests
-    - branches
+    - make lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+gofumpt:
+  stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+  image:
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
+    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'
 lint-commit-msg:
   stage: lint
   image:
@@ -62,7 +75,7 @@ build:
     paths:
       - build
   image:
-    name: $CI_REGISTRY_GO/golang:1.19
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [ "" ]
   tags:
     - go

.golangci.yml

@@ -12,21 +12,72 @@ linters-settings:
   goconst:
     min-len: 2
     min-occurrences: 2
-
+  revive:
+    rules:
+    - name: var-naming
+      severity: warning
+      disabled: true
 linters:
-  enable:
-    - golint
-    - gocritic
-    - stylecheck
-    - goimports
-    - gosec
-    - unconvert
+  enable-all: true
   disable:
-    - maligned
-    - prealloc
+    - dupl
+    - exhaustive
+    - exhaustivestruct
+    - funlen
+    - gci
     - gochecknoglobals
+    - gocognit
+    - goconst
+    - gocyclo
+    - godot
+    - goerr113
+    - gomnd
+    - lll
+    - nestif
+    - nlreturn
+    - wrapcheck
+    - wsl
+    - nakedret
+    - paralleltest
+    - testpackage
+    - varnamelen
+    - 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
+    - ireturn
+    - tagliatelle
+    - noctx
+    - errorlint
+    - contextcheck
+    - godox
+    - containedctx
+    - unused
+    - unparam
+    - prealloc
+    - forbidigo
+    - errcheck
+    - gocritic
+    - tagalign
+    - depguard
 
 issues:
+  exclude:
+    # bugs of typecheck linter
+    - "undeclared name: `shellquote`"
+    - "github.com/kballard/go-shellquote\" imported but not used"
+    - "github.com/haproxytech/config-parser/v5/types\" imported but not used"
   exclude-rules:
     - linters:
         - staticcheck

Makefile

@@ -9,12 +9,23 @@ GIT_MODIFIED=${GIT_MODIFIED1}${GIT_MODIFIED2}
 SWAGGER_VERSION=${shell curl -s https://raw.githubusercontent.com/haproxytech/client-native/master/Makefile | grep SWAGGER_VERSION -m 1 | awk -F"=" '{print $$2}'}
 BUILD_DATE=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 CGO_ENABLED?=0
+GOLANGCI_LINT_VERSION=1.54.2
 
 all: update clean build
 
 update:
 	go mod tidy
 
+.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: gofumpt
+gofumpt:
+	go install mvdan.cc/gofumpt@latest
+	gofumpt -l -w .
+
 clean:
 	rm -rf ${DATAPLANEAPI_PATH}/build
 

README.md

@@ -9,7 +9,7 @@
 
 ## Building the Data Plane API
 
-In order to build the Data Plane API you need go 1.19 installed on your system with go modules support enabled, and execute the following steps:
+In order to build the Data Plane API you need Go installed on your system with go modules support enabled, and execute the following steps:
 
 1\. Clone dataplaneapi repository
 

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

configuration/converter/converter.go

@@ -4,14 +4,13 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
 package main
 
 import (