use common runtime condition package (#47)

Replaces the custom conditions.go file with the common ACK runtime
pkg/condition calls.

Signed-off-by: Jay Pipes <[email protected]>

By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license.

Author: jaypipes

pkg/resource/db_cluster/conditions.go

@@ -18,6 +18,7 @@ import (
 
 	ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
 	ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
+	ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition"
 	ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
 	svcsdk "github.com/aws/aws-sdk-go/service/rds"
 	corev1 "k8s.io/api/core/v1"
@@ -41,18 +42,18 @@ func (rm *resourceManager) customUpdate(
 	defer exit(err)
 	if clusterDeleting(latest) {
 		msg := "DB cluster is currently being deleted"
-		setSyncedCondition(desired, corev1.ConditionFalse, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionFalse, &msg, nil)
 		return desired, requeueWaitWhileDeleting
 	}
 	if clusterCreating(latest) {
 		msg := "DB cluster is currently being created"
-		setSyncedCondition(desired, corev1.ConditionFalse, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionFalse, &msg, nil)
 		return desired, requeueWaitUntilCanModify(latest)
 	}
 	if clusterHasTerminalStatus(latest) {
 		msg := "DB cluster is in '" + *latest.ko.Status.Status + "' status"
-		setTerminalCondition(desired, corev1.ConditionTrue, &msg, nil)
-		setSyncedCondition(desired, corev1.ConditionTrue, nil, nil)
+		ackcondition.SetTerminal(desired, corev1.ConditionTrue, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionTrue, nil, nil)
 		return desired, nil
 	}
 

pkg/resource/db_cluster/custom_update.go

@@ -4,6 +4,6 @@
 	if clusterCreating(&resource{ko}) {
 		// Setting resource synced condition to false will trigger a requeue of
 		// the resource. No need to return a requeue error here.
-		setSyncedCondition(&resource{ko}, corev1.ConditionFalse, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil)
 		return &resource{ko}, nil
 	}

pkg/resource/db_cluster/sdk.go

@@ -1,8 +1,8 @@
 	if !clusterAvailable(&resource{ko}) {
 		// Setting resource synced condition to false will trigger a requeue of
 		// the resource. No need to return a requeue error here.
-		setSyncedCondition(&resource{ko}, corev1.ConditionFalse, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil)
 	} else {
-		setSyncedCondition(&resource{ko}, corev1.ConditionTrue, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionTrue, nil, nil)
 	}
 

pkg/resource/db_instance/conditions.go

@@ -1,16 +1,16 @@
 	if clusterDeleting(latest) {
 		msg := "DB cluster is currently being deleted"
-		setSyncedCondition(desired, corev1.ConditionFalse, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionFalse, &msg, nil)
 		return desired, requeueWaitWhileDeleting
 	}
 	if clusterCreating(latest) {
 		msg := "DB cluster is currently being created"
-		setSyncedCondition(desired, corev1.ConditionFalse, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionFalse, &msg, nil)
 		return desired, requeueWaitUntilCanModify(latest)
 	}
 	if clusterHasTerminalStatus(latest) {
 		msg := "DB cluster is in '"+*latest.ko.Status.Status+"' status"
-		setTerminalCondition(desired, corev1.ConditionTrue, &msg, nil)
-		setSyncedCondition(desired, corev1.ConditionTrue, nil, nil)
+		ackconditoin.SetTerminal(desired, corev1.ConditionTrue, &msg, nil)
+		ackcondition.SetSynced(desired, corev1.ConditionTrue, nil, nil)
 		return desired, nil
 	}

pkg/resource/db_instance/sdk.go

@@ -4,6 +4,6 @@
 	if instanceCreating(&resource{ko}) {
 		// Setting resource synced condition to false will trigger a requeue of
 		// the resource. No need to return a requeue error here.
-		setSyncedCondition(&resource{ko}, corev1.ConditionFalse, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil)
 		return &resource{ko}, nil
 	}

templates/hooks/db_cluster/sdk_create_post_set_output.go.tpl

@@ -1,8 +1,8 @@
 	if !instanceAvailable(&resource{ko}) {
 		// Setting resource synced condition to false will trigger a requeue of
 		// the resource. No need to return a requeue error here.
-		setSyncedCondition(&resource{ko}, corev1.ConditionFalse, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionFalse, nil, nil)
 	} else {
-		setSyncedCondition(&resource{ko}, corev1.ConditionTrue, nil, nil)
+		ackcondition.SetSynced(&resource{ko}, corev1.ConditionTrue, nil, nil)
     }