fix(pipelinetemplate): Allow associating to an existing pipelineConfi…

…gId (#1226)
spinnaker · Mar 14, 2017 · ee7a401 · ee7a401
1 parent 494c027
commit ee7a401
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
@@ -37,8 +37,10 @@ public Map<String, Object> generate(PipelineTemplate template, TemplateConfigura
     pipeline.put("id", configuration.getRuntimeId());
     pipeline.put("application", configuration.getPipeline().getApplication());
     pipeline.put("name", Optional.ofNullable(configuration.getPipeline().getName()).orElse("Unnamed Execution"));
-    // TODO Doesn't look like we even use this anywhere in the codebase.
-//    pipeline.put("appConfig", "unsupported");
+
+    if (configuration.getPipeline().getPipelineConfigId() != null) {
+      pipeline.put("pipelineConfigId", configuration.getPipeline().getPipelineConfigId());
+    }
 
     // TODO rz - Ehhhh
     Configuration c = template.getConfiguration();

diff --git a/...ava/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java b/...ava/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java
@@ -36,6 +36,7 @@ public class TemplateConfiguration {
   public static class PipelineDefinition {
 
     private String application;
+    private String pipelineConfigId;
     private String name;
     private TemplateSource template;
     private Map<String, Object> variables = new HashMap<>();
@@ -48,6 +49,14 @@ public void setApplication(String application) {
       this.application = application;
     }
 
+    public String getPipelineConfigId() {
+      return pipelineConfigId;
+    }
+
+    public void setPipelineConfigId(String pipelineConfigId) {
+      this.pipelineConfigId = pipelineConfigId;
+    }
+
     public String getName() {
       return name;
     }