fix(notification): Add application to githubStatus notification context

spinnaker · Jun 10, 2021 · 6d1aae7 · 6d1aae7
1 parent a448d68
commit 6d1aae7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...ions/src/main/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java b/...ions/src/main/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgent.java
@@ -80,7 +80,9 @@ public void sendNotifications(
           String.format(
               "Stage '%s' in pipeline '%s' is %s",
               content.getStageName(), content.getPipeline(), status);
-      context = String.format("stage/%s", content.getStageName());
+      context =
+          String.format(
+              "%s/%s/stage/%s", application, content.getPipeline(), content.getStageName());
       targetUrl =
           String.format(
               "%s/#/applications/%s/executions/details/%s?pipeline=%s&stage=%d",
@@ -91,7 +93,7 @@ public void sendNotifications(
               content.getStageIndex());
     } else if (config.get("type").equals("pipeline")) {
       description = String.format("Pipeline '%s' is %s", content.getPipeline(), status);
-      context = String.format("pipeline/%s", content.getPipeline());
+      context = String.format("%s/pipeline/%s", application, content.getPipeline());
       targetUrl =
           String.format(
               "%s/#/applications/%s/executions/details/%s?pipeline=%s",

diff --git a/...rc/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy b/...rc/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
@@ -60,7 +60,7 @@ class GithubNotificationAgentSpec extends Specification {
     then:
     actualMessage.get().getDescription() ==~ expectedDescription
     actualMessage.get().getTarget_url() == "http://spinnaker.io/#/applications/whatever/executions/details/1?pipeline=foo-pipeline"
-    actualMessage.get().getContext() ==~ "pipeline/foo-pipeline"
+    actualMessage.get().getContext() ==~ "whatever/pipeline/foo-pipeline"
 
     where:
     status     || expectedDescription
@@ -109,7 +109,7 @@ class GithubNotificationAgentSpec extends Specification {
     then:
     actualMessage.get().getDescription() == expectedDescription
     actualMessage.get().getTarget_url() == "http://spinnaker.io/#/applications/whatever/executions/details/1?pipeline=foo-pipeline&stage=1"
-    actualMessage.get().getContext() == "stage/second stage"
+    actualMessage.get().getContext() == "whatever/foo-pipeline/stage/second stage"
 
     where:
     status     || expectedDescription

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.27.0
-korkVersion=7.109.0
+korkVersion=7.110.0
 kotlinVersion=1.4.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.11.0