Export BuildTemplateData and use it

Signed-off-by: Klaudiusz Fabryczny <klaudiusz.fabryczny@sap.com>

Author: k-fabryczny

internal/controller/plugin/pluginpreset_values_resolver.go

@@ -71,7 +71,24 @@ func (r *PluginPresetReconciler) resolveExpressionsForPreset(
 		return preset.Spec.Plugin.OptionValues, nil
 	}
 
-	templateData, err := r.buildTemplateData(ctx, preset, cluster)
+	tempPlugin := greenhousev1alpha1.Plugin{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      preset.Name,
+			Namespace: preset.Namespace,
+			Labels:    preset.Labels,
+		},
+		Spec: greenhousev1alpha1.PluginSpec{
+			ClusterName: cluster.Name,
+		},
+	}
+
+	greenhouseValuesList, err := helm.GetGreenhouseValues(ctx, r.Client, tempPlugin)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get greenhouse values: %w", err)
+	}
+
+	templateData, err := helm.BuildTemplateData(greenhouseValuesList)
+
 	if err != nil {
 		return nil, fmt.Errorf("failed to build template data: %w", err)
 	}
@@ -357,61 +374,6 @@ func evaluateCELWithObject(expression string, object map[string]any) (any, error
 	return cel.EvaluateWithData(expr, env, evalData)
 }
 
-// buildTemplateData creates the template data map for CEL expression evaluation.
-func (r *PluginPresetReconciler) buildTemplateData(
-	ctx context.Context,
-	preset *greenhousev1alpha1.PluginPreset,
-	cluster *greenhousev1alpha1.Cluster,
-) (map[string]any, error) {
-
-	tempPlugin := greenhousev1alpha1.Plugin{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      preset.Name,
-			Namespace: preset.Namespace,
-			Labels:    preset.Labels,
-		},
-		Spec: greenhousev1alpha1.PluginSpec{
-			ClusterName: cluster.Name,
-		},
-	}
-
-	greenhouseValuesList, err := helm.GetGreenhouseValues(ctx, r.Client, tempPlugin)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get greenhouse values: %w", err)
-	}
-
-	templateData := make(map[string]any)
-	for _, gv := range greenhouseValuesList {
-		if gv.Value != nil {
-			var value any
-			if err := json.Unmarshal(gv.Value.Raw, &value); err != nil {
-				return nil, fmt.Errorf("failed to unmarshal greenhouse value %s: %w", gv.Name, err)
-			}
-			parts := strings.Split(gv.Name, ".")
-			setNestedValue(templateData, parts, value)
-		}
-	}
-
-	return templateData, nil
-}
-
-// setNestedValue sets a value in a nested map using a slice of keys.
-func setNestedValue(m map[string]any, keys []string, value any) {
-	if len(keys) == 0 {
-		return
-	}
-	if len(keys) == 1 {
-		m[keys[0]] = value
-		return
-	}
-	if _, ok := m[keys[0]]; !ok {
-		m[keys[0]] = make(map[string]any)
-	}
-	if nested, ok := m[keys[0]].(map[string]any); ok {
-		setNestedValue(nested, keys[1:], value)
-	}
-}
-
 // applyOverridesToPreset returns a copy of the preset with cluster-specific overrides merged.
 func applyOverridesToPreset(preset *greenhousev1alpha1.PluginPreset, clusterName string) *greenhousev1alpha1.PluginPreset {
 	presetCopy := preset.DeepCopy()

internal/helm/cel.go

@@ -20,7 +20,7 @@ type CELResolver struct {
 
 // NewCELResolver creates a new CELResolver for a given Plugin.
 func NewCELResolver(optionValues []greenhousev1alpha1.PluginOptionValue) (*CELResolver, error) {
-	templateData, err := buildTemplateData(optionValues)
+	templateData, err := BuildTemplateData(optionValues)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build template data: %w", err)
 	}
@@ -59,8 +59,8 @@ func (c *CELResolver) ResolveExpression(optionValue greenhousev1alpha1.PluginOpt
 	}, nil
 }
 
-// buildTemplateData extracts global.greenhouse.* values to build template data for CEL evaluation.
-func buildTemplateData(optionValues []greenhousev1alpha1.PluginOptionValue) (map[string]any, error) {
+// BuildTemplateData extracts global.greenhouse.* values to build template data for CEL evaluation.
+func BuildTemplateData(optionValues []greenhousev1alpha1.PluginOptionValue) (map[string]any, error) {
 	greenhouseValues := make([]greenhousev1alpha1.PluginOptionValue, 0)
 	for _, optionValue := range optionValues {
 		// Include global.greenhouse.* values for CEL evaluation.