fix(expressions): Include evaluation summary in v2

- ensure evaluation errors are included in precondition
spinnaker · Oct 6, 2017 · 6c85a39 · 6c85a39
1 parent 7675499
commit 6c85a39
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/pipeline/tasks/ExpressionPreconditionTask.groovy b/...c/main/groovy/com/netflix/spinnaker/orca/pipeline/tasks/ExpressionPreconditionTask.groovy
@@ -19,6 +19,7 @@ package com.netflix.spinnaker.orca.pipeline.tasks
 
 import com.netflix.spinnaker.orca.ExecutionStatus
 import com.netflix.spinnaker.orca.TaskResult
+import com.netflix.spinnaker.orca.pipeline.expressions.PipelineExpressionEvaluator
 import com.netflix.spinnaker.orca.pipeline.model.Stage
 import com.netflix.spinnaker.orca.pipeline.util.ContextParameterProcessor
 import org.springframework.beans.factory.annotation.Autowired
@@ -49,6 +50,7 @@ class ExpressionPreconditionTask implements PreconditionTask {
       expression = matcher.group(1)
     }
 
+    ensureEvaluationSummaryIncluded(result, stage, expression)
     def status = Boolean.valueOf(expression) ? ExecutionStatus.SUCCEEDED : ExecutionStatus.TERMINAL
     return new TaskResult(status, [
       context: new HashMap(stage.context.context as Map) + [
@@ -57,6 +59,13 @@ class ExpressionPreconditionTask implements PreconditionTask {
     ])
   }
 
+  private static void ensureEvaluationSummaryIncluded(Map<String, Object> result, Stage stage, String expression) {
+    if (!expression.trim().startsWith('$') && PipelineExpressionEvaluator.SUMMARY in result) {
+      stage.context[PipelineExpressionEvaluator.SUMMARY] = PipelineExpressionEvaluator.SUMMARY in stage.context ?
+        stage.context[PipelineExpressionEvaluator.SUMMARY] + result[PipelineExpressionEvaluator.SUMMARY] : result[PipelineExpressionEvaluator.SUMMARY]
+    }
+  }
+
   static class StageData {
     String expression = "false"
   }