fix(dcd): fixes NPE if template does not have variables (#1283)

spinnaker · Apr 18, 2017 · 5852d53 · 5852d53
1 parent 758689d
commit 5852d53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/orca-pipelinetemplate/README.md b/orca-pipelinetemplate/README.md
@@ -32,6 +32,7 @@ Then start the pipeline by sending a start `managedTemplate` pipeline request wi
 {
 	"type": "templatedPipeline",
 	"config": {
+	  "schema": "1",
 		"pipeline":{
 			"name": "My fancy DCD pipeline",
 			"application": "yourAppName",

diff --git a/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java b/...com/netflix/spinnaker/orca/pipelinetemplate/v1schema/graph/transform/RenderTransform.java
@@ -66,9 +66,11 @@ public void visitPipelineTemplate(PipelineTemplate pipelineTemplate) {
   private void render(PipelineTemplate template) {
     RenderContext context = new DefaultRenderContext(templateConfiguration.getPipeline().getApplication(), template, trigger);
 
-    template.getVariables().stream()
-      .filter(Variable::hasDefaultValue)
-      .forEach(v -> context.getVariables().put(v.getName(), v.getDefaultValue()));
+    if (template.getVariables() != null) {
+      template.getVariables().stream()
+        .filter(Variable::hasDefaultValue)
+        .forEach(v -> context.getVariables().put(v.getName(), v.getDefaultValue()));
+    }
 
     context.getVariables().putAll(templateConfiguration.getPipeline().getVariables());