Fix linting issue

Author: Peng Zhou

.golangci.yml

@@ -16,25 +16,28 @@ issues:
       linters:
         - dupl
         - lll
+    - path: "test/*"
+      linters:
+        - dupl
+        - errcheck
+        - goconst
+        - gocyclo
+        - lll
+        - unused
+    - path: "pkg/*"
+      linters:
+        - lll
+        - unparam
 linters:
   disable-all: true
   enable:
-    - dupl
     - errcheck
-    - exportloopref
-    - goconst
-    - gocyclo
     - gofmt
     - goimports
     - gosimple
     - govet
     - ineffassign
-    - lll
-    - misspell
-    - nakedret
-    - prealloc
     - staticcheck
     - typecheck
     - unconvert
-    - unparam
     - unused

Makefile

@@ -177,7 +177,7 @@ GOLANGCI_LINT_VERSION ?= v1.62.2
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
+	GOBIN=$(shell dirname $(GOLANGCI_LINT)) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) ;\
 	}
 
 .PHONY: lint

internal/controller/marklogiccluster_controller.go

@@ -28,10 +28,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
+	"reflect"
+
 	"github.com/go-logr/logr"
 	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
 	"github.com/marklogic/marklogic-operator-kubernetes/pkg/k8sutil"
-	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )

internal/controller/marklogicgroup_controller.go

@@ -19,6 +19,8 @@ package controller
 import (
 	"context"
 
+	"reflect"
+
 	"github.com/go-logr/logr"
 	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
 	"github.com/marklogic/marklogic-operator-kubernetes/pkg/k8sutil"
@@ -27,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
-	"reflect"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"

pkg/k8sutil/haProxy.go

@@ -6,6 +6,7 @@ import (
 	"sort"
 
 	"context"
+
 	"github.com/cisco-open/k8s-objectmatcher/patch"
 	marklogicv1 "github.com/marklogic/marklogic-operator-kubernetes/api/v1"
 	"github.com/marklogic/marklogic-operator-kubernetes/pkg/result"
@@ -128,6 +129,10 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
 		patch.IgnoreStatusFields(),
 		patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
 		patch.IgnoreField("kind"))
+	if err != nil {
+		logger.Error(err, "Failed to calculate HAProxy Deployment patch")
+		return result.Error(err)
+	}
 	if haproxyDeploymentDef.Spec.Template.Annotations == nil {
 		haproxyDeploymentDef.Spec.Template.Annotations = make(map[string]string)
 	}

pkg/k8sutil/haProxyHelper.go

@@ -87,7 +87,7 @@ func generateHAProxyConfig(ctx context.Context, cr *marklogicv1.MarklogicCluster
 			continue
 		}
 
-		if !config.IsPathBased && group.HAProxy != nil && group.HAProxy.PathBasedRouting != nil && *group.HAProxy.PathBasedRouting == true {
+		if !config.IsPathBased && group.HAProxy != nil && group.HAProxy.PathBasedRouting != nil && *group.HAProxy.PathBasedRouting {
 			config.IsPathBased = true
 		}
 
@@ -214,8 +214,8 @@ frontend marklogic-pathbased-frontend
 					continue
 				}
 				data = &HAProxyTemplate{
-					PortNumber:       int(babackend.Port),
-					TargetPortNumber: int(babackend.TargetPort),
+					PortNumber:       babackend.Port,
+					TargetPortNumber: babackend.TargetPort,
 					Path:             babackend.Path,
 					IsPathBased:      babackend.IsPathBased,
 					BackendName:      babackend.BackendName,
@@ -236,8 +236,8 @@ frontend {{ .FrontendName }}
 		data = &HAProxyTemplate{
 			FrontendName:     frontend.FrontendName,
 			BackendName:      frontend.BackendName,
-			PortNumber:       int(frontend.Port),
-			TargetPortNumber: int(frontend.TargetPort),
+			PortNumber:       frontend.Port,
+			TargetPortNumber: frontend.TargetPort,
 			SslCert:          getSSLConfig(cr.Spec.HAProxy.Tls),
 		}
 		result += parseTemplateToString(frontEndDef, data) + "\n"
@@ -369,7 +369,7 @@ listen marklogic-TCP-{{.TcpName}}
   mode tcp
   balance leastconn`
 		data := &HAProxyTemplate{
-			PortNumber: int(tcpConfigSlice[0].Port),
+			PortNumber: tcpConfigSlice[0].Port,
 			TcpName:    tcpConfigSlice[0].TcpName,
 			SslCert:    getSSLConfig(cr.Spec.HAProxy.Tls),
 		}
@@ -378,7 +378,7 @@ listen marklogic-TCP-{{.TcpName}}
 		for _, tcpConfig := range tcpConfigSlice {
 			for i := 0; i < tcpConfig.Replicas; i++ {
 				data := &HAProxyTemplate{
-					PortNumber:  int(tcpConfig.TargetPort),
+					PortNumber:  tcpConfig.TargetPort,
 					PodName:     tcpConfig.PodName,
 					Index:       i,
 					ServiceName: name,

pkg/k8sutil/ingress.go

@@ -36,9 +36,7 @@ func generateIngressDef(ingressMeta metav1.ObjectMeta, ownerRef metav1.OwnerRefe
 			},
 		})
 	}
-	for _, additionalHost := range cr.Spec.HAProxy.Ingress.AdditionalHosts {
-		ingressRules = append(ingressRules, additionalHost)
-	}
+	ingressRules = append(ingressRules, cr.Spec.HAProxy.Ingress.AdditionalHosts...)
 
 	ingressSpec := networkingv1.IngressSpec{
 		IngressClassName: &cr.Spec.HAProxy.Ingress.IngressClassName,
@@ -128,6 +126,8 @@ func (cc *ClusterContext) ReconcileIngress() result.ReconcileResult {
 	return result.Continue()
 }
 
+// Deprecated: createIngress is currently unused but kept for future use
+// nolint:unused
 func (cc *ClusterContext) createIngress(namespace string) error {
 	logger := cc.ReqLogger
 	client := cc.Client

pkg/k8sutil/marklogicServer.go

@@ -188,7 +188,7 @@ func (cc *ClusterContext) ReconsileMarklogicCluster() (reconcile.Result, error)
 				}
 
 				logger.Info("Created new MarkLogic Server resource")
-				result.Done().Output()
+				_, _ = result.Done().Output()
 			} else {
 				logger.Error(err, "Failed to get MarkLogicGroup resource")
 			}

pkg/k8sutil/networkPolicy.go

@@ -33,8 +33,7 @@ func generateNetworkPolicyDef(networkPolicyMeta metav1.ObjectMeta, ownerRef meta
 func (cc *ClusterContext) getNetworkPolicy(namespace string, networkPolicyName string) (*networkingv1.NetworkPolicy, error) {
 	logger := cc.ReqLogger
 
-	var networkPolicy *networkingv1.NetworkPolicy
-	networkPolicy = &networkingv1.NetworkPolicy{}
+	networkPolicy := &networkingv1.NetworkPolicy{}
 	err := cc.Client.Get(cc.Ctx, types.NamespacedName{Name: networkPolicyName, Namespace: namespace}, networkPolicy)
 	if err != nil {
 		logger.Info("MarkLogic NetworkPolicy get action failed")
@@ -99,6 +98,8 @@ func (cc *ClusterContext) ReconcileNetworkPolicy() result.ReconcileResult {
 	return result.Continue()
 }
 
+// Deprecated: createNetworkPolicy is currently unused but kept for future use
+// nolint:unused
 func (oc *OperatorContext) createNetworkPolicy(namespace string, networkPolicy *networkingv1.NetworkPolicy) error {
 	logger := oc.ReqLogger
 	client := oc.Client

pkg/k8sutil/service.go

@@ -72,8 +72,7 @@ func generateServicePorts() []corev1.ServicePort {
 }
 
 func generateServiceDef(serviceMeta metav1.ObjectMeta, ownerRef metav1.OwnerReference, params serviceParameters) *corev1.Service {
-	var svcSpec corev1.ServiceSpec
-	svcSpec = corev1.ServiceSpec{
+	svcSpec := corev1.ServiceSpec{
 		Selector: getSelectorLabels(params.StsName),
 		Ports:    append(params.Ports, generateServicePorts()...),
 	}
@@ -101,8 +100,7 @@ func (oc *OperatorContext) generateService(svcName string, cr *marklogicv1.Markl
 	for key, value := range groupLabels {
 		labels[key] = value
 	}
-	var svcParams serviceParameters = serviceParameters{}
-	svcParams = generateServiceParams(cr)
+	svcParams := generateServiceParams(cr)
 	svcObjectMeta := generateObjectMeta(svcName, cr.Namespace, labels, svcParams.Annotations)
 	service := generateServiceDef(svcObjectMeta, marklogicServerAsOwner(cr), svcParams)
 	return service