lint: upgrade golangci-lint to v1.54.2

Makefile

@@ -451,7 +451,7 @@ run-lint: $(GOLANGCI-LINT) ## Run lint tests
 	$(GOLANGCI-LINT) run
 
 $(GOLANGCI-LINT):
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.50.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.54.2
 
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.

controllers/authpolicy_controller.go

@@ -172,7 +172,7 @@ func (r *AuthPolicyReconciler) deleteResources(ctx context.Context, ap *api.Auth
 
 	// remove direct back ref
 	if targetNetworkObject != nil {
-		if err := r.deleteNetworkResourceDirectBackReference(ctx, ap, targetNetworkObject); err != nil {
+		if err := r.deleteNetworkResourceDirectBackReference(ctx, targetNetworkObject); err != nil {
 			return err
 		}
 	}
@@ -186,8 +186,8 @@ func (r *AuthPolicyReconciler) reconcileNetworkResourceDirectBackReference(ctx c
 	return r.ReconcileTargetBackReference(ctx, client.ObjectKeyFromObject(ap), targetNetworkObject, common.AuthPolicyBackRefAnnotation)
 }
 
-func (r *AuthPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, ap *api.AuthPolicy, targetNetworkObject client.Object) error {
-	return r.DeleteTargetBackReference(ctx, client.ObjectKeyFromObject(ap), targetNetworkObject, common.AuthPolicyBackRefAnnotation)
+func (r *AuthPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, targetNetworkObject client.Object) error {
+	return r.DeleteTargetBackReference(ctx, targetNetworkObject, common.AuthPolicyBackRefAnnotation)
 }
 
 // SetupWithManager sets up the controller with the Manager.

controllers/authpolicy_istio_authorization_policy.go

@@ -63,15 +63,15 @@ func (r *AuthPolicyReconciler) deleteIstioAuthorizationPolicies(ctx context.Cont
 	}
 
 	for _, gw := range gwDiffObj.GatewaysWithInvalidPolicyRef {
-		listOptions := &client.ListOptions{LabelSelector: labels.SelectorFromSet(labels.Set(istioAuthorizationPolicyLabels(client.ObjectKeyFromObject(gw.Gateway), client.ObjectKeyFromObject(ap))))}
+		listOptions := &client.ListOptions{LabelSelector: labels.SelectorFromSet(istioAuthorizationPolicyLabels(client.ObjectKeyFromObject(gw.Gateway), client.ObjectKeyFromObject(ap)))}
 		iapList := &istio.AuthorizationPolicyList{}
 		if err := r.Client().List(ctx, iapList, listOptions); err != nil {
 			return err
 		}
 
 		for _, iap := range iapList.Items {
 			// it's OK to just go ahead and delete because we only create one IAP per target network object,
-			// and a network object can be target by no more than one AuthPolicy
+			// and a network object can be targeted by no more than one AuthPolicy
 			if err := r.DeleteResource(ctx, iap); err != nil && !apierrors.IsNotFound(err) {
 				logger.Error(err, "failed to delete IstioAuthorizationPolicy")
 				return err

controllers/authpolicy_status.go

@@ -9,7 +9,7 @@ import (
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

controllers/helper_test.go

@@ -17,7 +17,7 @@ import (
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"

controllers/kuadrant_controller.go

@@ -135,11 +135,7 @@ func (r *KuadrantReconciler) Reconcile(eventCtx context.Context, req ctrl.Reques
 		logger.V(1).Error(gwErr, "Reconciling cluster gateways failed")
 	}
 
-	specResult, specErr := r.reconcileSpec(ctx, kObj)
-	if specErr == nil && specResult.Requeue {
-		logger.V(1).Info("Reconciling spec not finished. Requeueing.")
-		return specResult, nil
-	}
+	specErr := r.reconcileSpec(ctx, kObj)
 
 	statusResult, statusErr := r.reconcileStatus(ctx, kObj, specErr)
 
@@ -356,20 +352,16 @@ func (r *KuadrantReconciler) registerServiceMeshMember(ctx context.Context, kObj
 	return r.ReconcileResource(ctx, &maistrav1.ServiceMeshMember{}, member, reconcilers.CreateOnlyMutator)
 }
 
-func (r *KuadrantReconciler) reconcileSpec(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) (ctrl.Result, error) {
+func (r *KuadrantReconciler) reconcileSpec(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {
 	if err := r.registerExternalAuthorizer(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
+		return err
 	}
 
 	if err := r.reconcileLimitador(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
-	}
-
-	if err := r.reconcileAuthorino(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
+		return err
 	}
 
-	return ctrl.Result{}, nil
+	return r.reconcileAuthorino(ctx, kObj)
 }
 
 func controlPlaneProviderName() string {
@@ -430,10 +422,7 @@ func (r *KuadrantReconciler) reconcileClusterGateways(ctx context.Context, kObj
 		}
 	}
 
-	if err := errGroup.Wait(); err != nil {
-		return err
-	}
-	return nil
+	return errGroup.Wait()
 }
 
 func (r *KuadrantReconciler) removeAnnotationFromGateways(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {
@@ -461,10 +450,7 @@ func (r *KuadrantReconciler) removeAnnotationFromGateways(ctx context.Context, k
 		})
 	}
 
-	if err := errGroup.Wait(); err != nil {
-		return err
-	}
-	return nil
+	return errGroup.Wait()
 }
 
 func (r *KuadrantReconciler) reconcileLimitador(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {

controllers/kuadrant_status.go

@@ -8,7 +8,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -88,7 +88,7 @@ func (r *KuadrantReconciler) readyCondition(ctx context.Context, kObj *kuadrantv
 
 	if specErr != nil {
 		cond.Status = metav1.ConditionFalse
-		cond.Reason = "ReconcilliationError"
+		cond.Reason = "ReconciliationError"
 		cond.Message = specErr.Error()
 		return cond, nil
 	}

controllers/ratelimitpolicy_controller.go

@@ -211,7 +211,7 @@ func (r *RateLimitPolicyReconciler) deleteResources(ctx context.Context, rlp *ku
 
 	// remove direct back ref
 	if targetNetworkObject != nil {
-		if err := r.deleteNetworkResourceDirectBackReference(ctx, rlp, targetNetworkObject); err != nil {
+		if err := r.deleteNetworkResourceDirectBackReference(ctx, targetNetworkObject); err != nil {
 			return err
 		}
 	}
@@ -225,8 +225,8 @@ func (r *RateLimitPolicyReconciler) reconcileNetworkResourceDirectBackReference(
 	return r.ReconcileTargetBackReference(ctx, client.ObjectKeyFromObject(policy), targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
 }
 
-func (r *RateLimitPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, rlp *kuadrantv1beta2.RateLimitPolicy, targetNetworkObject client.Object) error {
-	return r.DeleteTargetBackReference(ctx, client.ObjectKeyFromObject(rlp), targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
+func (r *RateLimitPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, targetNetworkObject client.Object) error {
+	return r.DeleteTargetBackReference(ctx, targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
 }
 
 // SetupWithManager sets up the controller with the Manager.

controllers/ratelimitpolicy_controller_test.go

@@ -41,12 +41,12 @@ func testBuildBasicGateway(gwName, ns string) *gatewayapiv1beta1.Gateway {
 			Annotations: map[string]string{"networking.istio.io/service-type": string(corev1.ServiceTypeClusterIP)},
 		},
 		Spec: gatewayapiv1beta1.GatewaySpec{
-			GatewayClassName: gatewayapiv1beta1.ObjectName("istio"),
+			GatewayClassName: "istio",
 			Listeners: []gatewayapiv1beta1.Listener{
 				{
-					Name:     gatewayapiv1beta1.SectionName("default"),
+					Name:     "default",
 					Port:     gatewayapiv1beta1.PortNumber(80),
-					Protocol: gatewayapiv1beta1.ProtocolType("HTTP"),
+					Protocol: "HTTP",
 				},
 			},
 		},

controllers/ratelimitpolicy_status.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-logr/logr"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"

pkg/common/common.go

@@ -30,7 +30,6 @@ import (
 // TODO: move the const to a proper place, or get it from config
 const (
 	KuadrantRateLimitClusterName       = "kuadrant-rate-limiting-service"
-	HTTPRouteKind                      = "HTTPRoute"
 	RateLimitPoliciesBackRefAnnotation = "kuadrant.io/ratelimitpolicies"
 	RateLimitPolicyBackRefAnnotation   = "kuadrant.io/ratelimitpolicy"
 	AuthPoliciesBackRefAnnotation      = "kuadrant.io/authpolicies"
@@ -238,7 +237,7 @@ func UnMarshallObjectKey(keyStr string) (client.ObjectKey, error) {
 	return client.ObjectKey{Namespace: keyStr[:namespaceEndIndex], Name: keyStr[namespaceEndIndex+1:]}, nil
 }
 
-// HostnamesToStrings converts []gatewayapi_v1alpha2.Hostname to []string
+// HostnamesToStrings converts []gatewayapiv1beta1.Hostname to []string
 func HostnamesToStrings(hostnames []gatewayapiv1beta1.Hostname) []string {
 	return Map(hostnames, func(hostname gatewayapiv1beta1.Hostname) string {
 		return string(hostname)
@@ -249,8 +248,8 @@ func HostnamesToStrings(hostnames []gatewayapiv1beta1.Hostname) []string {
 // is a subset of at least one of the domains.
 // Domains and subdomains may be prefixed with a wildcard label (*.).
 // The wildcard label must appear by itself as the first label.
-// When one of the subdomains is not a subset of any of the domains, it returns false and
-// the subdomain not being subset of any of the domains
+// When one of the subdomains is not a subset of the domains, it returns false and
+// the subdomain not being subset of the domains
 func ValidSubdomains(domains, subdomains []string) (bool, string) {
 	for _, subdomain := range subdomains {
 		validSubdomain := false

pkg/common/gatewayapi_utils_test.go

@@ -1095,7 +1095,7 @@ func TestGetGatewayWorkloadSelector(t *testing.T) {
 	scheme := runtime.NewScheme()
 	_ = corev1.AddToScheme(scheme)
 	_ = gatewayapiv1beta1.AddToScheme(scheme)
-	k8sClient := fake.NewFakeClientWithScheme(scheme, gateway, service)
+	k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(gateway, service).Build()
 
 	var selector map[string]string
 	var err error
@@ -1136,7 +1136,7 @@ func TestGetGatewayWorkloadSelectorWithoutHostnameAddress(t *testing.T) {
 	scheme := runtime.NewScheme()
 	_ = corev1.AddToScheme(scheme)
 	_ = gatewayapiv1beta1.AddToScheme(scheme)
-	k8sClient := fake.NewFakeClientWithScheme(scheme, gateway, service)
+	k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(gateway, service).Build()
 
 	var selector map[string]string
 	var err error
@@ -1157,7 +1157,7 @@ func (p *FakePolicy) GetTargetRef() gatewayapiv1alpha2.PolicyTargetReference {
 }
 
 func (p *FakePolicy) GetWrappedNamespace() gatewayapiv1beta1.Namespace {
-	return gatewayapiv1beta1.Namespace("")
+	return ""
 }
 
 func (p *FakePolicy) GetRulesHostnames() []string {
@@ -1193,9 +1193,7 @@ func TestValidateHierarchicalRules(t *testing.T) {
 	)
 
 	if err := ValidateHierarchicalRules(&policy2, gateway); err.Error() != expectedError.Error() {
-		t.Fatal("the error message does not match the expected error one")
-		fmt.Println(expectedError.Error())
-		fmt.Println(err.Error())
+		t.Fatal("the error message does not match the expected error one", expectedError.Error(), err.Error())
 	}
 
 }

pkg/common/istio_utils_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package common
 

pkg/common/k8s_utils.go

@@ -31,8 +31,7 @@ import (
 )
 
 const (
-	DeleteTagAnnotation      = "kuadrant.io/delete"
-	ReadyStatusConditionType = "Ready"
+	DeleteTagAnnotation = "kuadrant.io/delete"
 )
 
 // ObjectInfo generates a string representation of the provided Kubernetes object, including its kind and name.
@@ -80,9 +79,7 @@ func IsObjectTaggedToDelete(obj client.Object) bool {
 // condition type.
 func StatusConditionsMarshalJSON(input []metav1.Condition) ([]byte, error) {
 	conds := make([]metav1.Condition, 0, len(input))
-	for idx := range input {
-		conds = append(conds, input[idx])
-	}
+	conds = append(conds, input...)
 
 	sort.Slice(conds, func(a, b int) bool {
 		return conds[a].Type < conds[b].Type

pkg/common/k8s_utils_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package common
 

pkg/common/mesh_config_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package common
 

pkg/common/yaml_decoder_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package common
 

pkg/istio/mesh_config.go

@@ -127,10 +127,8 @@ func (w *OSSMControlPlaneWrapper) SetMeshConfig(config *istiomeshv1alpha1.MeshCo
 	if err != nil {
 		return err
 	}
-	if err := w.config.Spec.TechPreview.SetField("meshConfig", meshConfigStruct.AsMap()); err != nil {
-		return err
-	}
-	return nil
+
+	return w.config.Spec.TechPreview.SetField("meshConfig", meshConfigStruct.AsMap())
 }
 
 // meshConfigFromStruct Builds the Istio/OSSM MeshConfig from a compatible structure:

pkg/istio/mesh_config_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 package istio
 
@@ -172,7 +171,8 @@ func TestOSSMControlPlaneWrapper_GetConfigObject(t *testing.T) {
 func TestOSSMControlPlaneWrapper_GetMeshConfig(t *testing.T) {
 	ossmControlPlane := &maistrav2.ServiceMeshControlPlane{}
 	ossmControlPlane.Spec.TechPreview = maistrav1.NewHelmValues(nil)
-	ossmControlPlane.Spec.TechPreview.SetField("meshConfig", getStubbedMeshConfigStruct().AsMap())
+	err := ossmControlPlane.Spec.TechPreview.SetField("meshConfig", getStubbedMeshConfigStruct().AsMap())
+	assert.NilError(t, err)
 
 	wrapper := NewOSSMControlPlaneWrapper(ossmControlPlane)
 	meshConfig, _ := wrapper.GetMeshConfig()
@@ -185,12 +185,13 @@ func TestOSSMControlPlaneWrapper_SetMeshConfig(t *testing.T) {
 	ossmControlPlane := &maistrav2.ServiceMeshControlPlane{}
 	ossmControlPlane.Spec.TechPreview = maistrav1.NewHelmValues(nil)
 	emptyConfig := &structpb.Struct{}
-	ossmControlPlane.Spec.TechPreview.SetField("meshConfig", emptyConfig.AsMap())
+	err := ossmControlPlane.Spec.TechPreview.SetField("meshConfig", emptyConfig.AsMap())
+	assert.NilError(t, err)
 
 	wrapper := NewOSSMControlPlaneWrapper(ossmControlPlane)
 
 	stubbedMeshConfig := getStubbedMeshConfig()
-	err := wrapper.SetMeshConfig(stubbedMeshConfig)
+	err = wrapper.SetMeshConfig(stubbedMeshConfig)
 	assert.NilError(t, err)
 
 	meshConfig, _ := wrapper.GetMeshConfig()

pkg/log/log_test.go

@@ -1,5 +1,4 @@
 //go:build unit
-// +build unit
 
 /*
 Copyright 2021 Red Hat, Inc.

pkg/reconcilers/base_reconciler.go

@@ -37,7 +37,7 @@ import (
 // MutateFn is a function which mutates the existing object into it's desired state.
 type MutateFn func(existing, desired client.Object) (bool, error)
 
-func CreateOnlyMutator(existing, desired client.Object) (bool, error) {
+func CreateOnlyMutator(_, _ client.Object) (bool, error) {
 	return false, nil
 }