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@v4
         with:
-          go-version: '1.20'
+          go-version-file: 'go.mod'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

.github/workflows/build.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.20
+    - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20'
+        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@v3
     - name: Downloading required packages
       run: sudo apt-get install bats
-    - name: Set up Go 1.20
+    - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20'
+        go-version-file: 'go.mod'
     - run: make e2e
       env:
         HAPROXY_VERSION: ${{ matrix.haproxy_version }}

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version-file: 'go.mod'
       - uses: actions/cache@v3
         with:
           path: |
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version-file: 'go.mod'
       - uses: actions/cache@v3
         with:
           path: |

.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.20
+    name: $CI_REGISTRY_GO/docker:stable-go$GO_VERSION
     entrypoint: [ "" ]
   services:
     - name: $CI_REGISTRY_GO/docker:20.10.5-dind
@@ -33,7 +34,7 @@ golangci-lint:
     paths:
       - build
   image:
-    name: $CI_REGISTRY_GO/golang:1.20
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
@@ -48,7 +49,7 @@ gofumpt:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push'
   image:
-    name: $CI_REGISTRY_GO/golang:1.20
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [""]
   tags:
     - go
@@ -73,7 +74,7 @@ build:
     paths:
       - build
   image:
-    name: $CI_REGISTRY_GO/golang:1.20
+    name: $CI_REGISTRY_GO/golang:$GO_VERSION
     entrypoint: [ "" ]
   tags:
     - go

.golangci.yml

@@ -71,9 +71,16 @@ linters:
     - 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,7 +9,7 @@ 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.51.1
+GOLANGCI_LINT_VERSION=1.54.2
 
 all: update clean build
 

README.md

@@ -9,7 +9,7 @@
 
 ## Building the Data Plane API
 
-In order to build the Data Plane API you need go 1.20 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
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/haproxytech/dataplaneapi
 
-go 1.20
+go 1.21
 
 require (
 	github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5

go.sum

@@ -160,6 +160,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=