feat(tasks): attach notifications to execution (#3206)

spinnaker · Oct 2, 2019 · 823ca2e · 823ca2e
1 parent ef3c8c6
commit 823ca2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java
@@ -241,7 +241,11 @@ private Execution parseOrchestration(String configJson) throws IOException {
     }
 
     if (config.get("trigger") != null) {
-      orchestration.setTrigger(objectMapper.convertValue(config.get("trigger"), Trigger.class));
+      Trigger trigger = objectMapper.convertValue(config.get("trigger"), Trigger.class);
+      orchestration.setTrigger(trigger);
+      if (!trigger.getNotifications().isEmpty()) {
+        orchestration.setNotifications(trigger.getNotifications());
+      }
     }
 
     orchestration.setBuildTime(clock.millis());

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java
@@ -286,12 +286,16 @@ public void setSource(@Nullable PipelineSource source) {
     this.source = source;
   }
 
-  private final List<Map<String, Object>> notifications = new ArrayList<>();
+  private List<Map<String, Object>> notifications = new ArrayList<>();
 
   public @Nonnull List<Map<String, Object>> getNotifications() {
     return notifications;
   }
 
+  public void setNotifications(List<Map<String, Object>> notifications) {
+    this.notifications = notifications;
+  }
+
   private final Map<String, Object> initialConfig = new HashMap<>();
 
   public @Nonnull Map<String, Object> getInitialConfig() {