Refactor determineWorkloadType function to streamline workload type determination for LightrunJavaAgent. Simplify logic by removing unnecessary checks and enhancing clarity in configuration handling.

eliranb · eliranb · commit 2a68b3b40594 · 2025-05-21T16:23:47.000+03:00
diff --git a/internal/controller/lightrunjavaagent_controller.go b/internal/controller/lightrunjavaagent_controller.go
@@ -102,16 +102,11 @@ func (r *LightrunJavaAgentReconciler) determineWorkloadType(lightrunJavaAgent *a
 	if !isDeploymentConfigured && !isWorkloadConfigured {
 		return "", errors.New("invalid configuration: must set either DeploymentName (legacy) or WorkloadName with WorkloadType")
 	}
-
-	switch {
-	case isDeploymentConfigured:
+	if isDeploymentConfigured {
 		r.Log.Info("Using deprecated field deploymentName, consider migrating to workloadName and workloadType")
 		return agentv1beta.WorkloadTypeDeployment, nil
-	case isWorkloadConfigured:
-		return spec.WorkloadType, nil
-	default:
-		return "", errors.New("unable to determine workload type, please check your configuration")
 	}
+	return spec.WorkloadType, nil
 }
 
 // reconcileDeployment handles the reconciliation logic for Deployment workloads

Original file line number	Diff line number	Diff line change
`@@ -102,16 +102,11 @@ func (r LightrunJavaAgentReconciler) determineWorkloadType(lightrunJavaAgent a`
`102`	`102`	`if !isDeploymentConfigured && !isWorkloadConfigured {`
`103`	`103`	`return "", errors.New("invalid configuration: must set either DeploymentName (legacy) or WorkloadName with WorkloadType")`
`104`	`104`	`}`
`105`		`-`
`106`		`- switch {`
`107`		`- case isDeploymentConfigured:`
	`105`	`+ if isDeploymentConfigured {`
`108`	`106`	`r.Log.Info("Using deprecated field deploymentName, consider migrating to workloadName and workloadType")`
`109`	`107`	`return agentv1beta.WorkloadTypeDeployment, nil`
`110`		`- case isWorkloadConfigured:`
`111`		`- return spec.WorkloadType, nil`
`112`		`- default:`
`113`		`- return "", errors.New("unable to determine workload type, please check your configuration")`
`114`	`108`	`}`
	`109`	`+ return spec.WorkloadType, nil`
`115`	`110`	`}`
`116`	`111`
`117`	`112`	`// reconcileDeployment handles the reconciliation logic for Deployment workloads`