Moved the type-check around

Author: somtochiama

pkg/patterns/addon/application.go

@@ -54,7 +54,10 @@ func TransformApplicationFromStatus(ctx context.Context, instance declarative.De
 		}
 		version = v
 
-		healthy, _, err = unstructured.NestedBool(unstruct.Object, "spec", "healthy")
+		healthy, _, err = unstructured.NestedBool(unstruct.Object, "status", "healthy")
+		if err != nil {
+			return fmt.Errorf("unable to get status from unstuctured: %v", err)
+		}
 	} else if addonObject, ok = instance.(addonsv1alpha1.CommonObject); ok {
 		version = addonObject.CommonSpec().Version
 		healthy = addonObject.GetCommonStatus().Healthy

pkg/patterns/addon/patch.go

@@ -35,14 +35,13 @@ import (
 func ApplyPatches(ctx context.Context, object declarative.DeclarativeObject, objects *manifest.Objects) error {
 	log := log.Log
 
-	var p addonsv1alpha1.Patchable
 	var patches []*unstructured.Unstructured
 
 	unstruct, ok := object.(*unstructured.Unstructured)
 	if ok {
 		patch, _, err := unstructured.NestedSlice(unstruct.Object, "spec", "patches")
 		if err != nil {
-			return fmt.Errorf("unable to get patches from unstruct: %v", err)
+			return fmt.Errorf("unable to get patches from unstructured: %v", err)
 		}
 
 		for _, p := range patch {
@@ -51,7 +50,7 @@ func ApplyPatches(ctx context.Context, object declarative.DeclarativeObject, obj
 				Object: m,
 			})
 		}
-	} else if p, ok = object.(addonsv1alpha1.Patchable); ok{
+	} else if p, ok := object.(addonsv1alpha1.Patchable); ok{
 		for _, p := range p.PatchSpec().Patches {
 			// Object is nil, Raw  is populated (with json, even when input was yaml)
 			r := bytes.NewReader(p.Raw)

pkg/patterns/addon/pkg/status/aggregate.go

@@ -47,23 +47,9 @@ type aggregator struct {
 func (a *aggregator) Reconciled(ctx context.Context, src declarative.DeclarativeObject, objs *manifest.Objects) error {
 	log := log.Log
 
-	unstruct, ok := src.(*unstructured.Unstructured)
-	instance, commonOkay := src.(addonv1alpha1.CommonObject)
-
-	unstructStatus := make(map[string]interface{})
-	var status addonv1alpha1.CommonStatus
-
 	statusHealthy := true
 	statusErrors := []string{}
 
-	if ok{
-		unstructStatus["Healthy"] = true
-	} else if commonOkay {
-		status = addonv1alpha1.CommonStatus{Healthy: true}
-	} else {
-		return fmt.Errorf("object %T was not an addonv1alpha1.CommonObject", src)
-	}
-
 	for _, o := range objs.Items {
 		gk := o.Group + "/" + o.Kind
 		healthy := true
@@ -84,7 +70,21 @@ func (a *aggregator) Reconciled(ctx context.Context, src declarative.Declarative
 		}
 	}
 
-	log.WithValues("object", src).WithValues("status", status).V(2).Info("built status")
+	log.WithValues("object", src).WithValues("status", statusHealthy).V(2).Info("built status")
+
+	unstruct, ok := src.(*unstructured.Unstructured)
+	instance, commonOkay := src.(addonv1alpha1.CommonObject)
+
+	unstructStatus := make(map[string]interface{})
+	var status addonv1alpha1.CommonStatus
+
+	if ok{
+		unstructStatus["Healthy"] = true
+	} else if commonOkay {
+		status = addonv1alpha1.CommonStatus{Healthy: true}
+	} else {
+		return fmt.Errorf("object %T was not an addonv1alpha1.CommonObject", src)
+	}
 
 	if commonOkay {
 		status.Errors = statusErrors
@@ -111,6 +111,11 @@ func (a *aggregator) Reconciled(ctx context.Context, src declarative.Declarative
 		}
 		if !reflect.DeepEqual(status, s) {
 			err = unstructured.SetNestedField(unstruct.Object, statusHealthy, "status", "healthy")
+			if err != nil {
+				log.Error(err, "updating status")
+				return fmt.Errorf("unable to set status in unstructured", err)
+			}
+
 			err = unstructured.SetNestedStringSlice(unstruct.Object, statusErrors, "status", "errors")
 			if err != nil {
 				log.Error(err, "updating status")
@@ -127,6 +132,8 @@ func (a *aggregator) Reconciled(ctx context.Context, src declarative.Declarative
 		}
 	}
 
+
+
 	return nil
 }