[OCTRL-649] The workflow state is updated correctly when a non-critical is in ERROR.

Author: claireguyot

core/task/manager.go

@@ -681,9 +681,9 @@ func (m *Manager) configureTasks(envId uid.ID, tasks Tasks) error {
 				taskDescription = fmt.Sprintf("unknown task (id %s) failed with error: %s", k.TaskId.Value, v.Error())
 			}
 			if task.GetTraits().Critical == true || task.parent.GetTaskTraits().Critical == true {
-				taskCriticalErrors[i] = taskDescription
+				taskCriticalErrors = append(taskCriticalErrors, taskDescription)
 			} else {
-				taskNonCriticalErrors[i] = taskDescription
+				taskNonCriticalErrors = append(taskNonCriticalErrors, taskDescription)
 			}
 			i++
 		}
@@ -759,9 +759,9 @@ func (m *Manager) transitionTasks(envId uid.ID, tasks Tasks, src string, event s
 				taskDescription = fmt.Sprintf("unknown task (id %s) failed with error: %s", k.TaskId.Value, v.Error())
 			}
 			if task.GetTraits().Critical == true || task.parent.GetTaskTraits().Critical == true {
-				taskCriticalErrors[i] = taskDescription
+				taskCriticalErrors = append(taskCriticalErrors, taskDescription)
 			} else {
-				taskNonCriticalErrors[i] = taskDescription
+				taskNonCriticalErrors = append(taskNonCriticalErrors, taskDescription)
 			}
 			i++
 		}

core/workflow/safestate.go

@@ -34,14 +34,25 @@ type SafeState struct {
 	state task.State
 }
 
-func aggregateState(roles []Role) (state task.State) {
+func aggregateState(roles []Role, s task.State) (state task.State) {
 	if len(roles) == 0 {
 		state = task.INVARIANT
 		return
 	}
-	state = roles[0].GetState()
+	state = s
 	if len(roles) > 1 {
 		for _, c := range roles[1:] {
+			taskR, isTaskRole := c.(*taskRole)
+			callR, isCallRole := c.(*callRole)
+			if isTaskRole {
+				if !taskR.Critical {
+					continue
+				}
+			} else if isCallRole {
+				if !callR.Critical {
+					continue
+				}
+			}
 			if state == task.MIXED {
 				return
 			}
@@ -63,7 +74,7 @@ func (t *SafeState) merge(s task.State, r Role) {
 
 	_, isTaskRole := r.(*taskRole)
 	_, isCallRole := r.(*callRole)
-	if isTaskRole || isCallRole { // no aggregation, we just update
+	if isTaskRole || isCallRole {
 		t.state = s
 		return
 	}
@@ -77,7 +88,7 @@ func (t *SafeState) merge(s task.State, r Role) {
 		return
 	default:
 		allRoles := r.GetRoles()
-		t.state = aggregateState(allRoles)
+		t.state = aggregateState(allRoles, s)
 	}
 }