From af05eec8d155244190f90389fdb998640ded7ff4 Mon Sep 17 00:00:00 2001
From: Rob Zienert <rob@robzienert.com>
Date: Tue, 14 Mar 2017 14:44:20 -0700
Subject: [PATCH] fix(pipelinetemplate): Ensure pipelines are executed on v2
 (#1227)

---
 .../v1schema/V1SchemaExecutionGenerator.java               | 7 ++-----
 .../v1schema/model/TemplateConfiguration.java              | 5 +++++
 .../PipelineTemplatePipelinePreprocessorSpec.groovy        | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
index afc2fb5f2e..46ab535c69 100644
--- a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
+++ b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
@@ -34,13 +34,10 @@ public class V1SchemaExecutionGenerator implements ExecutionGenerator {
   @Override
   public Map<String, Object> generate(PipelineTemplate template, TemplateConfiguration configuration) {
     Map<String, Object> pipeline = new HashMap<>();
-    pipeline.put("id", configuration.getRuntimeId());
+    pipeline.put("id", Optional.ofNullable(configuration.getPipeline().getPipelineConfigId()).orElse(configuration.getRuntimeId()));
     pipeline.put("application", configuration.getPipeline().getApplication());
     pipeline.put("name", Optional.ofNullable(configuration.getPipeline().getName()).orElse("Unnamed Execution"));
-
-    if (configuration.getPipeline().getPipelineConfigId() != null) {
-      pipeline.put("pipelineConfigId", configuration.getPipeline().getPipelineConfigId());
-    }
+    pipeline.put("executionEngine", configuration.getPipeline().getExecutionEngine());
 
     // TODO rz - Ehhhh
     Configuration c = template.getConfiguration();
diff --git a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java
index 2abbf3be60..ccc6e4893e 100644
--- a/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java
+++ b/orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java
@@ -39,6 +39,7 @@ public static class PipelineDefinition {
 
     private String application;
     private String pipelineConfigId;
+    private String executionEngine = "v2";
     private String name;
     private TemplateSource template;
     private Map<String, Object> variables = new HashMap<>();
@@ -82,6 +83,10 @@ public Map<String, Object> getVariables() {
     public void setVariables(Map<String, Object> variables) {
       this.variables = variables;
     }
+
+    public String getExecutionEngine() {
+      return executionEngine;
+    }
   }
 
   public static class TemplateSource {
diff --git a/orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy b/orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
index 3ec33cb088..4c7f0f252e 100644
--- a/orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
+++ b/orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
@@ -81,6 +81,7 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
     then:
     def expected = [
       id: null,
+      executionEngine: 'v2',
       application: 'myapp',
       name: 'Unnamed Execution',
       keepWaitingPipelines: false,