BUILD/MEDIUM: golang: upgrade go to 1.25 and linter to 2.8.0

Author: mjuraga

.gitlab-ci.yml

@@ -9,7 +9,7 @@ variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-debian
   BATS_VERSION: v1.10.0
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
   DOCKER_VERSION: "26.0"
 
 pipelines-check:

.golangci.yml

@@ -1,84 +1,104 @@
-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: 2
-  revive:
-    rules:
-      - name: var-naming
-        severity: warning
-        disabled: true
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
+    - containedctx
+    - contextcheck
+    - depguard
     - dupl
+    - err113
+    - errcheck
+    - errorlint
     - exhaustive
+    - exhaustruct
+    - forbidigo
+    - forcetypeassert
+    - funcorder
     - funlen
-    - gci
     - gochecknoglobals
     - gocognit
     - goconst
+    - gocritic
     - gocyclo
+    - godoclint
     - godot
+    - godox
+    - ireturn
     - lll
+    - mnd
+    - nakedret
     - nestif
     - nlreturn
-    - wrapcheck
-    - wsl
-    - nakedret
-    - paralleltest
-    - testpackage
-    - varnamelen
-    - exhaustruct
-    - nonamedreturns
-    - forcetypeassert
-    - 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
+    - noinlineerr
+    - nonamedreturns
+    - paralleltest
     - prealloc
-    - forbidigo
-    - errcheck
-    - gocritic
-    - tagalign
-    - depguard
-    - mnd
-    - err113
-    - tenv # deprecated
     - recvcheck
-
-issues:
-  exclude:
-    # bugs of typecheck linter
-    - "undeclared name: `shellquote`"
-    - 'github.com/kballard/go-shellquote" imported but not used'
-    - 'github.com/haproxytech/client-native/v6/config-parser/types" imported but not used'
-  exclude-rules:
-    - linters:
-        - staticcheck
-      text: "duplicate struct tag"
-    - linters:
-        - gosec
-      text: "G[501]"
-    - linters:
-        - gosec
-      text: "G[404]"
-  exclude-dirs:
-    - test
+    - rowserrcheck
+    - sqlclosecheck
+    - tagalign
+    - tagliatelle
+    - testpackage
+    - unparam
+    - unused
+    - varnamelen
+    - wastedassign
+    - wrapcheck
+    - wsl
+    - wsl_v5
+  settings:
+    cyclop:
+      max-complexity: 42
+    dupl:
+      threshold: 200
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocyclo:
+      min-complexity: 42
+    revive:
+      rules:
+        - name: var-naming
+          severity: warning
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: duplicate struct tag
+      - linters:
+          - gosec
+        text: G[501]
+      - linters:
+          - gosec
+        text: G[404]
+      - path: (.+)\.go$
+        text: 'undeclared name: `shellquote`'
+      - path: (.+)\.go$
+        text: github.com/kballard/go-shellquote" imported but not used
+      - path: (.+)\.go$
+        text: github.com/haproxytech/client-native/v6/config-parser/types" imported but not used
+    paths:
+      - test
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - test
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -9,8 +9,8 @@ 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.64.5
-CHECK_COMMIT=5.0.4
+GOLANGCI_LINT_VERSION=2.8.0
+CHECK_COMMIT=5.4.0
 
 all: update clean build
 

adapters/adapters.go

@@ -85,7 +85,7 @@ func RecoverMiddleware(logger *log.Logger) func(h http.Handler) http.Handler {
 				if err := recover(); err != nil {
 					frames := callers()
 
-					fields := make(map[string]interface{})
+					fields := make(map[string]any)
 					fields["stack_trace"] = frames.String()
 					logger.WithFieldsf(fields, log.ErrorLevel, "Panic %v", err)
 

client-native/cn.go

@@ -44,10 +44,7 @@ func ConfigureConfigurationClient(haproxyOptions dataplaneapi_config.HAProxyConf
 
 	p := confClient.Parser()
 	comments, err := p.Get(parser.Comments, parser.CommentsSectionName, "#")
-	insertDisclaimer := false
-	if err != nil {
-		insertDisclaimer = true
-	}
+	insertDisclaimer := err != nil
 	data, ok := comments.([]types.Comments)
 	if !ok {
 		insertDisclaimer = true

cmd/dataplaneapi/main.go

@@ -227,7 +227,7 @@ func startServer(cfg *configuration.Configuration, cancelDebugServer context.Can
 	api.BasicAuthenticator = func(authentication security.UserPassAuthentication) runtime.Authenticator {
 		// if mTLS is enabled with backing Certificate Authority, skipping basic authentication
 		if len(server.TLSCACertificate) > 0 && server.TLSPort > 0 {
-			return runtime.AuthenticatorFunc(func(i interface{}) (bool, interface{}, error) {
+			return runtime.AuthenticatorFunc(func(i any) (bool, any, error) {
 				return true, "", nil
 			})
 		}

cmd/gitlab-mr-checker/main.go

@@ -90,7 +90,7 @@ type MergeRequest struct {
 
 var baseURL string
 
-const LABEL_COLOR = "#8fbc8f" //nolint:stylecheck
+const LABEL_COLOR = "#8fbc8f"
 
 func main() {
 	_ = godotenv.Overload()
@@ -143,34 +143,41 @@ func main() {
 
 	gitlabToken := os.Getenv("GITLAB_TOKEN")
 
-	CI_MERGE_REQUEST_IID_STR := os.Getenv("CI_MERGE_REQUEST_IID") //nolint:stylecheck
+	CI_MERGE_REQUEST_IID_STR := os.Getenv("CI_MERGE_REQUEST_IID")
 	if CI_MERGE_REQUEST_IID_STR == "" {
 		slog.Error("CI_MERGE_REQUEST_IID not set")
 		os.Exit(1)
 	}
-	CI_MERGE_REQUEST_IID, err := strconv.Atoi(CI_MERGE_REQUEST_IID_STR) //nolint:stylecheck
+	CI_MERGE_REQUEST_IID, err := strconv.Atoi(CI_MERGE_REQUEST_IID_STR)
 	if err != nil {
 		slog.Error(err.Error())
 		os.Exit(1)
 	}
 
-	CI_PROJECT_ID := os.Getenv("CI_PROJECT_ID") //nolint:stylecheck
+	CI_PROJECT_ID := os.Getenv("CI_PROJECT_ID")
 	if CI_PROJECT_ID == "" {
 		slog.Error("CI_PROJECT_ID not set")
 		os.Exit(1)
 	}
-	question := `<!-- MR BACKPORT QUESTION -->` + "\n" + "Does this needs backport ? \n| Version | label |\n|:--:|:--:|"
+	sb := strings.Builder{}
+	sb.WriteString(`<!-- MR BACKPORT QUESTION -->` + "\n" + "Does this needs backport ? \n| Version | label |\n|:--:|:--:|")
 	backportLabels := map[string]struct{}{
 		"backport-ee": {},
 	}
 	for _, version := range versions {
 		ver := strconv.Itoa(int(version.Major())) + "." + strconv.Itoa(int(version.Minor()))
-		question += "\n" + "| " + ver + " | " + "backport-" + ver + " |"
+		sb.WriteString("\n")
+		sb.WriteString("| ")
+		sb.WriteString(ver)
+		sb.WriteString(" | ")
+		sb.WriteString("backport-")
+		sb.WriteString(ver)
+		sb.WriteString(" |")
 		backportLabels["backport-"+ver] = struct{}{}
 	}
 	// ee
-	question += "\n" + "| EE | " + "backport-ee |"
-	question += "\n\n" + "please add labels for backporting."
+	sb.WriteString("\n" + "| EE | " + "backport-ee |")
+	sb.WriteString("\n\n" + "please add labels for backporting.")
 
 	mr, err := getMergeRequest(baseURL, gitlabToken, CI_PROJECT_ID, CI_MERGE_REQUEST_IID)
 	if err != nil {
@@ -199,13 +206,13 @@ func main() {
 			os.Exit(1)
 		}
 		slog.Info("No backport question found, creating one as thread")
-		startThreadOnMergeRequest(baseURL, gitlabToken, CI_PROJECT_ID, CI_MERGE_REQUEST_IID, question)
+		startThreadOnMergeRequest(baseURL, gitlabToken, CI_PROJECT_ID, CI_MERGE_REQUEST_IID, sb.String())
 	}
 }
 
 func startThreadOnMergeRequest(baseURL, token, projectID string, mergeRequestIID int, threadBody string) {
 	client := &http.Client{}
-	threadData := map[string]interface{}{
+	threadData := map[string]any{
 		"body": threadBody,
 	}
 	threadDataBytes, err := json.Marshal(threadData)

cmd/govulncheck-report/main.go

@@ -77,10 +77,7 @@ func main() {
 
 	vulnMessage := string(out)
 	fmt.Println(vulnMessage)
-	noVuln := false
-	if !strings.Contains(vulnMessage, "Vulnerability #") {
-		noVuln = true
-	}
+	noVuln := !strings.Contains(vulnMessage, "Vulnerability #")
 
 	if currentBranch == "" {
 		if strings.Contains(vulnMessage, "Vulnerability #") {
@@ -140,7 +137,7 @@ func main() {
 func createIssue(baseURL, token, projectID string, title, commentBody string) {
 	slog.Info("Active issue with title '" + title + "' not found in project " + projectID)
 	// Create the issue here
-	issueData := map[string]interface{}{
+	issueData := map[string]any{
 		"title":       title,
 		"description": commentBody,
 		"labels":      "bot,critical",
@@ -188,7 +185,7 @@ func closeTheIssue(baseURL, token, projectID string, issueIID int, commentBody s
 	addCommentToIssue(baseURL, token, projectID, issueIID, commentBody)
 
 	client := &http.Client{}
-	issueData := map[string]interface{}{
+	issueData := map[string]any{
 		"state_event": "close",
 	}
 	issueDataBytes, err := json.Marshal(issueData)
@@ -230,7 +227,7 @@ func closeTheIssue(baseURL, token, projectID string, issueIID int, commentBody s
 
 func addCommentToIssue(baseURL, token, projectID string, issueIID int, commentBody string) {
 	client := &http.Client{}
-	noteData := map[string]interface{}{
+	noteData := map[string]any{
 		"body": commentBody,
 	}
 	noteDataBytes, err := json.Marshal(noteData)

configuration/bool.go

@@ -42,7 +42,7 @@ func (s *AtomicBool) String() string {
 	return "false"
 }
 
-func (s *AtomicBool) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (s *AtomicBool) UnmarshalYAML(unmarshal func(any) error) error {
 	var buf bool
 	err := unmarshal(&buf)
 	if err != nil {
@@ -53,6 +53,6 @@ func (s *AtomicBool) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	return nil
 }
 
-func (s AtomicBool) MarshalYAML() (interface{}, error) {
+func (s AtomicBool) MarshalYAML() (any, error) {
 	return s.Load(), nil
 }

configuration/configuration.go

@@ -324,7 +324,7 @@ func (c *Configuration) LoadDataplaneStorageConfig() ([]string, error) {
 }
 
 func (c *Configuration) LoadRuntimeVars(swaggerJSON json.RawMessage, host string, port int) error {
-	var m map[string]interface{}
+	var m map[string]any
 	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	err := json.Unmarshal(swaggerJSON, &m)
 	if err != nil {