BUILD/MAJOR: go: upgrade to 1.25

Author: mjuraga

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 ---
 variables:
   DOCKER_HOST: tcp://docker:2375
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
   DOCKER_VERSION: "26.0"
 stages:
   - bots
@@ -66,10 +66,17 @@ generate:
   tags:
     - go
   before_script:
-    - rm -rf models/*
+    - find models -maxdepth 1 -type f -name "*.go" -exec rm {} \;
     - make models
   script:
-    - test -z "$(git diff 2> /dev/null)" || exit "Models are not generated, issue \`make models\` and commit the result"
+    - |
+      # Check for unstaged changes
+      if ! git diff --quiet 2>/dev/null; then
+          echo "Diff output:"
+          git diff
+          echo "Models are not generated. Please run \`make models\` and commit the result."
+          exit 1
+      fi
     - test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" || exit "Models generation created untracked files, cannot proceed"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -197,34 +204,6 @@ test-equal:
     - docker image tag $CI_REGISTRY_GO/haproxy-alpine:$HAPROXY_VERSION haproxytech/haproxy-alpine:$HAPROXY_VERSION
   script:
     - DOCKER_HAPROXY_VERSION=$HAPROXY_VERSION make e2e-docker
-HAProxy-2.2:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "2.2"
-HAProxy-2.4:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "2.4"
-HAProxy-2.6:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "2.6"
-HAProxy-2.8:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "2.8"
-HAProxy-2.9:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "2.9"
-HAProxy-3.0:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "3.0"
-HAProxy-3.1:
-  extends: .e2e
-  variables:
-    HAPROXY_VERSION: "3.1"
 HAProxy-3.2:
   extends: .e2e
   variables:

.golangci.yml

@@ -1,51 +1,66 @@
----
-linters-settings:
-  golint:
-    min-confidence: 0
-  gocyclo:
-    min-complexity: 42
-  cyclop:
-    max-complexity: 42
-  maligned:
-    suggest-new: true
-  dupl:
-    threshold: 200
-  goconst:
-    min-len: 2
-    min-occurrences: 3
-  gci:
-    prefix: github.com/haproxytech/client-native/v6
-
+version: "2"
 linters:
-  enable-all: true
+  settings:
+    cyclop:
+      max-complexity: 42
+    gocyclo:
+      min-complexity: 42
+  default: all
   disable:
-    - mnd
+    - depguard
+    - dupword
+    - dupl
     - err113
-    - wsl
-    - wrapcheck
-    - godot
-    - varnamelen
-    - nlreturn
-    - ireturn
-    - interfacebloat
-    - forcetypeassert
     - exhaustruct
-    - dupword
-    - nestif
-    - lll
-    - depguard
+    - forcetypeassert
+    - funcorder
     - funlen
-    - gci
     - goconst
+    - godoclint
+    - godot
+    - interfacebloat
+    - ireturn
+    - lll
+    - mnd
+    - nestif
+    - nlreturn
+    - noinlineerr
     - recvcheck
-    - tenv  # deprecated
-
-issues:
-  exclude-files:
-    - ".*_test\\.go$"
-  exclude-dirs:
-    - test
-  exclude:
-    - "unused-parameter: parameter 'comment' seems to be unused"
-    - "unused-parameter: parameter 'parts' seems to be unused"
-    - "unused-parameter: parameter 'parserType' seems to be unused"
+    - revive
+    - varnamelen
+    - wrapcheck
+    - wsl
+    - wsl_v5
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: 'unused-parameter: parameter ''comment'' seems to be unused'
+      - path: (.+)\.go$
+        text: 'unused-parameter: parameter ''parts'' seems to be unused'
+      - path: (.+)\.go$
+        text: 'unused-parameter: parameter ''parserType'' seems to be unused'
+    paths:
+      - .*_test\.go$
+      - test
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - .*_test\.go$
+      - test
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -2,8 +2,8 @@ PROJECT_PATH=${PWD}
 DOCKER_HAPROXY_VERSION?=3.2
 SWAGGER_VERSION=v0.32.3
 GO_VERSION:=${shell go mod edit -json | jq -r .Go}
-GOLANGCI_LINT_VERSION=1.64.5
-CHECK_COMMIT=5.1.1
+GOLANGCI_LINT_VERSION=2.8.0
+CHECK_COMMIT=5.2.0
 
 .PHONY: test
 test: