[Misc] Operator: Minor quality issues addressed

Pavan-SAP · Pavan-SAP · commit 3d75e7f9ed8d · 2025-12-11T10:37:41.000+01:00
Fix minor code quality issues.
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -122,7 +122,7 @@ func main() {
 				go func() {
 					migrationDone <- migrateToDomainRefs(crdClient, istioClient, certClient, certManagerClient, dnsClient)
 				}()
-				if ok := <-migrationDone; !ok {
+				if !<-migrationDone {
 					klog.Errorf("Migration failed; not starting controller")
 					os.Exit(1)
 				}
diff --git a/cmd/server/internal/certificate-check.go b/cmd/server/internal/certificate-check.go
@@ -15,13 +15,13 @@ type stringslice []string
 
 func (s *stringslice) UnmarshalJSON(data []byte) error {
 	var single string
-	if err := json.Unmarshal(data, &single); err == nil {
+	if json.Unmarshal(data, &single) == nil {
 		*s = []string{single}
 		return nil
 	}
 
 	var multiple []string
-	if err := json.Unmarshal(data, &multiple); err == nil {
+	if json.Unmarshal(data, &multiple) == nil {
 		slices.Sort(multiple)
 		*s = multiple
 		return nil
@@ -38,7 +38,7 @@ type JsonDN struct {
 	CN string      `json:"CN"`
 }
 
-func check(source []string, target []string) bool {
+func check(source, target []string) bool {
 	return slices.Contains(source, "*") || slices.Equal(source, target)
 }
 
diff --git a/cmd/server/internal/handler.go b/cmd/server/internal/handler.go
@@ -196,7 +196,7 @@ func (s *SubscriptionHandler) CreateTenant(reqInfo *RequestInfo) *Result {
 	}
 
 	// Tenant created/exists
-	message := func(isCreated bool, isUpdated bool) string {
+	message := func(isCreated, isUpdated bool) string {
 		if isCreated {
 			return ResourceCreated
 		} else if isUpdated {
@@ -517,7 +517,7 @@ func (s *SubscriptionHandler) authorizationCheck(headerDetails *requestHeaderDet
 	return
 }
 
-func (s *SubscriptionHandler) checkCAPApp(globalAccountId string, btpAppName string) (*v1alpha1.CAPApplication, error) {
+func (s *SubscriptionHandler) checkCAPApp(globalAccountId, btpAppName string) (*v1alpha1.CAPApplication, error) {
 	labelSelector, err := labels.ValidatedSelectorFromSet(map[string]string{
 		LabelBTPApplicationIdentifierHash: sha1Sum(globalAccountId, btpAppName),
 	})
diff --git a/cmd/server/internal/handler_test.go b/cmd/server/internal/handler_test.go
@@ -1181,7 +1181,7 @@ func TestAsyncCallback(t *testing.T) {
 		client.Transport = &http.Transport{
 			DialContext: func(c context.Context, network, addr string) (net.Conn, error) {
 				if strings.Contains(addr, "auth.service.local:") {
-					if v := c.Value(cKey); v != nil {
+					if c.Value(cKey) != nil {
 						calledHost = addr
 					} else {
 						calledHost = ""
diff --git a/cmd/server/internal/jwt_test.go b/cmd/server/internal/jwt_test.go
@@ -154,7 +154,7 @@ func createJWTTestTLSServer(ctx context.Context, jwks *JWKeys) (*http.Client, er
 	if err != nil {
 		return nil, err
 	}
-	if ok := rootCAs.AppendCertsFromPEM(certs); !ok {
+	if !rootCAs.AppendCertsFromPEM(certs) {
 		return nil, errors.New("could not append CA cert")
 	}
 
diff --git a/cmd/web-hooks/internal/handler/handler.go b/cmd/web-hooks/internal/handler/handler.go
@@ -610,7 +610,7 @@ func (wh *WebhookHandler) checkCaIsConsistent(catObjOld v1alpha1.CAPTenant) vali
 	return validAdmissionReviewObj()
 }
 
-func (wh *WebhookHandler) checkForDuplicateDomains(domain string, name string) validateResource {
+func (wh *WebhookHandler) checkForDuplicateDomains(domain, name string) validateResource {
 	clusterDoms, _ := wh.CrdClient.SmeV1alpha1().ClusterDomains(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
 	for _, clusterDom := range clusterDoms.Items {
 		if clusterDom.Spec.Domain == domain && clusterDom.Name != name {
diff --git a/cmd/web-hooks/internal/handler/mutate.go b/cmd/web-hooks/internal/handler/mutate.go
@@ -220,7 +220,7 @@ func (wh *WebhookHandler) handleDomain(domain string, ca *v1alpha1.CAPApplicatio
 	return nil
 }
 
-func (wh *WebhookHandler) getDomain(domain string, namespace string) (*matchingDomainDetails, error) {
+func (wh *WebhookHandler) getDomain(domain, namespace string) (*matchingDomainDetails, error) {
 	// Check if the domain exists in current namespace
 	doms, err := wh.CrdClient.SmeV1alpha1().Domains(namespace).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
diff --git a/cmd/web-hooks/internal/handler/mutate_test.go b/cmd/web-hooks/internal/handler/mutate_test.go
@@ -39,7 +39,7 @@ func marshalJSON(obj interface{}) []byte {
 
 type testReader struct{}
 
-func (tr *testReader) Read(p []byte) (n int, err error) {
+func (tr *testReader) Read(_ []byte) (n int, err error) {
 	return 0, errors.New("test error")
 }
 
diff --git a/internal/controller/certificate-manager.go b/internal/controller/certificate-manager.go
@@ -73,7 +73,7 @@ func (h *CertificateManager) handleCertificate(ctx context.Context, info *Manage
 	return
 }
 
-func (h *CertificateManager) GetCredentialName(namespace string, name string) string {
+func (h *CertificateManager) GetCredentialName(namespace, name string) string {
 	credentialSuffix := gardenerCredentialSuffix
 	if h.managerType == certManagerCertManagerIO {
 		credentialSuffix = certManagerCredentialSuffix
diff --git a/internal/controller/controller_test.go b/internal/controller/controller_test.go
@@ -29,7 +29,7 @@ type dummyInformerFactoryType struct {
 	tweakListOptions func(*metav1.ListOptions)
 }
 
-func (f *dummyInformerFactoryType) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool {
+func (f *dummyInformerFactoryType) WaitForCacheSync(_ <-chan struct{}) map[reflect.Type]bool {
 	//Simulate error
 	return map[reflect.Type]bool{reflect.TypeOf(metav1.TypeMeta{}): false}
 }
diff --git a/internal/controller/informers.go b/internal/controller/informers.go
@@ -236,7 +236,7 @@ func getMetaObject(obj interface{}) (metav1.Object, bool) {
 	return metaObj, ok
 }
 
-func hasReconciliationRelevantChanges(newObj metav1.Object, oldObj metav1.Object) bool {
+func hasReconciliationRelevantChanges(newObj, oldObj metav1.Object) bool {
 	if oldObj.GetGeneration() != newObj.GetGeneration() {
 		// generation change denotes a change in the object spec
 		return true
diff --git a/internal/controller/informers_test.go b/internal/controller/informers_test.go
@@ -21,11 +21,11 @@ type dummyType struct {
 	workqueue.TypedRateLimitingInterface[QueueItem]
 }
 
-func (q *dummyType) Add(item QueueItem) {
+func (q *dummyType) Add(_ QueueItem) {
 	expectedResult = true
 }
 
-func (q *dummyType) AddAfter(item QueueItem, duration time.Duration) {
+func (q *dummyType) AddAfter(_ QueueItem, _ time.Duration) {
 	expectedResult = true
 }
 
diff --git a/internal/controller/reconcile-capapplication.go b/internal/controller/reconcile-capapplication.go
@@ -644,10 +644,10 @@ func (c *Controller) reconcileApplicationDomainReferences(ca *v1alpha1.CAPApplic
 		return true
 	}
 
-	if done := setStatus(areDomainResourcesReady(doms)); done {
+	if setStatus(areDomainResourcesReady(doms)) {
 		return
 	}
-	if done := setStatus(areDomainResourcesReady(cdoms)); done {
+	if setStatus(areDomainResourcesReady(cdoms)) {
 		return
 	}
 
diff --git a/internal/controller/reconcile-capapplicationversion.go b/internal/controller/reconcile-capapplicationversion.go
@@ -535,7 +535,7 @@ func (c *Controller) reconcileWorkloadServiceMonitor(ctx context.Context, wl *v1
 		return fmt.Errorf("could not identify workload port information for workload %s in version %s", wl.Name, cav.Name)
 	}
 
-	if portVerified := isWorkloadPort(wlPortInfos.Ports, wl.DeploymentDefinition.Monitoring.ScrapeConfig.WorkloadPort); !portVerified {
+	if !isWorkloadPort(wlPortInfos.Ports, wl.DeploymentDefinition.Monitoring.ScrapeConfig.WorkloadPort) {
 		return fmt.Errorf("invalid port reference in workload %s monitoring config of version %s", wl.Name, cav.Name)
 	}
 
diff --git a/internal/controller/reconcile-networking.go b/internal/controller/reconcile-networking.go
@@ -402,7 +402,7 @@ func (c *Controller) getVirtualServiceHttpRoutes(cat *v1alpha1.CAPTenant, curren
 	return httpRoutes, nil
 }
 
-func (c *Controller) getVirtualServiceHttpRouteDestination(cavName string, namespace string) (*networkingv1.Destination, error) {
+func (c *Controller) getVirtualServiceHttpRouteDestination(cavName, namespace string) (*networkingv1.Destination, error) {
 	CAVRouterPortInfo, err := c.getRouterServicePortInfo(cavName, namespace)
 	if err != nil {
 		return nil, err
diff --git a/internal/controller/reconcile.go b/internal/controller/reconcile.go
@@ -171,12 +171,12 @@ func (c *Controller) Event(main runtime.Object, related runtime.Object, eventTyp
 	c.eventRecorder.Eventf(main, related, eventType, reason, action, message)
 }
 
-func (c *Controller) getCachedCAPApplication(namespace string, name string) (*v1alpha1.CAPApplication, error) {
+func (c *Controller) getCachedCAPApplication(namespace, name string) (*v1alpha1.CAPApplication, error) {
 	lister := c.crdInformerFactory.Sme().V1alpha1().CAPApplications().Lister()
 	return lister.CAPApplications(namespace).Get(name)
 }
 
-func (c *Controller) getCachedCAPTenant(namespace string, value string, valueIsTenantId bool) (*v1alpha1.CAPTenant, error) {
+func (c *Controller) getCachedCAPTenant(namespace, value string, valueIsTenantId bool) (*v1alpha1.CAPTenant, error) {
 	lister := c.crdInformerFactory.Sme().V1alpha1().CAPTenants().Lister()
 	if !valueIsTenantId {
 		// fetch with name
@@ -452,7 +452,7 @@ func validateEnv(envConfig []corev1.EnvVar, restrictedNames map[string]struct{})
 	return ""
 }
 
-func errorEnv(workloadType string, entry string) error {
+func errorEnv(workloadType, entry string) error {
 	return fmt.Errorf("invalid env configuration for workload: %s, remove entry: %s from configuration", workloadType, entry)
 }
 
@@ -560,7 +560,7 @@ func getWorkloadPortInfo(workload v1alpha1.WorkloadDetails, cavName string) *ser
 	return workloadPortInfo
 }
 
-func updateWorkloadPortInfo(cavName string, workloadName string, deploymentType v1alpha1.DeploymentType, servicePorts []corev1.ServicePort, destinationDetails []destinationInfo, clusterPorts []int32) *servicePortInfo {
+func updateWorkloadPortInfo(cavName, workloadName string, deploymentType v1alpha1.DeploymentType, servicePorts []corev1.ServicePort, destinationDetails []destinationInfo, clusterPorts []int32) *servicePortInfo {
 	var workloadPortInfo *servicePortInfo
 	if len(servicePorts) == 0 {
 		// Use fallback defaults
@@ -594,7 +594,7 @@ func updateWorkloadPortInfo(cavName string, workloadName string, deploymentType
 	return workloadPortInfo
 }
 
-func getServicePortInfoByWorkloadName(items []servicePortInfo, cavName string, workloadName string) *servicePortInfo {
+func getServicePortInfoByWorkloadName(items []servicePortInfo, cavName, workloadName string) *servicePortInfo {
 	for i := range items {
 		current := items[i]
 		if current.WorkloadName == getWorkloadName(cavName, workloadName) {
@@ -604,7 +604,7 @@ func getServicePortInfoByWorkloadName(items []servicePortInfo, cavName string, w
 	return nil
 }
 
-func (c *Controller) getRouterServicePortInfo(cavName string, namespace string) (*servicePortInfo, error) {
+func (c *Controller) getRouterServicePortInfo(cavName, namespace string) (*servicePortInfo, error) {
 	cav, err := c.crdInformerFactory.Sme().V1alpha1().CAPApplicationVersions().Lister().CAPApplicationVersions(namespace).Get(cavName)
 	if err != nil {
 		return nil, err
@@ -615,7 +615,7 @@ func (c *Controller) getRouterServicePortInfo(cavName string, namespace string)
 	return getWorkloadPortInfo(*routerWorkload, cavName), nil
 }
 
-func copyMaps(originalMap map[string]string, additionalMap map[string]string) map[string]string {
+func copyMaps(originalMap, additionalMap map[string]string) map[string]string {
 	newMap := map[string]string{}
 	for key, value := range originalMap {
 		newMap[key] = value
diff --git a/internal/controller/version-monitoring.go b/internal/controller/version-monitoring.go
@@ -239,7 +239,7 @@ func (c *Controller) processVersionCleanupQueue(ctx context.Context, orc *cleanu
 		case <-ctx.Done():
 			return
 		default:
-			if stop := c.processVersionCleanupQueueItem(ctx, orc); stop {
+			if c.processVersionCleanupQueueItem(ctx, orc) {
 				return
 			}
 		}
@@ -253,7 +253,7 @@ func (c *Controller) processVersionCleanupQueueItem(ctx context.Context, orc *cl
 	}
 	defer orc.queue.Done(item)
 
-	if err := c.evaluateVersionForCleanup(ctx, item, orc.api); err != nil {
+	if c.evaluateVersionForCleanup(ctx, item, orc.api) != nil {
 		orc.queue.AddRateLimited(item)
 	} else {
 		orc.queue.Forget(item)
@@ -277,7 +277,7 @@ func (c *Controller) evaluateVersionForCleanup(ctx context.Context, item Namespa
 	cleanup := true
 	for i := range cav.Spec.Workloads {
 		wl := cav.Spec.Workloads[i]
-		if workloadEvaluation := evaluateWorkloadForCleanup(ctx, item, &wl, promapi); !workloadEvaluation {
+		if !evaluateWorkloadForCleanup(ctx, item, &wl, promapi) {
 			cleanup = false
 			break
 		}

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func main() {`
`122`	`122`	`go func() {`
`123`	`123`	`migrationDone <- migrateToDomainRefs(crdClient, istioClient, certClient, certManagerClient, dnsClient)`
`124`	`124`	`}()`
`125`		`- if ok := <-migrationDone; !ok {`
	`125`	`+ if !<-migrationDone {`
`126`	`126`	`klog.Errorf("Migration failed; not starting controller")`
`127`	`127`	`os.Exit(1)`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func createJWTTestTLSServer(ctx context.Context, jwks JWKeys) (http.Client, er`
`154`	`154`	`if err != nil {`
`155`	`155`	`return nil, err`
`156`	`156`	`}`
`157`		`- if ok := rootCAs.AppendCertsFromPEM(certs); !ok {`
	`157`	`+ if !rootCAs.AppendCertsFromPEM(certs) {`
`158`	`158`	`return nil, errors.New("could not append CA cert")`
`159`	`159`	`}`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ func (wh *WebhookHandler) checkCaIsConsistent(catObjOld v1alpha1.CAPTenant) vali`
`610`	`610`	`return validAdmissionReviewObj()`
`611`	`611`	`}`
`612`	`612`
`613`		`-func (wh *WebhookHandler) checkForDuplicateDomains(domain string, name string) validateResource {`
	`613`	`+func (wh *WebhookHandler) checkForDuplicateDomains(domain, name string) validateResource {`
`614`	`614`	`clusterDoms, _ := wh.CrdClient.SmeV1alpha1().ClusterDomains(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})`
`615`	`615`	`for _, clusterDom := range clusterDoms.Items {`
`616`	`616`	`if clusterDom.Spec.Domain == domain && clusterDom.Name != name {`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func (wh WebhookHandler) handleDomain(domain string, ca v1alpha1.CAPApplicatio`
`220`	`220`	`return nil`
`221`	`221`	`}`
`222`	`222`
`223`		`-func (wh WebhookHandler) getDomain(domain string, namespace string) (matchingDomainDetails, error) {`
	`223`	`+func (wh WebhookHandler) getDomain(domain, namespace string) (matchingDomainDetails, error) {`
`224`	`224`	`// Check if the domain exists in current namespace`
`225`	`225`	`doms, err := wh.CrdClient.SmeV1alpha1().Domains(namespace).List(context.TODO(), metav1.ListOptions{})`
`226`	`226`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func marshalJSON(obj interface{}) []byte {`
`39`	`39`
`40`	`40`	`type testReader struct{}`
`41`	`41`
`42`		`-func (tr *testReader) Read(p []byte) (n int, err error) {`
	`42`	`+func (tr *testReader) Read(_ []byte) (n int, err error) {`
`43`	`43`	`return 0, errors.New("test error")`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (h CertificateManager) handleCertificate(ctx context.Context, info Manage`
`73`	`73`	`return`
`74`	`74`	`}`
`75`	`75`
`76`		`-func (h *CertificateManager) GetCredentialName(namespace string, name string) string {`
	`76`	`+func (h *CertificateManager) GetCredentialName(namespace, name string) string {`
`77`	`77`	`credentialSuffix := gardenerCredentialSuffix`
`78`	`78`	`if h.managerType == certManagerCertManagerIO {`
`79`	`79`	`credentialSuffix = certManagerCredentialSuffix`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type dummyInformerFactoryType struct {`
`29`	`29`	`tweakListOptions func(*metav1.ListOptions)`
`30`	`30`	`}`
`31`	`31`
`32`		`-func (f *dummyInformerFactoryType) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool {`
	`32`	`+func (f *dummyInformerFactoryType) WaitForCacheSync(_ <-chan struct{}) map[reflect.Type]bool {`
`33`	`33`	`//Simulate error`
`34`	`34`	`return map[reflect.Type]bool{reflect.TypeOf(metav1.TypeMeta{}): false}`
`35`	`35`	`}`