Merge pull request #259 from anotherchrisberry/adhoc-notifications

allow users to send additional notifications when triggering pipelines
spinnaker · Jul 20, 2016 · 0a39cf4 · 0a39cf4
2 parents 1f6b96b + 71cc36a
commit 0a39cf4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/PipelineController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/PipelineController.groovy
@@ -104,6 +104,7 @@ class PipelineController {
                                   @RequestBody(required = false) Map trigger) {
     trigger = trigger ?: [:]
     trigger.user = trigger.user ?: AuthenticatedRequest.getSpinnakerUser().orElse('anonymous')
+    trigger.notifications = trigger.notifications ?: [];
 
     try {
       def body = pipelineService.trigger(application, pipelineNameOrId, trigger)

diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/PipelineService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/PipelineService.groovy
@@ -62,6 +62,13 @@ class PipelineService {
       throw new PipelineConfigNotFoundException()
     }
     pipelineConfig.trigger = trigger
+    if (trigger.notifications) {
+      if (pipelineConfig.notifications) {
+        ((List) pipelineConfig.notifications).addAll(trigger.notifications)
+      } else {
+        pipelineConfig.notifications = trigger.notifications;
+      }
+    }
     orcaService.startPipeline(pipelineConfig, trigger.user?.toString())
   }