wip

Signed-off-by: Andy Sadler <[email protected]>

Author: sadlerap

controllers/common.go

@@ -120,4 +120,5 @@ func (r *BindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	}
 	return result, nil
 }
-// end::reconcile-func[]
+
+// end::reconcile-func[]

pkg/reconcile/pipeline/handler/project/impl.go

@@ -9,7 +9,6 @@ import (
 	"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 func PreFlightCheck(mandatoryBindingKeys ...string) func(pipeline.Context) {
@@ -78,11 +77,11 @@ func BindingsAsEnv(ctx pipeline.Context) {
 	}
 
 	secretName := ctx.BindingSecretName()
-	var envVars []map[string]interface{}
+	var envVars []corev1.EnvVar
 	if len(envBindings) > 0 {
-		envVars = make([]map[string]interface{}, 0, len(envBindings))
+		envVars = make([]corev1.EnvVar, 0, len(envBindings))
 		for _, e := range envBindings {
-			u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&corev1.EnvVar{
+			u := corev1.EnvVar{
 				Name: e.Var,
 				ValueFrom: &corev1.EnvVarSource{
 					SecretKeyRef: &corev1.SecretKeySelector{
@@ -92,10 +91,6 @@ func BindingsAsEnv(ctx pipeline.Context) {
 						Key: e.Name,
 					},
 				},
-			})
-			if err != nil {
-				stop(ctx, err)
-				return
 			}
 			envVars = append(envVars, u)
 		}
@@ -109,12 +104,6 @@ func BindingsAsEnv(ctx pipeline.Context) {
 		},
 	}
 
-	u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&envFromSecret)
-	if err != nil {
-		stop(ctx, err)
-		return
-	}
-
 	for _, app := range applications {
 		containerResources, err := app.BindableContainers()
 		if err != nil {
@@ -124,7 +113,7 @@ func BindingsAsEnv(ctx pipeline.Context) {
 		for _, container := range containerResources.Containers {
 			if !ctx.BindAsFiles() {
 				// Safety: EnvFrom is available when ctx.BindAsFiles() == false
-				if err := container.AddEnvFromVars([]map[string]interface{}{u}); err != nil {
+				if err := container.AddEnvFromVar(envFromSecret); err != nil {
 					stop(ctx, err)
 					return
 				}

pkg/reconcile/pipeline/mapping.go

@@ -39,7 +39,7 @@ func FromWorkloadResourceMappingTemplate(mapping v1alpha3.ClusterWorkloadResourc
 		if err := constructRestrictedPath(container.VolumeMounts, []string{"volumeMounts"}, &wc.VolumeMounts); err != nil {
 			return nil, err
 		}
-		// not in the spec, but we need this for compatability with the downstream api
+		// not in the spec, but we need this for compatability with the coreos api
 		wc.EnvFrom = []string{"envFrom"}
 
 		path := jsonpath.New("")
@@ -145,42 +145,13 @@ func (container *MetaContainer) MountPath(bindingName string) (string, error) {
 	return mp, nil
 }
 
+type SBOMap map[string]interface{}
+
 // We can't use unstructured.SetNestedField when we try to set a field to a value of type
 // []map[string]interface{}, since (apparently) map[string]interface{} doesn't implement interface{}.
 // Runtime panics occur when using SetNestedField, and SetNesetedSlice gives a compile-time error.
 func setSlice(obj map[string]interface{}, resources []map[string]interface{}, path []string) error {
-	dest := obj
-	if len(path) > 1 {
-		slice, found, err := unstructured.NestedFieldNoCopy(obj, path[:len(path)-1]...)
-		if err != nil {
-			return err
-		} else if !found {
-			current := obj
-			for i, p := range path[:len(path)-1] {
-				x, exists := current[p]
-				y, ok := x.(map[string]interface{})
-				if !exists {
-					y = make(map[string]interface{})
-					current[p] = y
-				} else if !ok {
-					return fmt.Errorf("Value already exists at path %v", path[:i])
-				}
-				current = y
-			}
-
-			dest = current
-		} else {
-			x, ok := slice.(map[string]interface{})
-			if !ok {
-				return fmt.Errorf("Value already exists at path %v", path[:len(path)-1])
-			}
-			dest = x
-		}
-	}
-
-	key := path[len(path)-1]
-	dest[key] = resources
-	return nil
+	return unstructured.SetNestedField(obj, resources, path...)
 }
 
 func addRaw(obj map[string]interface{}, resource interface{}, data []map[string]interface{}, path []string) error {
@@ -197,8 +168,16 @@ func addRaw(obj map[string]interface{}, resource interface{}, data []map[string]
 	return setSlice(obj, nestedData, path)
 }
 
-func (container *MetaContainer) AddEnvVars(vars []map[string]interface{}) error {
-	return addRaw(container.Data, &corev1.EnvVar{}, vars, container.Env)
+func (container *MetaContainer) AddEnvVars(vars []corev1.EnvVar) error {
+	var data []map[string]interface{}
+	for _, variable := range vars {
+		x, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&variable)
+		if err != nil {
+			return err
+		}
+		data = append(data, x)
+	}
+	return addRaw(container.Data, &corev1.EnvVar{}, data, container.Env)
 }
 
 func (container *MetaContainer) RemoveEnvVars(secretName string) error {
@@ -222,9 +201,13 @@ func (container *MetaContainer) RemoveEnvVars(secretName string) error {
 	return nil
 }
 
-func (container *MetaContainer) AddEnvFromVars(vars []map[string]interface{}) error {
+func (container *MetaContainer) AddEnvFromVar(envVar corev1.EnvFromSource) error {
 	if len(container.EnvFrom) != 0 {
-		return addRaw(container.Data, &corev1.EnvFromSource{}, vars, container.EnvFrom)
+		data, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&envVar)
+		if err != nil {
+			return err
+		}
+		return addRaw(container.Data, &corev1.EnvFromSource{}, []map[string]interface{}{data}, container.EnvFrom)
 	}
 	return fmt.Errorf("No envFrom field")
 }