feat(pipeline_template): Jinja rendering in partials (#1637)

Renders the partials' stage config before rendering partials, to allow for more advanced jinja expressions in the partials.
spinnaker · Sep 21, 2017 · 5d66215 · 5d66215
1 parent ae66a6b
commit 5d66215
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java b/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
@@ -177,6 +177,8 @@ private void renderPartials(List<PartialDefinition> partials, List<StageDefiniti
       );
 
       RenderContext partialContext = context.copy();
+      partialContext.setLocation(String.format("template:stages.%s", stage.getId()));
+      renderStage(stage, partialContext, "template");
       partialContext.getVariables().putAll(stage.getConfig());
       partialContext.setLocation(String.format("partial:%s.%s", stage.getId(), partial.getId()));
 

diff --git a/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy b/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
@@ -334,6 +334,15 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
     result.stages*.group == ['my group of stages: wowow waiting', 'my group of stages: wowow waiting']
   }
 
+  def 'should render stage config variables used in partials'() {
+    when:
+    def template =  createTemplateRequest('conditional-partials.yml', [includeWait: false])
+    def result = subject.process(template)
+
+    then:
+    result.stages*.shouldBeSet == ["isSet"]
+  }
+
   @Unroll
   def 'should not render falsy conditional stages inside partials'() {
     when:

diff --git a/orca-pipelinetemplate/src/test/resources/templates/conditional-partials.yml b/orca-pipelinetemplate/src/test/resources/templates/conditional-partials.yml
@@ -3,16 +3,20 @@ id: simpleTemplate
 variables:
 - name: includeWait
   type: boolean
+- name: someVariable
+  defaultValue: someValue
 stages:
 - id: stageWithPartialsAndConditional
   type: partial.partialWithConditional
   dependsOn: []
-  config: {}
+  config:
+    anotherVariable: "{{ someVariable }}"
 
 partials:
 - id: partialWithConditional
   usage: Partial that conditionally adds a step
-  variables: []
+  variables:
+  - name: anotherVariable
   stages:
   - id: conditionalWaitOnPartial
     type: wait
@@ -24,3 +28,4 @@ partials:
     type: wait
     config:
       waitTime: 5
+      shouldBeSet: "{{ 'isSet' if anotherVariable == someVariable else 'notSet' }}"