chore: upgrade golangci lint version to v2

Signed-off-by: ashing <[email protected]>

Author: ronething

.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,34 @@ 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/*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

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()
 }

go.sum

@@ -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
 	}

internal/controller/consumer_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
 	}

internal/controller/gateway_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
 	}
 

internal/controller/ingress_controller.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 {

internal/provider/adc/translator/consumer.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)

internal/provider/adc/translator/httproute.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
 	}

internal/provider/adc/translator/policies.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{