chore: upgrade golangci lint version to v2 (#114)

ronething · web-flow · commit c891c8bdfceb · 2025-04-27T14:42:11.000+08:00
Signed-off-by: ashing &lt;axingfly@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,33 +1,14 @@
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "api/*"
-      linters:
-        - lll
-    - path: "internal/*"
-      linters:
-        - dupl
-        - lll
 linters:
-  disable-all: true
+  default: none
   enable:
     - dupl
     - errcheck
-    - exportloopref
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -36,12 +17,38 @@ linters:
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: comment-spacings
+  exclusions:
+    generated: lax
     rules:
-      - name: comment-spacings
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: internal/*
+      - linters:
+          - staticcheck
+        text: "ST1001:"
+        path: test/.*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -285,7 +285,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 KUSTOMIZE_VERSION ?= v5.4.2
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
 ENVTEST_VERSION ?= release-0.18
-GOLANGCI_LINT_VERSION ?= v1.59.1
+GOLANGCI_LINT_VERSION ?= v2.1.5
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -305,7 +305,7 @@ $(ENVTEST): $(LOCALBIN)
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT): $(LOCALBIN)
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 
 gofmt: ## Apply go fmt
 	@gofmt -w -r 'interface{} -> any' .
diff --git a/api/dashboard/v1/types.go b/api/dashboard/v1/types.go
@@ -730,9 +730,9 @@ func ComposeConsumerName(namespace, name string) string {
 	buf := bytes.NewBuffer(p)
 
 	// TODO If APISIX modifies the consumer name schema, we can drop this.
-	buf.WriteString(strings.Replace(namespace, "-", "_", -1))
+	buf.WriteString(strings.ReplaceAll(namespace, "-", "_"))
 	buf.WriteString("_")
-	buf.WriteString(strings.Replace(name, "-", "_", -1))
+	buf.WriteString(strings.ReplaceAll(name, "-", "_"))
 
 	return buf.String()
 }
diff --git a/internal/controller/consumer_controller.go b/internal/controller/consumer_controller.go
@@ -307,7 +307,7 @@ func (r *ConsumerReconciler) checkGatewayRef(object client.Object) bool {
 		return false
 	}
 	gatewayClass := &gatewayv1.GatewayClass{}
-	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
+	if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
 		r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)
 		return false
 	}
diff --git a/internal/controller/gateway_controller.go b/internal/controller/gateway_controller.go
@@ -208,7 +208,7 @@ func (r *GatewayReconciler) listGatewayForGatewayClass(ctx context.Context, gate
 func (r *GatewayReconciler) checkGatewayClass(obj client.Object) bool {
 	gateway := obj.(*gatewayv1.Gateway)
 	gatewayClass := &gatewayv1.GatewayClass{}
-	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
+	if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
 		r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)
 		return false
 	}
diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress_controller.go
@@ -209,7 +209,7 @@ func (r *IngressReconciler) getIngressClass(obj client.Object) (*networkingv1.In
 
 	// if it does not match, check if the ingress class is controlled by us
 	ingressClass := networkingv1.IngressClass{}
-	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: *ingress.Spec.IngressClassName}, &ingressClass); err != nil {
+	if err := r.Get(context.Background(), client.ObjectKey{Name: *ingress.Spec.IngressClassName}, &ingressClass); err != nil {
 		return nil, err
 	}
 
diff --git a/internal/provider/adc/translator/consumer.go b/internal/provider/adc/translator/consumer.go
@@ -3,7 +3,6 @@ package translator
 import (
 	"encoding/json"
 
-	"github.com/api7/api7-ingress-controller/api/adc"
 	adctypes "github.com/api7/api7-ingress-controller/api/adc"
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"github.com/api7/api7-ingress-controller/internal/provider"
@@ -22,7 +21,7 @@ func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext,
 	}
 	credentials := make([]adctypes.Credential, 0, len(consumerV.Spec.Credentials))
 	for _, credentialSpec := range consumerV.Spec.Credentials {
-		credential := adc.Credential{}
+		credential := adctypes.Credential{}
 		credential.Name = credentialSpec.Name
 		credential.Type = credentialSpec.Type
 		if credentialSpec.SecretRef != nil {
diff --git a/internal/provider/adc/translator/httproute.go b/internal/provider/adc/translator/httproute.go
@@ -180,8 +180,8 @@ func (t *Translator) fillPluginFromHTTPRequestMirrorFilter(plugins adctypes.Plug
 	}
 
 	var (
-		port int    = 80
-		ns   string = namespace
+		port = 80
+		ns   = namespace
 	)
 	if reqMirror.BackendRef.Port != nil {
 		port = int(*reqMirror.BackendRef.Port)
diff --git a/internal/provider/adc/translator/ingress.go b/internal/provider/adc/translator/ingress.go
@@ -171,7 +171,8 @@ func (t *Translator) TranslateIngress(tctx *provider.TranslateContext, obj *netw
 
 			uris := []string{path.Path}
 			if path.PathType != nil {
-				if *path.PathType == networkingv1.PathTypePrefix {
+				switch *path.PathType {
+				case networkingv1.PathTypePrefix:
 					// As per the specification of Ingress path matching rule:
 					// if the last element of the path is a substring of the
 					// last element in request path, it is not a match, e.g. /foo/bar
@@ -188,7 +189,7 @@ func (t *Translator) TranslateIngress(tctx *provider.TranslateContext, obj *netw
 						prefix += "/*"
 					}
 					uris = append(uris, prefix)
-				} else if *path.PathType == networkingv1.PathTypeImplementationSpecific {
+				case networkingv1.PathTypeImplementationSpecific:
 					uris = []string{"/*"}
 				}
 			}
diff --git a/internal/provider/adc/translator/policies.go b/internal/provider/adc/translator/policies.go
@@ -1,13 +1,11 @@
 package translator
 
 import (
-	"github.com/api7/api7-ingress-controller/api/adc"
+	adctypes "github.com/api7/api7-ingress-controller/api/adc"
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
-
-	adctypes "github.com/api7/api7-ingress-controller/api/adc"
 )
 
 func convertBackendRef(namespace, name, kind string) gatewayv1.BackendRef {
@@ -53,13 +51,13 @@ func (t *Translator) attachBackendTrafficPolicyToUpstream(policy *v1alpha1.Backe
 	}
 	if policy.Spec.Timeout != nil {
 		upstream.Timeout = &adctypes.Timeout{
-			Connect: int(policy.Spec.Timeout.Connect.Duration.Seconds()),
-			Read:    int(policy.Spec.Timeout.Read.Duration.Seconds()),
-			Send:    int(policy.Spec.Timeout.Send.Duration.Seconds()),
+			Connect: int(policy.Spec.Timeout.Connect.Seconds()),
+			Read:    int(policy.Spec.Timeout.Read.Seconds()),
+			Send:    int(policy.Spec.Timeout.Send.Seconds()),
 		}
 	}
 	if policy.Spec.LoadBalancer != nil {
-		upstream.Type = adc.UpstreamType(policy.Spec.LoadBalancer.Type)
+		upstream.Type = adctypes.UpstreamType(policy.Spec.LoadBalancer.Type)
 		upstream.HashOn = policy.Spec.LoadBalancer.HashOn
 		upstream.Key = policy.Spec.LoadBalancer.Key
 	}
diff --git a/internal/provider/controlplane/translator/httproute.go b/internal/provider/controlplane/translator/httproute.go
@@ -167,8 +167,8 @@ func (t *Translator) fillPluginFromHTTPRequestMirrorFilter(plugins v1.Plugins, n
 	}
 
 	var (
-		port int    = 80
-		ns   string = namespace
+		port = 80
+		ns   = namespace
 	)
 	if reqMirror.BackendRef.Port != nil {
 		port = int(*reqMirror.BackendRef.Port)
@@ -273,8 +273,8 @@ func (t *Translator) TranslateHTTPRoute(tctx *provider.TranslateContext, httpRou
 				backend.Namespace = &namespace
 			}
 			upstream := t.translateBackendRef(tctx, backend.BackendRef)
-			upstream.Labels["name"] = string(backend.BackendRef.Name)
-			upstream.Labels["namespace"] = string(*backend.BackendRef.Namespace)
+			upstream.Labels["name"] = string(backend.Name)
+			upstream.Labels["namespace"] = string(*backend.Namespace)
 			upstreams = append(upstreams, upstream)
 			if len(upstream.Nodes) == 0 {
 				upstream.Nodes = v1.UpstreamNodes{
@@ -389,7 +389,7 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
 		}
 	}
 
-	if match.Headers != nil && len(match.Headers) > 0 {
+	if len(match.Headers) > 0 {
 		for _, header := range match.Headers {
 			name := strings.ToLower(string(header.Name))
 			name = strings.ReplaceAll(name, "-", "_")
@@ -420,7 +420,7 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
 		}
 	}
 
-	if match.QueryParams != nil && len(match.QueryParams) > 0 {
+	if len(match.QueryParams) > 0 {
 		for _, query := range match.QueryParams {
 			var this []v1.StringOrSlice
 			this = append(this, v1.StringOrSlice{
diff --git a/internal/types/duration.go b/internal/types/duration.go
@@ -31,7 +31,7 @@ type TimeDuration struct {
 }
 
 func (d *TimeDuration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d.Duration.String())
+	return json.Marshal(d.String())
 }
 
 func (d *TimeDuration) UnmarshalJSON(data []byte) error {
@@ -55,7 +55,7 @@ func (d *TimeDuration) UnmarshalJSON(data []byte) error {
 }
 
 func (d *TimeDuration) MarshalYAML() (any, error) {
-	return d.Duration.String(), nil
+	return d.String(), nil
 }
 
 func (d *TimeDuration) UnmarshalYAML(unmarshal func(any) error) error {
diff --git a/pkg/dashboard/cluster.go b/pkg/dashboard/cluster.go
@@ -63,7 +63,7 @@ var (
 	// ErrRouteNotFound means the [route, ssl, upstream] was not found.
 	ErrNotFound = cache.ErrNotFound
 
-	_errReadOnClosedResBody = errors.New("http: read on closed response body")
+	errReadOnClosedResBody = errors.New("http: read on closed response body")
 )
 
 // ClusterOptions contains parameters to customize APISIX client.
@@ -128,10 +128,14 @@ func newCluster(ctx context.Context, o *ClusterOptions) (Cluster, error) {
 	if err != nil {
 		return nil, err
 	}
-	if u.Port() == "" {
-		if u.Scheme == "http" {
+
+	switch u.Scheme {
+	case "http":
+		if u.Port() == "" {
 			u.Host = u.Host + ":80"
-		} else if u.Scheme == "https" {
+		}
+	case "https":
+		if u.Port() == "" {
 			u.Host = u.Host + ":443"
 		}
 	}
@@ -698,7 +702,7 @@ func (c *cluster) deleteResource(ctx context.Context, url, resource string) erro
 func drainBody(r io.ReadCloser, url string) {
 	_, err := io.Copy(io.Discard, r)
 	if err != nil {
-		if err.Error() != _errReadOnClosedResBody.Error() {
+		if err.Error() != errReadOnClosedResBody.Error() {
 			log.Warnw("failed to drain body (read)",
 				zap.String("url", url),
 				zap.Error(err),
diff --git a/pkg/dashboard/consumer_test.go b/pkg/dashboard/consumer_test.go
@@ -76,7 +76,7 @@ func (srv *fakeAPISIXConsumerSrv) ServeHTTP(w http.ResponseWriter, r *http.Reque
 					Value: srv.consumer[key],
 				},
 			}
-			resp.fakeGetCreateItem.Value = srv.consumer[key]
+			resp.Value = srv.consumer[key]
 			w.WriteHeader(http.StatusOK)
 			data, _ := json.Marshal(resp)
 			_, _ = w.Write(data)
diff --git a/test/e2e/adminapi/dashboard_api.go b/test/e2e/adminapi/dashboard_api.go
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/api7/api7-ingress-controller/test/e2e/scaffold"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:staticcheck
+	. "github.com/onsi/gomega"    //nolint:staticcheck
 
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 )
diff --git a/test/e2e/framework/dashboard.go b/test/e2e/framework/dashboard.go
@@ -277,7 +277,7 @@ func (f *Framework) deploy() {
 	install.Namespace = f.kubectlOpts.Namespace
 	install.ReleaseName = "api7ee3"
 
-	chartPath, err := install.ChartPathOptions.LocateChart("api7/api7ee3", cli.New())
+	chartPath, err := install.LocateChart("api7/api7ee3", cli.New())
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "locate helm chart")
 
 	chart, err := loader.Load(chartPath)
diff --git a/test/e2e/framework/database.go b/test/e2e/framework/database.go
@@ -52,6 +52,7 @@ const (
 	mysqlDSN     = "mysql://root:changeme@tcp(mysql:3306)/api7ee"
 )
 
+//nolint:unused
 func getDSN() string {
 	switch _db {
 	case postgres:
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/logger"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //nolint:staticcheck
+	. "github.com/onsi/gomega"    //nolint:staticcheck
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"gorm.io/gorm"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/test/e2e/framework/gateway.go b/test/e2e/framework/gateway.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Masterminds/sprig/v3"
 	"github.com/gruntwork-io/terratest/modules/k8s"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:staticcheck
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/test/e2e/framework/ingress.go b/test/e2e/framework/ingress.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Masterminds/sprig/v3"
 	"github.com/gruntwork-io/terratest/modules/k8s"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //nolint:staticcheck
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/test/e2e/framework/k8s.go b/test/e2e/framework/k8s.go
diff --git a/test/e2e/framework/nginx.go b/test/e2e/framework/nginx.go
diff --git a/test/e2e/framework/utils.go b/test/e2e/framework/utils.go
diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go
diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
diff --git a/test/e2e/scaffold/ssl.go b/test/e2e/scaffold/ssl.go
diff --git a/test/utils/utils.go b/test/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func (r *ConsumerReconciler) checkGatewayRef(object client.Object) bool {`
`307`	`307`	`return false`
`308`	`308`	`}`
`309`	`309`	`gatewayClass := &gatewayv1.GatewayClass{}`
`310`		`- if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {`
	`310`	`+ if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {`
`311`	`311`	`r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)`
`312`	`312`	`return false`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func (r *GatewayReconciler) listGatewayForGatewayClass(ctx context.Context, gate`
`208`	`208`	`func (r *GatewayReconciler) checkGatewayClass(obj client.Object) bool {`
`209`	`209`	`gateway := obj.(*gatewayv1.Gateway)`
`210`	`210`	`gatewayClass := &gatewayv1.GatewayClass{}`
`211`		`- if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {`
	`211`	`+ if err := r.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {`
`212`	`212`	`r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)`
`213`	`213`	`return false`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ func (r IngressReconciler) getIngressClass(obj client.Object) (networkingv1.In`
`209`	`209`
`210`	`210`	`// if it does not match, check if the ingress class is controlled by us`
`211`	`211`	`ingressClass := networkingv1.IngressClass{}`
`212`		`- if err := r.Client.Get(context.Background(), client.ObjectKey{Name: *ingress.Spec.IngressClassName}, &ingressClass); err != nil {`
	`212`	`+ if err := r.Get(context.Background(), client.ObjectKey{Name: *ingress.Spec.IngressClassName}, &ingressClass); err != nil {`
`213`	`213`	`return nil, err`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ func (t *Translator) fillPluginFromHTTPRequestMirrorFilter(plugins adctypes.Plug`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`var (`
`183`		`- port int = 80`
`184`		`- ns string = namespace`
	`183`	`+ port = 80`
	`184`	`+ ns = namespace`
`185`	`185`	`)`
`186`	`186`	`if reqMirror.BackendRef.Port != nil {`
`187`	`187`	`port = int(*reqMirror.BackendRef.Port)`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,8 @@ func (t Translator) TranslateIngress(tctx provider.TranslateContext, obj *netw`
`171`	`171`
`172`	`172`	`uris := []string{path.Path}`
`173`	`173`	`if path.PathType != nil {`
`174`		`- if *path.PathType == networkingv1.PathTypePrefix {`
	`174`	`+ switch *path.PathType {`
	`175`	`+ case networkingv1.PathTypePrefix:`
`175`	`176`	`// As per the specification of Ingress path matching rule:`
`176`	`177`	`// if the last element of the path is a substring of the`
`177`	`178`	`// last element in request path, it is not a match, e.g. /foo/bar`
`@@ -188,7 +189,7 @@ func (t Translator) TranslateIngress(tctx provider.TranslateContext, obj *netw`
`188`	`189`	`prefix += "/*"`
`189`	`190`	`}`
`190`	`191`	`uris = append(uris, prefix)`
`191`		`- } else if *path.PathType == networkingv1.PathTypeImplementationSpecific {`
	`192`	`+ case networkingv1.PathTypeImplementationSpecific:`
`192`	`193`	`uris = []string{"/*"}`
`193`	`194`	`}`
`194`	`195`	`}`