feat(aws-codebuild): support pull_request_merged eventaction type (#3575

) * feat(aws-codebuild): support pull_request_merged eventaction type Added PULL_REQUEST_MERGED type to the EventAction Enum for use in source webhook filter groups closes #3557 * feat(aws-codebuild): fix trailing comma in codebuild test file
aws · Aug 7, 2019 · 5d4a275 · 5d4a275
1 parent 254f62c
commit 5d4a275
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/@aws-cdk/aws-codebuild/lib/source.ts b/packages/@aws-cdk/aws-codebuild/lib/source.ts
@@ -143,10 +143,15 @@ export enum EventAction {
   PULL_REQUEST_CREATED = 'PULL_REQUEST_CREATED',
 
   /**
-   * Updating an Pull Request.
+   * Updating a Pull Request.
    */
   PULL_REQUEST_UPDATED = 'PULL_REQUEST_UPDATED',
 
+  /**
+   * Merging a Pull Request.
+   */
+  PULL_REQUEST_MERGED = 'PULL_REQUEST_MERGED',
+
   /**
    * Re-opening a previously closed Pull Request.
    * Note that this event is only supported for GitHub and GitHubEnterprise sources.

diff --git a/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts b/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts
@@ -581,6 +581,7 @@ export = {
             codebuild.FilterGroup.inEventOf(
               codebuild.EventAction.PULL_REQUEST_CREATED,
               codebuild.EventAction.PULL_REQUEST_UPDATED,
+              codebuild.EventAction.PULL_REQUEST_MERGED,
             ).andTagIs('v.*'),
             // duplicate event actions are fine
             codebuild.FilterGroup.inEventOf(codebuild.EventAction.PUSH, codebuild.EventAction.PUSH).andActorAccountIsNot('aws-cdk-dev'),
@@ -602,7 +603,7 @@ export = {
           Webhook: true,
           FilterGroups: [
             [
-              { Type: 'EVENT', Pattern: 'PULL_REQUEST_CREATED, PULL_REQUEST_UPDATED' },
+              { Type: 'EVENT', Pattern: 'PULL_REQUEST_CREATED, PULL_REQUEST_UPDATED, PULL_REQUEST_MERGED' },
               { Type: 'HEAD_REF', Pattern: 'refs/tags/v.*' },
             ],
             [