fix(MPTv2): Ensures v2 templates are marked correctly for preprocessi…

…ng. (spinnaker#2566)
ziggyw · Dec 20, 2018 · a39d7e1 · a39d7e1
1 parent e199df7
commit a39d7e1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePreprocessor.kt b/...src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePreprocessor.kt
@@ -50,10 +50,12 @@ class PipelineTemplatePreprocessor
     // should be lifted to the top level like users will specify them.
     //
     // We also need to ensure that 'type' and 'schema' are set properly upstream when saving v2 template configs.
-    if (pipeline.getOrDefault(V2PipelineTemplate.SCHEMA, null) == V2PipelineTemplate.V2_SCHEMA_VERSION) {
+    if (pipeline.getOrDefault(V2PipelineTemplate.SCHEMA, null) == V2PipelineTemplate.V2_SCHEMA_VERSION &&
+      pipeline.get("template") != null) {
       val templateConfig = HashMap(pipeline)
       templateConfig.remove("trigger") // template configurations don't have a 'trigger' field.
       pipeline.put("config", templateConfig)
+      pipeline.put("type", "templatedPipeline")
     }