Merge pull request #1231 from jcmoraisjr/dependabot/github_actions/golangci/golangci-lint-action-7

Bump golangci/golangci-lint-action from 6 to 7

Author: jcmoraisjr

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
     - name: Run build
       run: make build
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v7
       with:
         version: latest
         args: --verbose

.golangci.yml

@@ -1,18 +1,32 @@
-run:
-  timeout: 5m
-issues:
-  exclude-dirs:
-    - pkg/acme/x
-    - pkg/common
-    - pkg/controller/legacy
+version: "2"
 linters:
   enable:
-    - gofmt
-    - goimports
-    - gosimple
-    - govet
-    - ineffassign
     - misspell
-    - staticcheck
-    - typecheck
     - unconvert
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - pkg/acme/x
+      - pkg/common
+      - pkg/controller/legacy
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - pkg/acme/x
+      - pkg/common
+      - pkg/controller/legacy
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -49,7 +49,7 @@ test: gotestsum
 
 .PHONY: golangci-lint
 golangci-lint:
-	test -x $(LOCAL_GOLANGCI_LINT) || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	test -x $(LOCAL_GOLANGCI_LINT) || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 
 .PHONY: lint
 lint: golangci-lint

pkg/controller/config/config.go

@@ -307,7 +307,7 @@ func CreateWithConfig(ctx context.Context, restConfig *rest.Config, opt *Options
 		configLog.Info("running embedded haproxy", "mode", "daemon")
 	}
 
-	if !(opt.ReloadStrategy == "native" || opt.ReloadStrategy == "reusesocket" || opt.ReloadStrategy == "multibinder") {
+	if opt.ReloadStrategy != "native" && opt.ReloadStrategy != "reusesocket" && opt.ReloadStrategy != "multibinder" {
 		return nil, fmt.Errorf("unsupported reload strategy: %s", opt.ReloadStrategy)
 	}
 	if opt.ReloadStrategy == "multibinder" {

pkg/controller/services/svchealthz.go

@@ -136,7 +136,7 @@ func (s *svcHealthz) createStopHandler() http.HandlerFunc {
 		err := syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
-			_, _ = w.Write([]byte(fmt.Sprintf("failed to stop process: %s\n", err)))
+			_, _ = fmt.Fprintf(w, "failed to stop process: %s\n", err)
 		} else {
 			_, _ = w.Write([]byte("controller process is stopping now\n"))
 		}

pkg/haproxy/instance_test.go

@@ -5682,7 +5682,7 @@ func (c *testConfig) checkConfig(expected string) {
 }
 
 func (c *testConfig) checkConfigFile(expected, fileName string) {
-	actual := strings.Replace(c.readConfig(filepath.Join(c.tempdir, fileName)), c.tempdir, "/etc/haproxy/maps", -1)
+	actual := strings.ReplaceAll(c.readConfig(filepath.Join(c.tempdir, fileName)), c.tempdir, "/etc/haproxy/maps")
 	replace := map[string]string{
 		"<<global>>": `global
     daemon
@@ -5806,7 +5806,7 @@ frontend healthz
 	for {
 		changed := false
 		for old, new := range replace {
-			after := strings.Replace(expected, old, new, -1)
+			after := strings.ReplaceAll(expected, old, new)
 			if after != expected {
 				changed = true
 			}

pkg/utils/utils.go

@@ -92,12 +92,12 @@ func SizeSuffixToInt64(size string) (int64, error) {
 		return value, nil
 	}
 	if len(size) == 0 {
-		return 0, fmt.Errorf("Cannot convert empty string to int64")
+		return 0, fmt.Errorf("cannot convert empty string to int64")
 	}
 	valueStr := size[:len(size)-1]
 	value, err = strconv.ParseInt(valueStr, 10, 64)
 	if err != nil {
-		return 0, fmt.Errorf("Cannot convert %v to int64", valueStr)
+		return 0, fmt.Errorf("cannot convert %v to int64", valueStr)
 	}
 	suffix := size[len(size)-1:]
 	var mult int64
@@ -109,7 +109,7 @@ func SizeSuffixToInt64(size string) (int64, error) {
 	case "g", "G":
 		mult = 1024 * 1024 * 1024
 	default:
-		return value, fmt.Errorf("Invalid suffix: %v", suffix)
+		return value, fmt.Errorf("invalid suffix: %v", suffix)
 	}
 	return value * mult, nil
 }

tests/framework/framework.go

@@ -473,8 +473,8 @@ spec:
 `
 	name := RandomName("ing")
 	var hostname string
-	if opt.IngressOpt.CustomHostName != nil {
-		hostname = *opt.IngressOpt.CustomHostName
+	if opt.CustomHostName != nil {
+		hostname = *opt.CustomHostName
 	} else {
 		hostname = name + ".local"
 	}
@@ -483,11 +483,11 @@ spec:
 	ing.Name = name
 	ing.Spec.Rules[0].Host = hostname
 	ing.Spec.Rules[0].HTTP.Paths[0].Backend.Service.Name = svc.Name
-	if opt.IngressOpt.CustomTLSSecret != "" {
+	if opt.CustomTLSSecret != "" {
 		ing.Spec.TLS = []networking.IngressTLS{{
-			SecretName: opt.IngressOpt.CustomTLSSecret,
+			SecretName: opt.CustomTLSSecret,
 		}}
-	} else if opt.IngressOpt.DefaultTLS {
+	} else if opt.DefaultTLS {
 		ing.Spec.TLS = []networking.IngressTLS{{SecretName: ""}}
 	}
 	if len(ing.Spec.TLS) > 0 && hostname != "" {

tests/framework/options/objects.go

@@ -19,24 +19,24 @@ func AddConfigKeyAnnotation(key, value string) Object {
 
 func DefaultTLS() Object {
 	return func(o *objectOpt) {
-		o.IngressOpt.DefaultTLS = true
+		o.DefaultTLS = true
 	}
 }
 
 func CustomTLS(secret string) Object {
 	return func(o *objectOpt) {
-		o.IngressOpt.CustomTLSSecret = secret
+		o.CustomTLSSecret = secret
 	}
 }
 
 func CustomHostName(hostname string) Object {
 	return func(o *objectOpt) {
-		o.IngressOpt.CustomHostName = ptr.To(hostname)
+		o.CustomHostName = ptr.To(hostname)
 	}
 }
 func Listener(name, proto string, port int32) Object {
 	return func(o *objectOpt) {
-		o.GatewayOpt.Listeners = append(o.GatewayOpt.Listeners, ListenerOpt{
+		o.Listeners = append(o.Listeners, ListenerOpt{
 			Name:  name,
 			Proto: proto,
 			Port:  port,