fix(bitbucket): Add project key as identifier

echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWebhookEventHandler.java

@@ -161,6 +161,9 @@ private void handleBitbucketCloudEvent(Event event, Map postedEvent) {
       if (bitbucketCloudEvent.repository.owner != null) {
         repoProject = StringUtils.defaultIfEmpty(bitbucketCloudEvent.repository.owner.username, "");
       }
+      if (StringUtils.isEmpty(repoProject) && bitbucketCloudEvent.repository.project != null) {
+        repoProject = StringUtils.defaultIfEmpty(bitbucketCloudEvent.repository.project.key, "");
+      }
     }
     if (bitbucketCloudEvent.pullRequest != null) {
       BitbucketCloudEvent.PullRequest pullRequest = bitbucketCloudEvent.pullRequest;
@@ -207,13 +210,20 @@ private static class Repository {
       String fullName;
 
       Owner owner;
+
+      Project project;
     }
 
     @Data
     private static class Owner {
       String username;
     }
 
+    @Data
+    public static class Project {
+      String key;
+    }
+
     @Data
     private static class PullRequest {
       @JsonProperty("merge_commit")

echo-webhooks/src/test/groovy/com/netflix/spinnaker/echo/controllers/WebhooksControllerSpec.groovy

@@ -615,6 +615,54 @@ class WebhooksControllerSpec extends Specification {
     event.content.action == "pullrequest:fulfilled"
   }
 
+  void "handles Bitbucket Cloud Webhook PR Event with Project key"() {
+    def event
+
+    given:
+    WebhooksController controller = new WebhooksController(mapper: EchoObjectMapper.getInstance(), scmWebhookHandler: scmWebhookHandler)
+    controller.propagator = Mock(EventPropagator)
+    controller.artifactExtractor = Mock(ArtifactExtractor)
+    controller.artifactExtractor.extractArtifacts(_, _, _) >> []
+    HttpHeaders headers = new HttpHeaders();
+    headers.add("X-Event-Key", "pullrequest:fulfilled")
+
+    when:
+    def response = controller.forwardEvent(
+      "git",
+      "bitbucket",
+      """{
+          "repository": {
+            "full_name": "echo",
+            "owner": {
+              "display_name": "spinnaker"
+            },
+            "project": {
+                "key": "ECH"
+            }
+          },
+          "pullrequest": {
+            "merge_commit": {
+              "hash": "firstHash"
+             },
+             "destination": {
+              "branch": {"name": "master"}
+             }
+          }
+        }
+        """,headers)
+
+    then:
+    1 * controller.propagator.processEvent(_) >> {
+      event = it[0]
+    }
+
+    event.content.hash == "firstHash"
+    event.content.repoProject == "ECH"
+    event.content.slug == "echo"
+    event.content.branch == "master"
+    event.content.action == "pullrequest:fulfilled"
+  }
+
   void "handles Bitbucket Cloud Webhook Push Event"() {
     def event
 
@@ -664,4 +712,57 @@ class WebhooksControllerSpec extends Specification {
     event.content.branch == "master"
     event.content.action == "repo:push"
   }
+
+  void "handles Bitbucket Cloud Webhook Push Event with Project key"() {
+    def event
+
+    given:
+    WebhooksController controller = new WebhooksController(mapper: EchoObjectMapper.getInstance(), scmWebhookHandler: scmWebhookHandler)
+    controller.propagator = Mock(EventPropagator)
+    controller.artifactExtractor = Mock(ArtifactExtractor)
+    controller.artifactExtractor.extractArtifacts(_, _, _) >> []
+    HttpHeaders headers = new HttpHeaders();
+    headers.add("X-Event-Key", "repo:push")
+
+    when:
+    def response = controller.forwardEvent(
+      "git",
+      "bitbucket",
+      """{
+          "repository": {
+            "full_name": "echo",
+            "owner": {"display_name": "spinnaker"},
+            "project": {
+                "key": "ECH"
+            }
+          },
+          "push": {
+            "changes": [
+              {
+                "new": {
+                  "type": "branch",
+                  "name": "master"
+                },
+                "commits": [
+                  {
+                   "hash": "firstHash"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+        """,headers)
+
+    then:
+    1 * controller.propagator.processEvent(_) >> {
+      event = it[0]
+    }
+
+    event.content.hash == "firstHash"
+    event.content.repoProject == "ECH"
+    event.content.slug == "echo"
+    event.content.branch == "master"
+    event.content.action == "repo:push"
+  }
 }

echo-webhooks/src/test/java/com/netflix/spinnaker/echo/scm/BitbucketWebhookEventHandlerTest.java

@@ -57,7 +57,7 @@ void canHandlePayload() throws IOException {
 
     assertThat(event.content)
         .contains(
-            entry("repoProject", ""),
+            entry("repoProject", "TES"),
             entry("slug", "bitbucketfan/test_webhooks"),
             entry("hash", "9384d1bf6db69ea35cda200648ade30f8ea7b1a4"),
             entry("branch", "master"),