CLEANUP/MAJOR: lint: upgrade linter for go 1.22

Author: mjuraga

.golangci.yml

@@ -16,9 +16,9 @@ linters-settings:
     min-occurrences: 2
   revive:
     rules:
-    - name: var-naming
-      severity: warning
-      disabled: true
+      - name: var-naming
+        severity: warning
+        disabled: true
 linters:
   enable-all: true
   disable:
@@ -74,13 +74,12 @@ linters:
     - 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"
+    - 'github.com/kballard/go-shellquote" imported but not used'
+    - 'github.com/haproxytech/config-parser/v5/types" imported but not used'
   exclude-rules:
     - linters:
         - staticcheck
@@ -91,7 +90,5 @@ issues:
     - linters:
         - gosec
       text: "G[404]"
-
-run:
-  skip-dirs:
+  exclude-dirs:
     - test

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.54.2
+GOLANGCI_LINT_VERSION=1.57.1
 
 all: update clean build
 

configuration/cluster_sync.go

@@ -25,6 +25,7 @@ import (
 	"crypto/x509/pkix"
 	"encoding/asn1"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -149,7 +150,7 @@ func (c *ClusterSync) issueRefreshRequest(url, port, basePath string, nodesPath
 
 	req, err := http.NewRequest(http.MethodPatch, url, bytes.NewBuffer(bytesRepresentation))
 	if err != nil {
-		return fmt.Errorf("error creating new POST request for cluster comunication")
+		return errors.New("error creating new POST request for cluster comunication")
 	}
 	req.Header.Add("X-Node-Key", c.cfg.Cluster.Token.Load())
 	req.Header.Add("Content-Type", "application/json")

configuration/map_sync.go

@@ -96,7 +96,7 @@ func (ms *MapSync) Sync(mp *models.Map, client client_native.HAProxyClient) (boo
 	sort.Slice(fileEntries, func(i, j int) bool { return fileEntries[i].Key < fileEntries[j].Key })
 
 	// runtime map entries
-	id := fmt.Sprintf("#%s", mp.ID)
+	id := "#" + mp.ID
 	runtimeEntries, err := runtime.ShowMapEntries(id)
 	if err != nil {
 		return false, fmt.Errorf("getting runtime entries error: id: %s %s", id, err.Error())
@@ -144,7 +144,7 @@ func equalSomeEntries(fEntries, rEntries models.MapEntries, index ...int) bool {
 		maxRandom = max
 	}
 
-	for i := 0; i < maxRandom; i++ {
+	for range maxRandom {
 		// There's no need for strong number generation, here, just need for performance
 		r := rand.Intn(max)
 		if len(index) > 0 {

configuration/map_sync_test.go

@@ -23,7 +23,7 @@ import (
 )
 
 func data(differentAtIndex ...int) (fileEntries models.MapEntries, runtimeEntries models.MapEntries) {
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		fe := &models.MapEntry{Key: "k" + strconv.Itoa(i), Value: "v" + strconv.Itoa(i)}
 		re := &models.MapEntry{Key: "k" + strconv.Itoa(i), Value: "v" + strconv.Itoa(i)}
 		fileEntries = append(fileEntries, fe)

configuration/pid.go

@@ -16,7 +16,6 @@
 package configuration
 
 import (
-	"fmt"
 	"os"
 	"strconv"
 
@@ -47,7 +46,7 @@ func HandlePIDFile(haproxyOptions HAProxyConfiguration) {
 		}
 	}
 
-	err := renameio.WriteFile(haproxyOptions.PIDFile, []byte(fmt.Sprintf("%d", os.Getpid())), 0o644)
+	err := renameio.WriteFile(haproxyOptions.PIDFile, []byte(strconv.Itoa(os.Getpid())), 0o644)
 	if err != nil {
 		log.Fatalf("error while writing PID file: %s %s", haproxyOptions.PIDFile, err.Error())
 	} else {

configuration/reload-strategy.go

@@ -15,7 +15,10 @@
 
 package configuration
 
-import "fmt"
+import (
+	"errors"
+	"fmt"
+)
 
 const (
 	ReloadStratCustom  = "custom"
@@ -53,7 +56,7 @@ func validateReloadConfiguration(c *HAProxyConfiguration) error {
 	case ReloadStratCustom:
 		// The custom commands need to be set.
 		if c.ReloadCmd == "" || c.RestartCmd == "" {
-			return fmt.Errorf("the custom reload strategy requires these options to be set: " +
+			return errors.New("the custom reload strategy requires these options to be set: " +
 				"ReloadCmd, RestartCmd")
 		}
 	case ReloadStratS6:

configuration/watcher.go

@@ -18,7 +18,7 @@ package configuration
 import (
 	"context"
 	"crypto/md5"
-	"fmt"
+	"encoding/hex"
 	"os"
 	"path/filepath"
 	"strings"
@@ -108,6 +108,6 @@ func (w *ConfigWatcher) invalidHash() bool {
 		return true
 	}
 	bHash := md5.Sum([]byte(strings.Join(lines[1:], "\n")))
-	hash := fmt.Sprintf("%x", bHash)
+	hash := hex.EncodeToString(bHash[:])
 	return parts[1] != hash
 }

configure_data_plane.go

@@ -1039,6 +1039,7 @@ func handleSignals(ctx context.Context, cancel context.CancelFunc, sigs chan os.
 				reloadConfigurationFile(client, haproxyOptions, users)
 			}
 		case <-ctx.Done():
+			cancel()
 			return
 		}
 	}

discovery/aws_service_discovery_instance.go

@@ -131,10 +131,9 @@ func newAWSRegionInstance(ctx context.Context, params *models.AwsRegion, client
 func (a *awsInstance) filterConverter(in []*models.AwsFilters) (out []types.Filter) {
 	out = make([]types.Filter, len(in))
 	for i, l := range in {
-		filter := l
 		out[i] = types.Filter{
-			Name:   filter.Key,
-			Values: []string{aws.ToString(filter.Value)},
+			Name:   l.Key,
+			Values: []string{aws.ToString(l.Value)},
 		}
 	}
 	return