Merge pull request #116 from SomtochiAma/helper-functions

Adds helper functions

Author: k8s-ci-robot

pkg/patterns/addon/application.go

@@ -21,8 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/utils"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
 )
@@ -43,26 +42,14 @@ const (
 
 // TransformApplicationFromStatus modifies the Application in the deployment based off the CommonStatus
 func TransformApplicationFromStatus(ctx context.Context, instance declarative.DeclarativeObject, objects *manifest.Objects) error {
-	var version string
-	var healthy bool
-	var addonObject addonsv1alpha1.CommonObject
-
-	if unstruct, ok := instance.(*unstructured.Unstructured); ok {
-		v, _, err := unstructured.NestedString(unstruct.Object, "spec", "version")
-		if err != nil {
-			return fmt.Errorf("unable to get version from unstuctured: %v", err)
-		}
-		version = v
+	version, err := utils.GetCommonVersion(instance)
+	if err != nil {
+		return fmt.Errorf("unable to get version from object: %v", err)
+	}
 
-		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
-	} else {
-		return fmt.Errorf("instance %T was not an addonsv1alpha1.CommonObject", instance)
+	healthy, err := utils.GetCommonHealth(instance)
+	if err != nil {
+		return fmt.Errorf("unable to get health from object: %v", err)
 	}
 
 	app, err := declarative.ExtractApplication(objects)

pkg/patterns/addon/pkg/loaders/fs.go

@@ -22,11 +22,10 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/utils"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"
 )
 
 var FlagChannel = "./channels"
@@ -66,29 +65,19 @@ func (c *ManifestLoader) ResolveManifest(ctx context.Context, object runtime.Obj
 		componentName string
 	)
 
-	unstruct, ok := object.(*unstructured.Unstructured)
-	if ok {
-		v, _, err := unstructured.NestedString(unstruct.Object, "spec", "version")
-		if err != nil {
-			return nil, fmt.Errorf("unable to get spec.version: %v", err)
-		}
-		version = v
-
-		c, _, err := unstructured.NestedString(unstruct.Object, "spec", "channel")
-		if err != nil {
-			return nil, fmt.Errorf("unable to get spec.version: %v", err)
-		}
-		channelName = c
+	version, err := utils.GetCommonVersion(object)
+	if err != nil {
+		return nil, err
+	}
 
-		componentName = strings.ToLower(unstruct.GetKind())
-	} else if addonObject, ok := object.(addonsv1alpha1.CommonObject); ok {
-		componentName = addonObject.ComponentName()
+	componentName, err = utils.GetCommonName(object)
+	if err != nil {
+		return nil, err
+	}
 
-		spec := addonObject.CommonSpec()
-		version = spec.Version
-		channelName = spec.Channel
-	} else {
-		return nil, fmt.Errorf("object %T was not an addonsv1alpha1.CommonObject", object)
+	channelName, err = utils.GetCommonChannel(object)
+	if err != nil {
+		return nil, err
 	}
 
 	// TODO: We should actually do id (1.1.2-aws or 1.1.1-nginx). But maybe YAGNI
@@ -122,7 +111,7 @@ func (c *ManifestLoader) ResolveManifest(ctx context.Context, object runtime.Obj
 		log.WithValues("version", version).Info("using specified version")
 	}
 	s := make(map[string]string)
-	s, err := c.repo.LoadManifest(ctx, componentName, id)
+	s, err = c.repo.LoadManifest(ctx, componentName, id)
 	if err != nil {
 		return nil, fmt.Errorf("error loading manifest: %v", err)
 	}

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

@@ -124,7 +124,7 @@ func (a *aggregator) Reconciled(ctx context.Context, src declarative.Declarative
 
 			log.WithValues("name", unstruct.GetName()).WithValues("status", status).Info("updating status")
 
-			a.client.Status().Update(ctx, instance)
+			err = a.client.Status().Update(ctx, unstruct)
 			if err != nil {
 				log.Error(err, "updating status")
 				return err

pkg/patterns/addon/pkg/utils/helpers.go

@@ -0,0 +1,66 @@
+package utils
+
+import (
+	"fmt"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"
+)
+
+func GetCommonVersion(instance runtime.Object) (string, error) {
+	switch v := instance.(type) {
+	case addonsv1alpha1.CommonObject:
+		return v.CommonSpec().Version, nil
+	case *unstructured.Unstructured:
+		version, _, err := unstructured.NestedString(v.Object, "spec", "version")
+		if err != nil {
+			return "", fmt.Errorf("unable to get version from unstuctured: %v", err)
+		}
+		return version, nil
+	default:
+		return "", fmt.Errorf("instance %T is not addonsv1alpha1.CommonObject or unstructured", v)
+	}
+}
+
+func GetCommonHealth(instance runtime.Object) (bool, error) {
+	switch v := instance.(type) {
+	case addonsv1alpha1.CommonObject:
+		return v.GetCommonStatus().Healthy, nil
+	case *unstructured.Unstructured:
+		version, _, err := unstructured.NestedBool(v.Object, "status", "healthy")
+		if err != nil {
+			return false, fmt.Errorf("unable to get version from unstuctured: %v", err)
+		}
+		return version, nil
+	default:
+		return false, fmt.Errorf("instance %T is not addonsv1alpha1.CommonObject or unstructured", v)
+	}
+}
+
+func GetCommonChannel(instance runtime.Object) (string, error) {
+	switch v := instance.(type) {
+	case addonsv1alpha1.CommonObject:
+		return v.CommonSpec().Channel, nil
+	case *unstructured.Unstructured:
+		channel, _, err := unstructured.NestedString(v.Object, "spec", "channel")
+		if err != nil {
+			return "", fmt.Errorf("unable to get version from unstuctured: %v", err)
+		}
+		return channel, nil
+	default:
+		return "", fmt.Errorf("instance %T is not addonsv1alpha1.CommonObject or unstructured", v)
+	}
+}
+
+func GetCommonName(instance runtime.Object) (string, error) {
+	switch v := instance.(type) {
+	case addonsv1alpha1.CommonObject:
+		return v.ComponentName(), nil
+	case *unstructured.Unstructured:
+		return strings.ToLower(v.GetKind()), nil
+	default:
+		return "", fmt.Errorf("instance %T is not addonsv1alpha1.CommonObject or unstructured", v)
+	}
+}