Addressing comments from Allain: re-order transition evaluation

openshift-kni · Sep 20, 2024 · 68614bf · 68614bf
1 parent 962ffae
commit 68614bf
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/internal/configfsm/fsm.go b/internal/configfsm/fsm.go
@@ -145,22 +145,21 @@ func InitFSM(state string) (fsm *stateless.StateMachine, err error) {
 			if fsmHelper.IsResetNonCompliantAt() {
 				fsmHelper.SetResetNonCompliantAtNow()
 			}
-
-			if fsmHelper.IsTimedOut() {
-				return fsm.Fire(InProgressToTimedOut, fsmHelper)
-			}
-			if fsmHelper.IsAllPoliciesCompliant() {
-				return fsm.Fire(InProgressToCompleted, fsmHelper)
-			}
 			if !fsmHelper.IsPoliciesMatched() {
 				return fsm.Fire(InProgressToMissing, fsmHelper)
 			}
 			if !fsmHelper.IsClusterReady() {
 				return fsm.Fire(InProgressToClusterNotReady, fsmHelper)
 			}
+			if fsmHelper.IsTimedOut() {
+				return fsm.Fire(InProgressToTimedOut, fsmHelper)
+			}
 			if !fsmHelper.IsNonCompliantPolicyInEnforce() && !fsmHelper.IsAllPoliciesCompliant() {
 				return fsm.Fire(InProgressToOutOfDate, fsmHelper)
 			}
+			if fsmHelper.IsAllPoliciesCompliant() {
+				return fsm.Fire(InProgressToCompleted, fsmHelper)
+			}
 			return nil
 		}).
 		Permit(InProgressToMissing, Missing).