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
@@ -197,26 +197,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:

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

cmd/kubebuilder_marker_generator/main.go

@@ -58,12 +58,12 @@ func generate(fileName string) error { //nolint:gocognit
 									// We must keep empty strings:
 									// For example in Globals HttpclientSslVerify: // Enum: [ none required]
 									// from swagger: enum: ["", "none", "required"]
-									for _, enum := range strings.Split(comment, ",") {
+									for enum := range strings.SplitSeq(comment, ",") {
 										enum = strings.Trim(enum, "\"")
 										if enum == "" {
 											newComment += `""`
 										}
-										newComment += enum
+										newComment += enum //nolint: perfsprint
 										newComment += ";"
 									}
 									field.Decorations().Start.Append(newComment)

cmd/server_params_runtime/main.go

@@ -64,7 +64,7 @@ func main() {
 		doNotSendDisabledFields := listEmptyDisabledFields(allEnumFields)
 		doNotSendEnabledFields := listEmtpyEnabledFields(allEnumFields)
 
-		errTmpl = tmpl.Execute(file, map[string]interface{}{
+		errTmpl = tmpl.Execute(file, map[string]any{
 			"PrepareFieldsForRuntimeAddServer": FuncPrepareFieldsForRuntimeAddServer,
 			"DoNotSendDisabledFields":          doNotSendDisabledFields,
 			"DoNotSendDisabledFieldsFunc":      FuncDoNotSendDisabledFields,

cmd/specification/build.go

@@ -17,7 +17,7 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var cache map[string]interface{} //nolint:gochecknoglobals
+var cache map[string]any //nolint:gochecknoglobals
 
 func errorExit(msg string) {
 	fmt.Fprintf(os.Stderr, "ERROR: %v\n", msg)
@@ -39,7 +39,7 @@ func expandRef(refValue string, absPath string, prefix string) string {
 	filePath := path.Join(absPath, words[0])
 	keyPath := words[1]
 
-	m, ok := cache[filePath].(map[string]interface{})
+	m, ok := cache[filePath].(map[string]any)
 	if !ok {
 		fileHandle, err := os.Open(filePath)
 		if err != nil {
@@ -48,11 +48,12 @@ func expandRef(refValue string, absPath string, prefix string) string {
 		defer fileHandle.Close()
 
 		fileScanner := bufio.NewScanner(fileHandle)
-		value := ""
+		sb := strings.Builder{}
 		for fileScanner.Scan() {
-			value += fileScanner.Text() + "\n"
+			sb.WriteString(fileScanner.Text())
+			sb.WriteString("\n")
 		}
-
+		value := sb.String()
 		err = yaml.Unmarshal([]byte(value), &m)
 		if err != nil {
 			fmt.Println(refValue)         //nolint:forbidigo
@@ -61,9 +62,9 @@ func expandRef(refValue string, absPath string, prefix string) string {
 		}
 		cache[filePath] = m
 	}
-	retVal := make(map[string]interface{})
+	retVal := make(map[string]any)
 	if m[keyPath[1:]] != nil {
-		retVal = m[keyPath[1:]].(map[string]interface{})
+		retVal = m[keyPath[1:]].(map[string]any)
 	} else {
 		fmt.Println(refValue)       //nolint:forbidigo
 		fmt.Println(keyPath)        //nolint:forbidigo
@@ -83,17 +84,18 @@ func expandRef(refValue string, absPath string, prefix string) string {
 
 	var indentedRetValStr string
 	var indentedLine string
-	for _, line := range strings.Split(retValStr, "\n") {
+	for line := range strings.SplitSeq(retValStr, "\n") {
 		if strings.TrimSpace(line) != "" {
 			indentedLine = prefix + "" + line + "\n"
-			indentedRetValStr += indentedLine
+			indentedRetValStr += indentedLine //nolint: perfsprint
 		}
 	}
 
 	return indentedRetValStr[:len(indentedRetValStr)-1]
 }
 
-func main() { //nolint:gocognit
+//nolint:gocognit,modernize,perfsprint
+func main() {
 	inputFilePtr := flag.String("file", "", "Source file")
 
 	flag.Parse()
@@ -106,7 +108,7 @@ func main() { //nolint:gocognit
 		errorExit("File " + *inputFilePtr + " does not exist")
 	}
 
-	cache = make(map[string]interface{})
+	cache = make(map[string]any)
 
 	absPath := filepath.Dir(*inputFilePtr)
 	fileHandle, err := os.Open(*inputFilePtr)
@@ -166,7 +168,7 @@ func main() { //nolint:gocognit
 
 					b, _ := yaml.Marshal(&ts)
 
-					for _, line := range strings.Split(strings.TrimRight(string(b), "\n"), "\n") {
+					for line := range strings.SplitSeq(strings.TrimRight(string(b), "\n"), "\n") {
 						result.WriteString("  " + line + "\n")
 					}
 					result.WriteString("security:")

cmd/struct_equal_generator/generate.go

@@ -19,7 +19,7 @@ func generateEqualAndDiff(opt generateEqualAndDiffOptions) error {
 		return err
 	}
 
-	data := map[string]interface{}{
+	data := map[string]any{
 		"Mode":              opt.Mode,
 		"Name":              opt.Name,
 		"Type":              opt.Type,
@@ -32,13 +32,13 @@ func generateEqualAndDiff(opt generateEqualAndDiffOptions) error {
 		"IsPointer":         opt.IsPointer,
 	}
 
-	functions := map[string]interface{}{
-		"Functions": []interface{}{
-			map[string]interface{}{
+	functions := map[string]any{
+		"Functions": []any{
+			map[string]any{
 				"Name": "Equal",
 				"Data": data,
 			},
-			map[string]interface{}{
+			map[string]any{
 				"Name": "Diff",
 				"Data": data,
 			},
@@ -82,7 +82,7 @@ func generateCompareTests(opt generateEqualAndDiffOptions) error {
 			break
 		}
 	}
-	err = tmpl.Execute(opt.FileTest, map[string]interface{}{
+	err = tmpl.Execute(opt.FileTest, map[string]any{
 		"TestType":    []string{"Equal", "Diff"},
 		"Name":        opt.Name,
 		"HasIndex":    hasIndex,

cmd/struct_equal_generator/main.go

@@ -110,7 +110,7 @@ func generate(fileName string, args Args) (string, error) { //nolint:gocognit,ma
 		return packageName, err
 	}
 
-	err = tmpl.Execute(file, map[string]interface{}{
+	err = tmpl.Execute(file, map[string]any{
 		"Package": node.Name.String(),
 		"License": args.License,
 	})
@@ -125,7 +125,7 @@ func generate(fileName string, args Args) (string, error) { //nolint:gocognit,ma
 		return packageName, err
 	}
 
-	err = tmpl2.Execute(fileTest, map[string]interface{}{
+	err = tmpl2.Execute(fileTest, map[string]any{
 		"Package": node.Name.String(),
 		"License": args.License,
 	})

cmd/struct_equal_generator/misc.go

@@ -60,27 +60,25 @@ func toJSON(x any) string {
 
 func toCamelCase(s string) string {
 	caser := cases.Title(language.Und)
-	var result string
-	words := strings.Split(s, "_")
-
-	for _, word := range words {
-		result += caser.String(word)
+	words := strings.SplitSeq(s, "_")
+	sb := strings.Builder{}
+	for word := range words {
+		sb.WriteString(caser.String(word))
 	}
-
+	result := sb.String()
 	result = strings.ToLower(result[:1]) + result[1:]
 
 	return result
 }
 
 func toLowerCase(s string) string {
 	caser := cases.Lower(language.Und)
-	var result string
-	words := strings.Split(s, "_")
-
-	for _, word := range words {
-		result += caser.String(word)
+	words := strings.SplitSeq(s, "_")
+	sb := strings.Builder{}
+	for word := range words {
+		sb.WriteString(caser.String(word))
 	}
-
+	result := sb.String()
 	result = strings.ToLower(result[:1]) + result[1:]
 
 	return result

cmd/struct_equal_generator/utils.go

@@ -26,7 +26,7 @@ func createUtilsFile(packageName string, args Args) error {
 		return err
 	}
 
-	err = tmpl.Execute(file, map[string]interface{}{
+	err = tmpl.Execute(file, map[string]any{
 		"Package": packageName,
 		"License": args.License,
 	})
@@ -39,7 +39,7 @@ func createUtilsFile(packageName string, args Args) error {
 	if err != nil {
 		return err
 	}
-	err = tmpl.Execute(file, map[string]interface{}{})
+	err = tmpl.Execute(file, map[string]any{})
 	if err != nil {
 		return err
 	}