fix(pipeline_template): Catch template load errors on pipeline save (#…

…1600)
spinnaker · Sep 6, 2017 · b1a8a56 · b1a8a56
1 parent c2a4d72
commit b1a8a56
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...a/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutator.java b/...a/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutator.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.spinnaker.orca.front50.PipelineModelMutator;
+import com.netflix.spinnaker.orca.pipelinetemplate.exceptions.TemplateLoaderException;
 import com.netflix.spinnaker.orca.pipelinetemplate.loader.TemplateLoader;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.NamedHashMap;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate;
@@ -27,6 +28,8 @@
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.RenderContext;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.RenderUtil;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.Renderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;
@@ -39,6 +42,8 @@
  */
 public class TemplatedPipelineModelMutator implements PipelineModelMutator {
 
+  private final static Logger log = LoggerFactory.getLogger(TemplatedPipelineModelMutator.class);
+
   private final ObjectMapper pipelineTemplateObjectMapper;
   private final TemplateLoader templateLoader;
   private final Renderer renderer;
@@ -65,7 +70,9 @@ public void mutate(Map<String, Object> pipeline) {
     // Dynamically sourced templates don't support configuration inheritance.
     if (!sourceContainsExpressions(configuration)) {
       template = getPipelineTemplate(configuration);
-      applyConfigurationsFromTemplate(configuration.getConfiguration(), template.getConfiguration(), pipeline);
+      if (template != null) {
+        applyConfigurationsFromTemplate(configuration.getConfiguration(), template.getConfiguration(), pipeline);
+      }
     }
 
     mapPipelineConfigId(pipeline, configuration);
@@ -173,7 +180,11 @@ private boolean sourceContainsExpressions(TemplateConfiguration configuration) {
   }
 
   private PipelineTemplate getPipelineTemplate(TemplateConfiguration configuration) {
-    List<PipelineTemplate> templates = templateLoader.load(configuration.getPipeline().getTemplate());
-    return TemplateMerge.merge(templates);
+    try {
+      return TemplateMerge.merge(templateLoader.load(configuration.getPipeline().getTemplate()));
+    } catch (TemplateLoaderException e) {
+      log.error("Could not load template: {}", configuration.getPipeline().getTemplate(), e);
+      return null;
+    }
   }
 }