fix(pipeline_templates): notification inheritance (#1576)

spinnaker · Aug 25, 2017 · 6500bcf · 6500bcf
1 parent 6413bdf
commit 6500bcf
Show file tree

Hide file tree

Showing 2 changed files with 56 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
@@ -46,14 +46,14 @@ public Map<String, Object> generate(PipelineTemplate template, TemplateConfigura
       pipeline.put("parallel", true);
       pipeline.put("limitConcurrent", true);
       pipeline.put("keepWaitingPipelines", false);
-      pipeline.put("notifications", Collections.emptyList());
     } else {
       pipeline.put("parallel", c.getConcurrentExecutions().getOrDefault("parallel", true));
       pipeline.put("limitConcurrent", c.getConcurrentExecutions().getOrDefault("limitConcurrent", true));
       pipeline.put("keepWaitingPipelines", c.getConcurrentExecutions().getOrDefault("keepWaitingPipelines", false));
-      pipeline.put("notifications", c.getNotifications());
     }
 
+    addNotifications(pipeline, template, configuration);
+
     pipeline.put("stages", template.getStages()
       .stream()
       .map(s -> {
@@ -70,4 +70,21 @@ public Map<String, Object> generate(PipelineTemplate template, TemplateConfigura
 
     return pipeline;
   }
+
+  private void addNotifications(Map<String, Object> pipeline, PipelineTemplate template, TemplateConfiguration configuration) {
+    if (configuration.getConfiguration().getInherit().contains("notifications")) {
+      pipeline.put(
+        "notifications",
+        TemplateMerge.mergeNamedContent(
+          template.getConfiguration().getNotifications(),
+          configuration.getConfiguration().getNotifications()
+        )
+      );
+    } else {
+      pipeline.put(
+        "notifications",
+        Optional.ofNullable(configuration.getConfiguration().getNotifications()).orElse(Collections.emptyList())
+      );
+    }
+  }
 }
diff --git a/...om/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGeneratorSpec.groovy b/...om/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGeneratorSpec.groovy
@@ -84,6 +84,36 @@ class V1SchemaExecutionGeneratorSpec extends Specification {
     "124"  | [application: 'orca']                  || "124"
   }
 
+  @Unroll
+  def "should set notifications in execution json"() {
+    given:
+    PipelineTemplate template = getPipelineTemplate()
+    TemplateConfiguration configuration = new TemplateConfiguration(
+      pipeline: new PipelineDefinition([application: 'orca', pipelineConfigId: 'pipelineConfigId']),
+      configuration: new TemplateConfiguration.PipelineConfiguration(
+        inherit: inherit,
+        notifications: [
+          new NamedHashMap().with {
+            put('name', 'configuration-notification')
+            put('address', '[email protected]')
+            it
+          }
+        ]
+      )
+    )
+
+    when:
+    def result = subject.generate(template, configuration, "pipelineConfigId")
+
+    then:
+    result.notifications*.address == addresses
+
+    where:
+    inherit           || addresses
+    ['notifications'] || ['[email protected]', '[email protected]']
+    []                || ['[email protected]']
+  }
+
   private PipelineTemplate getPipelineTemplate() {
     new PipelineTemplate(
       id: 'simpleTemplate',
@@ -99,6 +129,13 @@ class V1SchemaExecutionGeneratorSpec extends Specification {
             put('enabled', true)
             it
           }
+        ],
+        notifications: [
+          new NamedHashMap().with {
+            put('name', 'template-notification')
+            put('address', '[email protected]')
+            it
+          }
         ]
       ),
       stages: [