Composed/setexclusiveconditions

pkg/composed/errors.go

@@ -3,9 +3,6 @@ package composed
 import (
 	"errors"
 	"fmt"
-	"github.com/elliotchance/pie/v2"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"time"
 )
@@ -96,10 +93,3 @@ func (e *stopWithRequeueDelay) Delay() time.Duration {
 func StopWithRequeueDelay(d time.Duration) error {
 	return &stopWithRequeueDelay{delay: d}
 }
-
-func AnyConditionChanged(obj ObjWithConditions, conditionsToSet ...metav1.Condition) bool {
-	return pie.All(conditionsToSet, func(x metav1.Condition) bool {
-		c := meta.FindStatusCondition(*obj.Conditions(), x.Type)
-		return c == nil || c.Reason != x.Reason || c.Message != x.Message || c.Status != x.Status
-	})
-}

pkg/composed/setExclusiveConditions.go

@@ -0,0 +1,25 @@
+package composed
+
+import (
+	"github.com/elliotchance/pie/v2"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func SetExclusiveConditions(conditions *[]metav1.Condition, conditionsToSet ...metav1.Condition) bool {
+	changed := false
+
+	conditionsToRemove := pie.Filter(*conditions, func(condition metav1.Condition) bool {
+		return meta.FindStatusCondition(conditionsToSet, condition.Type) == nil
+	})
+
+	pie.Each(conditionsToRemove, func(condition metav1.Condition) {
+		changed = changed || meta.RemoveStatusCondition(conditions, condition.Type)
+	})
+
+	pie.Each(conditionsToSet, func(condition metav1.Condition) {
+		changed = changed || meta.SetStatusCondition(conditions, condition)
+	})
+
+	return changed
+}

pkg/composed/setExclusiveConditions_test.go

@@ -0,0 +1,135 @@
+package composed
+
+import (
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"testing"
+)
+
+type SetStatusConditionsSuite struct {
+	suite.Suite
+}
+
+const (
+	conditionTypeReady   = "Ready"
+	conditionTypeError   = "Error"
+	conditionTypeWarning = "Warning"
+)
+
+func (me *SetStatusConditionsSuite) TestConditionRemoved() {
+	conditions := &[]metav1.Condition{
+		{
+			Type:   conditionTypeReady,
+			Status: metav1.ConditionTrue,
+		},
+		{
+			Type:   conditionTypeError,
+			Status: metav1.ConditionTrue,
+		},
+	}
+
+	assert.True(me.T(), SetExclusiveConditions(conditions, metav1.Condition{
+		Type:   conditionTypeReady,
+		Status: metav1.ConditionTrue,
+	}), "Conditions changes should be detected, but didn't")
+
+	assert.Equal(me.T(), 1, len(*conditions))
+}
+
+func (me *SetStatusConditionsSuite) TestConditionAdded() {
+	conditions := &[]metav1.Condition{
+		{
+			Type:   conditionTypeReady,
+			Status: metav1.ConditionTrue,
+		},
+		{
+			Type:   conditionTypeError,
+			Status: metav1.ConditionTrue,
+		},
+	}
+
+	assert.True(me.T(), SetExclusiveConditions(conditions,
+		[]metav1.Condition{
+			{
+				Type:   conditionTypeReady,
+				Status: metav1.ConditionTrue,
+			},
+			{
+				Type:   conditionTypeError,
+				Status: metav1.ConditionTrue,
+			},
+			{
+				Type:   conditionTypeWarning,
+				Status: metav1.ConditionTrue,
+			},
+		}...,
+	), "Conditions changes should be detected, but didn't")
+
+	assert.Equal(me.T(), 3, len(*conditions))
+
+}
+
+func (me *SetStatusConditionsSuite) TestConditionChanged() {
+
+	conditions := &[]metav1.Condition{
+		{
+			Type:   conditionTypeReady,
+			Status: metav1.ConditionTrue,
+		},
+		{
+			Type:   conditionTypeError,
+			Status: metav1.ConditionTrue,
+		},
+	}
+
+	assert.True(me.T(), SetExclusiveConditions(conditions,
+		[]metav1.Condition{
+			{
+				Type:   conditionTypeReady,
+				Status: metav1.ConditionFalse,
+			},
+			{
+				Type:   conditionTypeError,
+				Status: metav1.ConditionTrue,
+			},
+		}...,
+	), "Conditions changes should be detected, but didn't")
+
+	assert.Equal(me.T(), 2, len(*conditions))
+
+}
+
+func (me *SetStatusConditionsSuite) TestConditionNotChanged() {
+
+	conditions := &[]metav1.Condition{
+		{
+			Type:   conditionTypeReady,
+			Status: metav1.ConditionTrue,
+		},
+		{
+			Type:   conditionTypeError,
+			Status: metav1.ConditionTrue,
+		},
+	}
+
+	assert.False(me.T(), SetExclusiveConditions(conditions,
+		[]metav1.Condition{
+			{
+				Type:   conditionTypeReady,
+				Status: metav1.ConditionTrue,
+			},
+			{
+				Type:   conditionTypeError,
+				Status: metav1.ConditionTrue,
+			},
+		}...,
+	), "Conditions changes should not be detected, but did")
+
+	assert.Equal(me.T(), 2, len(*conditions))
+
+}
+
+func TestSetStatusConditionsSuite(t *testing.T) {
+	suite.Run(t, new(SetStatusConditionsSuite))
+}

pkg/kcp/provider/aws/vpcpeering/loadRemoteVpc.go

@@ -30,19 +30,16 @@ func loadRemoteVpc(ctx context.Context, st composed.State) (error, context.Conte
 	if err != nil {
 		logger.Error(err, "Error loading remote AWS VPC Networks")
 
-		condition := metav1.Condition{
+		if !composed.SetExclusiveConditions(obj.Conditions(), metav1.Condition{
 			Type:    cloudcontrolv1beta1.ConditionTypeError,
 			Status:  metav1.ConditionTrue,
 			Reason:  cloudcontrolv1beta1.ReasonVpcNotFound,
 			Message: err.Error(),
-		}
-
-		if !composed.AnyConditionChanged(obj, condition) {
+		}) {
 			return composed.StopAndForget, nil
 		}
 
 		return composed.PatchStatus(obj).
-			SetExclusiveConditions(condition).
 			ErrorLogMessage("Error updating VpcPeering status when loading vpc").
 			SuccessError(composed.StopAndForget).
 			Run(ctx, st)
@@ -55,19 +52,16 @@ func loadRemoteVpc(ctx context.Context, st composed.State) (error, context.Conte
 			).
 			Info("VPC not found")
 
-		condition := metav1.Condition{
+		if !composed.SetExclusiveConditions(obj.Conditions(), metav1.Condition{
 			Type:    cloudcontrolv1beta1.ConditionTypeError,
 			Status:  metav1.ConditionTrue,
 			Reason:  cloudcontrolv1beta1.ReasonVpcNotFound,
 			Message: fmt.Sprintf("AWS VPC ID %s not found", remoteVpcId),
-		}
-
-		if !composed.AnyConditionChanged(obj, condition) {
+		}) {
 			return composed.StopAndForget, nil
 		}
 
 		return composed.PatchStatus(obj).
-			SetExclusiveConditions(condition).
 			ErrorLogMessage("Error updating VpcPeering status when loading vpc").
 			SuccessError(composed.StopAndForget).
 			Run(ctx, st)

pkg/skr/awsvpcpeering/updateStatus.go

@@ -15,7 +15,7 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
 
 	changed := false
 
-	if composed.AnyConditionChanged(state.ObjAsAwsVpcPeering(), *state.KcpVpcPeering.Conditions()...) {
+	if composed.SetExclusiveConditions(state.ObjAsAwsVpcPeering().Conditions(), *state.KcpVpcPeering.Conditions()...) {
 		changed = true
 	}
 
@@ -26,7 +26,6 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
 	if changed {
 		state.ObjAsAwsVpcPeering().Status.State = state.KcpVpcPeering.Status.State
 		return composed.UpdateStatus(state.ObjAsAwsVpcPeering()).
-			SetExclusiveConditions(*state.KcpVpcPeering.Conditions()...).
 			ErrorLogMessage("Error updating SKR AwsVpcPeering status").
 			SuccessLogMsg("Updated and forgot SKR AwsVpcPeering status").
 			SuccessErrorNil().

pkg/skr/azurevpcpeering/updateStatus.go

@@ -16,7 +16,7 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
 
 	changed := false
 
-	if composed.AnyConditionChanged(obj, *state.KcpVpcPeering.Conditions()...) {
+	if composed.SetExclusiveConditions(obj.Conditions(), *state.KcpVpcPeering.Conditions()...) {
 		changed = true
 	}
 
@@ -27,7 +27,6 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
 	if changed {
 		obj.Status.State = state.KcpVpcPeering.Status.State
 		return composed.UpdateStatus(obj).
-			SetExclusiveConditions(*state.KcpVpcPeering.Conditions()...).
 			ErrorLogMessage("Error updating SKR AzureVpcPeering status").
 			SuccessLogMsg("Updated and forgot SKR AzureVpcPeering status").
 			SuccessErrorNil().