fix(engine): ensure all parents dependencies are final

Signed-off-by: Thomas Bétrancourt <[email protected]>

engine/engine.go

@@ -931,7 +931,7 @@ func availableSteps(modifiedSteps map[string]bool, res *resolution.Resolution, e
 			// - dependency state is ANY, and depStep is in a final state
 			// - depStep is a child of a Foreach loop step in TO_RETRY state, and child is not running
 
-			if res.Steps[depStep].IsFinal() && depStates[0] == step.StateAny {
+			if res.Steps[depStep].IsFinal() && depStates[0] == step.StateAny && parentDepsAreFinal(res, res.Steps[depStep]) {
 				// if dependency doesn't require a specific state, and depStep is in a final state
 				// then dependency is matching
 				continue
@@ -992,6 +992,22 @@ func availableSteps(modifiedSteps map[string]bool, res *resolution.Resolution, e
 	return available
 }
 
+func parentDepsAreFinal(res *resolution.Resolution, stp *step.Step) bool {
+	for _, dep := range stp.Dependencies {
+		depStep, _ := step.DependencyParts(dep)
+
+		if !res.Steps[depStep].IsFinal() {
+			return false
+		}
+
+		if !parentDepsAreFinal(res, res.Steps[depStep]) {
+			return false
+		}
+	}
+
+	return true
+}
+
 func nextRetry(res *resolution.Resolution) *time.Time {
 	stepsToRetry := []*step.Step{}
 	for _, s := range res.Steps {

engine/engine_test.go

@@ -596,6 +596,21 @@ func TestAnyDependency(t *testing.T) {
 	assert.Equal(t, step.StateDone, finalOKState)
 }
 
+func TestIndirectDependencies(t *testing.T) {
+	res, err := createResolution("indirectDependencies.yaml", map[string]interface{}{}, nil)
+	assert.NotNil(t, res)
+	assert.Nil(t, err)
+
+	res, err = runResolution(res)
+	assert.NotNil(t, res)
+	assert.Nil(t, err)
+
+	assert.Equal(t, step.StateDone, res.Steps["stepOne"].State)
+	assert.Equal(t, step.StateFatalError, res.Steps["stepTwo"].State)
+	assert.Equal(t, step.StatePrune, res.Steps["stepThree"].State)
+	assert.Equal(t, step.StateTODO, res.Steps["stepFour"].State)
+}
+
 func TestMetadata(t *testing.T) {
 	res, err := createResolution("metadata.yaml", map[string]interface{}{}, nil)
 	assert.NotNil(t, res)

engine/templates_tests/indirectDependencies.yaml

@@ -0,0 +1,50 @@
+name: indirectDependencies
+description: Indirect dependencies must be verified
+title_format: "[test] indirect dependencies test"
+
+steps:
+  stepOne:
+    action:
+      type: echo
+      configuration:
+        output: {}
+    conditions:
+      - type: check
+        if:
+          - value: '1'
+            operator: EQ
+            expected: '1'
+        then:
+          stepThree: PRUNE
+
+  stepTwo:
+    dependencies:
+      - stepOne
+    action:
+      type: echo
+      configuration:
+        output: {}
+    conditions:
+      - type: check
+        if:
+          - value: '1'
+            operator: EQ
+            expected: '1'
+        then:
+          this: FATAL_ERROR
+
+  stepThree:
+    dependencies:
+      - stepTwo
+    action:
+      type: echo
+      configuration:
+        output: {}
+
+  stepFour:
+    dependencies:
+      - stepThree:ANY
+    action:
+      type: echo
+      configuration:
+        output: {}