Fix panic when modifying slices

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

Author: sadlerap

pkg/reconcile/pipeline/builder/pipeline_integration_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/context"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -158,10 +159,10 @@ var _ = Describe("Default Pipeline", func() {
 		u, err = client.Resource(appGVR).Namespace(sb.Namespace).Get(c.Background(), appName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
-		u, err = client.
+		_, err = client.
 			Resource(v1alpha3.WorkloadResourceMappingGroupVersionResource).
 			Get(c.Background(), serviceGVK.GroupKind().String(), metav1.GetOptions{})
-		Expect(err).NotTo(HaveOccurred())
+		Expect(err).To(Equal(errors.NewNotFound(v1alpha3.WorkloadResourceMappingGroupVersionResource.GroupResource(), serviceGVK.GroupKind().String())), "Binding should occur without a workload resource mapping")
 
 		updatedApp := &appsv1.Deployment{}
 		err = runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, updatedApp)

pkg/reconcile/pipeline/context/impl.go

@@ -26,6 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 )
@@ -437,10 +438,25 @@ func (i *impl) Close() error {
 	}
 	for _, app := range i.applications {
 		if app.IsUpdated() {
+			// We explicitly want to marshal through json here; for some reason,
+			// runtime.DeepCopyJSON() causes panics, but marshalling then calling DeepCopyJSON (in
+			// Update()) works fine for some reason.
+			// TODO: Figure out why this is.
+			bytes, err := json.Marshal(app.Resource())
+			if err != nil {
+				return err
+			}
+
+			var clone map[string]interface{}
+			err = json.Unmarshal(bytes, &clone)
+			if err != nil {
+				return err
+			}
+			resource := &unstructured.Unstructured{Object: clone}
 			_, err = i.client.
 				Resource(app.GroupVersionResource()).
 				Namespace(i.bindingMeta.Namespace).
-				Update(context.Background(), app.Resource(), metav1.UpdateOptions{})
+				Update(context.Background(), resource, metav1.UpdateOptions{})
 			if err != nil {
 				i.SetCondition(apis.Conditions().
 					NotBindingReady().

pkg/reconcile/pipeline/mapping.go

@@ -147,7 +147,7 @@ func (container *MetaContainer) MountPath(bindingName string) (string, error) {
 // 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{}, resource []map[string]interface{}, path []string) 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]...)
@@ -177,13 +177,8 @@ func setSlice(obj map[string]interface{}, resource []map[string]interface{}, pat
 		}
 	}
 
-	dest[path[len(path)-1]] = make([]map[string]interface{}, len(resource))
-	x := dest[path[len(path)-1]].([]map[string]interface{})
-	for i, r := range resource {
-		//FIXME: This fails for some reason.  Help‽
-		x[i] = runtime.DeepCopyJSON(r)
-	}
-	fmt.Println(x)
+	key := path[len(path)-1]
+	dest[key] = resources
 	return nil
 }