PR review

Signed-off-by: odubajDT <[email protected]>
keptn · Feb 26, 2024 · 3e87685 · 3e87685
1 parent 81222c7
commit 3e87685
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 9 deletions.
diff --git a/lifecycle-operator/apis/lifecycle/v1beta1/common/common.go b/lifecycle-operator/apis/lifecycle/v1beta1/common/common.go
@@ -130,7 +130,8 @@ func GetOverallState(s StatusSummary) KeptnState {
 	return StateSucceeded
 }
 
-func GetOverallStateBlockedDeployment(state KeptnState, blockedDeployment bool) KeptnState {
+func GetOverallStateBlockedDeployment(s StatusSummary, blockedDeployment bool) KeptnState {
+	state := GetOverallState(s)
 	if !blockedDeployment && state == StateFailed {
 		return StateWarning
 	}

diff --git a/lifecycle-operator/apis/lifecycle/v1beta1/common/common_test.go b/lifecycle-operator/apis/lifecycle/v1beta1/common/common_test.go
@@ -266,10 +266,42 @@ func Test_GeOverallState(t *testing.T) {
 }
 
 func Test_GeOverallStateBlockedDeployment(t *testing.T) {
-	require.Equal(t, StateFailed, GetOverallStateBlockedDeployment(StateFailed, true))
-	require.Equal(t, StateWarning, GetOverallStateBlockedDeployment(StateFailed, false))
-	require.Equal(t, StateSucceeded, GetOverallStateBlockedDeployment(StateSucceeded, true))
-	require.Equal(t, StateSucceeded, GetOverallStateBlockedDeployment(StateSucceeded, false))
+	tests := []struct {
+		Name    string
+		Summary StatusSummary
+		Block   bool
+		Want    KeptnState
+	}{
+		{
+			Name:    "failed blocking",
+			Summary: StatusSummary{0, 0, 1, 0, 0, 0, 0},
+			Block:   true,
+			Want:    StateFailed,
+		},
+		{
+			Name:    "succeeded blocking",
+			Summary: StatusSummary{1, 0, 0, 1, 0, 0, 0},
+			Block:   true,
+			Want:    StateSucceeded,
+		},
+		{
+			Name:    "failed non-blocking",
+			Summary: StatusSummary{0, 0, 1, 0, 0, 0, 0},
+			Block:   false,
+			Want:    StateWarning,
+		},
+		{
+			Name:    "succeeded non-blocking",
+			Summary: StatusSummary{1, 0, 0, 1, 0, 0, 0},
+			Block:   false,
+			Want:    StateSucceeded,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.Name, func(t *testing.T) {
+			require.Equal(t, GetOverallStateBlockedDeployment(tt.Summary, tt.Block), tt.Want)
+		})
+	}
 }
 
 func Test_TruncateString(t *testing.T) {

diff --git a/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_phase.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_phase.go
@@ -29,7 +29,7 @@ func (r *KeptnAppVersionReconciler) reconcilePhase(ctx context.Context, phaseCtx
 	if err != nil {
 		return apicommon.StateUnknown, err
 	}
-	overallState := apicommon.GetOverallStateBlockedDeployment(apicommon.GetOverallState(state), r.Config.GetBlockDeployment())
+	overallState := apicommon.GetOverallStateBlockedDeployment(state, r.Config.GetBlockDeployment())
 
 	switch checkType {
 	case apicommon.PreDeploymentCheckType:

diff --git a/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go
@@ -21,7 +21,7 @@ func (r *KeptnAppVersionReconciler) reconcilePrePostEvaluation(ctx context.Conte
 		return apicommon.StateUnknown, err
 	}
 
-	overallState := apicommon.GetOverallStateBlockedDeployment(apicommon.GetOverallState(state), r.Config.GetBlockDeployment())
+	overallState := apicommon.GetOverallStateBlockedDeployment(state, r.Config.GetBlockDeployment())
 
 	switch checkType {
 	case apicommon.PreDeploymentEvaluationCheckType:

diff --git a/lifecycle-operator/controllers/lifecycle/keptnworkloadversion/reconcile_prepostdeployment.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadversion/reconcile_prepostdeployment.go
@@ -30,7 +30,7 @@ func (r *KeptnWorkloadVersionReconciler) reconcilePrePostDeployment(ctx context.
 		return apicommon.StateUnknown, err
 	}
 
-	overallState := apicommon.GetOverallStateBlockedDeployment(apicommon.GetOverallState(state), r.Config.GetBlockDeployment())
+	overallState := apicommon.GetOverallStateBlockedDeployment(state, r.Config.GetBlockDeployment())
 
 	switch checkType {
 	case apicommon.PreDeploymentCheckType:

diff --git a/lifecycle-operator/controllers/lifecycle/keptnworkloadversion/reconcile_prepostevaluation.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadversion/reconcile_prepostevaluation.go
@@ -21,7 +21,7 @@ func (r *KeptnWorkloadVersionReconciler) reconcilePrePostEvaluation(ctx context.
 		return apicommon.StateUnknown, err
 	}
 
-	overallState := apicommon.GetOverallStateBlockedDeployment(apicommon.GetOverallState(state), r.Config.GetBlockDeployment())
+	overallState := apicommon.GetOverallStateBlockedDeployment(state, r.Config.GetBlockDeployment())
 
 	switch checkType {
 	case apicommon.PreDeploymentEvaluationCheckType: