BUILD/MINOR: golangci-lint: upgrade linter and fix lint issues

Author: mjuraga

.golangci.yml

@@ -1,6 +1,6 @@
 linters-settings:
   govet:
-    check-shadowing: true
+    shadow: true
   golint:
     min-confidence: 0
   gocyclo:
@@ -24,16 +24,13 @@ linters:
   disable:
     - dupl
     - exhaustive
-    - exhaustivestruct
     - funlen
     - gci
     - gochecknoglobals
     - gocognit
     - goconst
     - gocyclo
     - godot
-    - goerr113
-    - gomnd
     - lll
     - nestif
     - nlreturn
@@ -43,18 +40,9 @@ linters:
     - paralleltest
     - testpackage
     - varnamelen
-    - nosnakecase
     - exhaustruct
     - nonamedreturns
     - forcetypeassert
-    - golint #deprecated
-    - varcheck #deprecated
-    - ifshort #deprecated
-    - structcheck #deprecated
-    - maligned #deprecated
-    - scopelint #deprecated
-    - interfacer #deprecated
-    - deadcode #deprecated
     - rowserrcheck #rowserrcheck is disabled because of generics
     - sqlclosecheck #rowserrcheck is disabled because of generics
     - wastedassign #rowserrcheck is disabled because of generics
@@ -73,6 +61,10 @@ linters:
     - gocritic
     - tagalign
     - depguard
+    - mnd
+    - err113
+    - tenv # deprecated
+    - recvcheck
 
 issues:
   exclude:

client-native/cn.go

@@ -125,7 +125,6 @@ func ConfigureRuntimeClient(ctx context.Context, confClient configuration.Config
 			// else try to find process specific sockets and set them up
 			sockets := make(map[int]string)
 			for _, r := range runtimeAPIs {
-				//nolint:govet
 				if misc.IsUnixSocketAddr(*r.Address) && r.Process != "" {
 					process, err := strconv.ParseInt(r.Process, 10, 64)
 					if err == nil {

configuration/map_sync.go

@@ -124,29 +124,29 @@ func equalSomeEntries(fEntries, rEntries models.MapEntries, index ...int) bool {
 		return false
 	}
 
-	max := 0
+	maxNo := 0
 	switch l := len(rEntries); {
 	case l > 19:
 		for i := l - 20; i < l; i++ {
 			if rEntries[i].Key != fEntries[i].Key || rEntries[i].Value != fEntries[i].Value {
 				return false
 			}
 		}
-		max = l - 19
+		maxNo = l - 19
 	case l == 0:
 		return true
 	default:
-		max = l
+		maxNo = l
 	}
 
 	maxRandom := 10
-	if max < 10 {
-		maxRandom = max
+	if maxNo < 10 {
+		maxRandom = maxNo
 	}
 
 	for range maxRandom {
 		// There's no need for strong number generation, here, just need for performance
-		r := rand.Intn(max)
+		r := rand.Intn(maxNo)
 		if len(index) > 0 {
 			r = index[0]
 		}

configuration/user.go

@@ -176,20 +176,20 @@ func AuthenticateUser(user string, pass string) (interface{}, error) {
 	if strings.HasPrefix(u.Password, "\"${") && strings.HasSuffix(u.Password, "}\"") {
 		userPass = os.Getenv(misc.ExtractEnvVar(userPass))
 		if userPass == "" {
-			return nil, api_errors.New(401, fmt.Sprintf("%s %s", "can not read password from env variable:", u.Password))
+			return nil, api_errors.New(401, "%s %s", "can not read password from env variable:", u.Password)
 		}
 	}
 
 	if u.IsInsecure {
 		if pass == userPass {
 			return user, nil
 		}
-		return nil, api_errors.New(401, fmt.Sprintf("%s %s", "invalid password:", pass))
+		return nil, api_errors.New(401, "%s %s", "invalid password:", pass)
 	}
 	if checkPassword(pass, userPass) {
 		return user, nil
 	}
-	return nil, api_errors.New(401, fmt.Sprintf("%s %s", "invalid password:", pass))
+	return nil, api_errors.New(401, "%s %s", "invalid password:", pass)
 }
 
 func checkPassword(pass, storedPass string) bool {

configure_data_plane.go

@@ -704,7 +704,7 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
 			data.ID = service_discovery.NewServiceDiscoveryUUID()
 		}
 		if errSD = service_discovery.ValidateConsulData(data, true); errSD != nil {
-			log.Fatalf("Error validating Consul instance: " + errSD.Error())
+			log.Fatal("Error validating Consul instance: " + errSD.Error())
 		}
 		if errSD = discovery.AddNode("consul", *data.ID, data); errSD != nil {
 			log.Warning("Error creating consul instance: " + errSD.Error())
@@ -720,7 +720,7 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler { //nolint:cyclop,m
 			data.ID = service_discovery.NewServiceDiscoveryUUID()
 		}
 		if errSD = service_discovery.ValidateAWSData(data, true); errSD != nil {
-			log.Fatalf("Error validating AWS instance: " + errSD.Error())
+			log.Fatal("Error validating AWS instance: " + errSD.Error())
 		}
 		if errSD = discovery.AddNode("aws", *data.ID, data); errSD != nil {
 			log.Warning("Error creating AWS instance: " + errSD.Error())
@@ -1057,10 +1057,10 @@ func handleSignals(ctx context.Context, cancel context.CancelFunc, sigs chan os.
 func reloadConfigurationFile(client client_native.HAProxyClient, haproxyOptions dataplaneapi_config.HAProxyConfiguration, users *dataplaneapi_config.Users) {
 	confClient, err := cn.ConfigureConfigurationClient(haproxyOptions, mWorker)
 	if err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err.Error())
 	}
 	if err := users.Init(); err != nil {
-		log.Fatalf(err.Error())
+		log.Fatal(err.Error())
 	}
 	log.Info("Rereading Configuration Files")
 	clientMutex.Lock()

discovery/consul_service_discovery_instance.go

@@ -211,7 +211,7 @@ func (c *consulInstance) validateHealthChecks(node *serviceEntry) bool {
 }
 
 func (c *consulInstance) validateHealthChecksAny(node *serviceEntry) bool {
-	if node.Checks == nil || len(node.Checks) == 0 {
+	if len(node.Checks) == 0 {
 		return false
 	}
 
@@ -224,7 +224,7 @@ func (c *consulInstance) validateHealthChecksAny(node *serviceEntry) bool {
 }
 
 func (c *consulInstance) validateHealthChecksAll(node *serviceEntry) bool {
-	if node.Checks == nil || len(node.Checks) == 0 {
+	if len(node.Checks) == 0 {
 		return false
 	}
 
@@ -237,7 +237,7 @@ func (c *consulInstance) validateHealthChecksAll(node *serviceEntry) bool {
 }
 
 func (c *consulInstance) validateHealthChecksMin(node *serviceEntry) bool {
-	if node.Checks == nil || len(node.Checks) == 0 {
+	if len(node.Checks) == 0 {
 		return false
 	}
 

handlers/information.go

@@ -97,7 +97,6 @@ func (h *GetInfoHandlerImpl) Handle(params information.GetInfoParams, principal
 			sys.MemInfo.TotalMemory = int64(mem.Total)
 			sys.MemInfo.FreeMemory = int64(mem.Free)
 		}
-		//nolint:govet
 		if uptime, err := host.Uptime(); err == nil {
 			uptimeInt64 := int64(uptime)
 			sys.Uptime = &uptimeInt64

haproxy/reload_agent_test.go

@@ -26,8 +26,8 @@ import (
 )
 
 func TestReloadAgentDoesntMissReloads(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	f, err := os.CreateTemp("", "config.cfg")
+	ctx, cancel := context.WithCancel(t.Context())
+	f, err := os.CreateTemp(t.TempDir(), "config.cfg")
 	require.NoError(t, err)
 	assert.NotNil(t, f)
 	t.Cleanup(func() {