feat(email/slack): allow custom messages per notification (#241)

spinnaker · Mar 9, 2018 · f92a9ca · f92a9ca
1 parent bd3965e
commit f92a9ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/EmailNotificationAgent.groovy b/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/EmailNotificationAgent.groovy
@@ -75,7 +75,7 @@ class EmailNotificationAgent extends AbstractEventNotificationAgent {
       status == 'complete' ? 'completed successfully' : status
     }"""
 
-    subject = context.customSubject ?: subject
+    subject = preference.customSubject ?: context.customSubject ?: subject
 
     log.info('Sending email {} for {} {} {} {}', kv('address', preference.address), kv('application', application), kv('type', config.type), kv('status', status), kv('executionId', event.content?.execution?.id))
 
@@ -88,7 +88,7 @@ class EmailNotificationAgent extends AbstractEventNotificationAgent {
       status,
       config.link,
       preference.message?."$config.type.$status"?.text,
-      context.customBody
+      preference.customBody ?: context.customBody
     )
   }
 

diff --git a/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgent.groovy b/...ons/src/main/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgent.groovy
@@ -93,7 +93,7 @@ class SlackNotificationAgent extends AbstractEventNotificationAgent {
         body += "\n\n" + preference.message."$config.type.$status".text
       }
 
-      String customMessage = event.content?.context?.customMessage
+      String customMessage = preference.customMessage ?: event.content?.context?.customMessage
       if (customMessage) {
         body = customMessage
           .replace("{{executionId}}", (String) event.content.execution?.id ?: "")