fix: CodeBuild status reporting uses project name as a key in Bitbuck…

…et reporting
markusl · Dec 7, 2021 · 59803f7 · 59803f7
1 parent 74df45b
commit 59803f7
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.projenrc.js b/.projenrc.js
@@ -1,13 +1,13 @@
 const {
-  AwsCdkConstructLibrary,
+  awscdk,
 } = require('projen');
 
 const AWS_CDK_LATEST_RELEASE = '2.0.0';
 
 const PROJECT_NAME = 'cdk-codepipeline-bitbucket-build-result-reporter';
 const PROJECT_DESCRIPTION = 'A JSII construct lib for reporting AWS CodePipeline and build statuses to a Bitbucket server instance';
 
-const project = new AwsCdkConstructLibrary({
+const project = new awscdk.AwsCdkConstructLibrary({
   name: PROJECT_NAME,
   description: PROJECT_DESCRIPTION,
   authorName: 'Markus Lindqvist',

diff --git a/package.json b/package.json
diff --git a/src/index.CodeBuildStatusHandler.ts b/src/index.CodeBuildStatusHandler.ts
@@ -19,8 +19,8 @@ export const buildBitbucketBuildStatusBody = async (
   const buildId = detail['build-id'].split(':').slice(-1)[0];
   return {
     state,
-    key: `${detail['project-name']}-${buildId}`,
-    name: `CodeBuild-${detail['project-name']} (${await getCurrentAccountAlias(event.account)})`,
+    key: detail['project-name'],
+    name: `CodeBuild ${detail['project-name']} (${await getCurrentAccountAlias(event.account)} @ ${event.region})`,
     url: `https://${event.region}.console.aws.amazon.com/codesuite/codebuild/${event.account}/projects/${detail['project-name']}/build/${detail['project-name']}:${buildId}/?region=${event.region}`,
     description: `${detail['project-name']} build initiated by ${detail['additional-information'].initiator} at ${detail['additional-information']['build-start-time']}`,
   };

diff --git a/src/index.CodePipelineStatusHandler.ts b/src/index.CodePipelineStatusHandler.ts
@@ -20,7 +20,7 @@ export const buildBitbucketBuildStatusBody = async (
   return {
     state,
     key: `${detail.stage}-${detail.action}`,
-    name: `${detail.stage}-${detail.action} (${await getCurrentAccountAlias(event.account)})`,
+    name: `CodePipeline ${detail.pipeline} ${detail.stage}/${detail.action} (${await getCurrentAccountAlias(event.account)} @ ${event.region})`,
     url: `https://${event.region}.console.aws.amazon.com/codesuite/codepipeline/pipelines/${detail.pipeline}/view`,
     description: `${detail.stage}-${detail.action}`,
   };

diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap
diff --git a/test/index.CodeBuildStatusHandler.test.ts b/test/index.CodeBuildStatusHandler.test.ts
@@ -137,8 +137,8 @@ const event = (status: AwsLambda.CodeBuildStateType): AwsLambda.CodeBuildCloudWa
 test('buildBitbucketBuildStatus InProgress', async () => {
   expect(await buildBitbucketBuildStatusBody(event('IN_PROGRESS'), 'IN_PROGRESS')).toMatchObject({
     description: 'my-sample-project build initiated by MyCodeBuildDemoUser at Sep 1, 2017 4:12:29 PM',
-    key: 'my-sample-project-8745a7a9-c340-456a-9166-edf953571bEX',
-    name: 'CodeBuild-my-sample-project (123456789012)',
+    key: 'my-sample-project',
+    name: 'CodeBuild my-sample-project (123456789012 @ us-west-2)',
     state: 'INPROGRESS',
     url: 'https://us-west-2.console.aws.amazon.com/codesuite/codebuild/123456789012/projects/my-sample-project/build/my-sample-project:8745a7a9-c340-456a-9166-edf953571bEX/?region=us-west-2',
   });
@@ -147,8 +147,8 @@ test('buildBitbucketBuildStatus InProgress', async () => {
 test('buildBitbucketBuildStatus Succeeded', async () => {
   expect(await buildBitbucketBuildStatusBody(event('SUCCEEDED'), 'SUCCEEDED')).toMatchObject({
     description: 'my-sample-project build initiated by MyCodeBuildDemoUser at Sep 1, 2017 4:12:29 PM',
-    key: 'my-sample-project-8745a7a9-c340-456a-9166-edf953571bEX',
-    name: 'CodeBuild-my-sample-project (123456789012)',
+    key: 'my-sample-project',
+    name: 'CodeBuild my-sample-project (123456789012 @ us-west-2)',
     state: 'SUCCESSFUL',
     url: 'https://us-west-2.console.aws.amazon.com/codesuite/codebuild/123456789012/projects/my-sample-project/build/my-sample-project:8745a7a9-c340-456a-9166-edf953571bEX/?region=us-west-2',
   });
@@ -157,8 +157,8 @@ test('buildBitbucketBuildStatus Succeeded', async () => {
 test('buildBitbucketBuildStatus Failed', async () => {
   expect(await buildBitbucketBuildStatusBody(event('FAILED'), 'FAILED')).toMatchObject({
     description: 'my-sample-project build initiated by MyCodeBuildDemoUser at Sep 1, 2017 4:12:29 PM',
-    key: 'my-sample-project-8745a7a9-c340-456a-9166-edf953571bEX',
-    name: 'CodeBuild-my-sample-project (123456789012)',
+    key: 'my-sample-project',
+    name: 'CodeBuild my-sample-project (123456789012 @ us-west-2)',
     state: 'FAILED',
     url: 'https://us-west-2.console.aws.amazon.com/codesuite/codebuild/123456789012/projects/my-sample-project/build/my-sample-project:8745a7a9-c340-456a-9166-edf953571bEX/?region=us-west-2',
   });

diff --git a/test/index.CodePipelineStatusHandler.test.ts b/test/index.CodePipelineStatusHandler.test.ts
@@ -37,7 +37,7 @@ test('buildBitbucketBuildStatus InProgress', async () => {
   expect(await buildBitbucketBuildStatusBody(event('STARTED'), CodePipeline.ActionExecutionStatus.InProgress)).toMatchObject({
     description: 'Prod-myAction',
     key: 'Prod-myAction',
-    name: 'Prod-myAction (Pipeline_Account)',
+    name: 'CodePipeline myPipeline Prod/myAction (Pipeline_Account @ us-east-1)',
     state: 'INPROGRESS',
     url: 'https://us-east-1.console.aws.amazon.com/codesuite/codepipeline/pipelines/myPipeline/view',
   });
@@ -47,7 +47,7 @@ test('buildBitbucketBuildStatus Succeeded', async () => {
   expect(await buildBitbucketBuildStatusBody(event('SUCCEEDED'), CodePipeline.ActionExecutionStatus.Succeeded)).toMatchObject({
     description: 'Prod-myAction',
     key: 'Prod-myAction',
-    name: 'Prod-myAction (Pipeline_Account)',
+    name: 'CodePipeline myPipeline Prod/myAction (Pipeline_Account @ us-east-1)',
     state: 'SUCCESSFUL',
     url: 'https://us-east-1.console.aws.amazon.com/codesuite/codepipeline/pipelines/myPipeline/view',
   });
@@ -57,7 +57,7 @@ test('buildBitbucketBuildStatus Superseded', async () => {
   expect(await buildBitbucketBuildStatusBody(event('CANCELED'), CodePipeline.ActionExecutionStatus.Abandoned)).toMatchObject({
     description: 'Prod-myAction',
     key: 'Prod-myAction',
-    name: 'Prod-myAction (Pipeline_Account)',
+    name: 'CodePipeline myPipeline Prod/myAction (Pipeline_Account @ us-east-1)',
     state: 'SUCCESSFUL',
     url: 'https://us-east-1.console.aws.amazon.com/codesuite/codepipeline/pipelines/myPipeline/view',
   });
@@ -72,7 +72,7 @@ test('buildBitbucketBuildStatus FAILED Manual Approval is reported as success',
   }), CodePipeline.ActionExecutionStatus.Abandoned)).toMatchObject({
     description: 'Prod-myAction',
     key: 'Prod-myAction',
-    name: 'Prod-myAction (Pipeline_Account)',
+    name: 'CodePipeline myPipeline Prod/myAction (Pipeline_Account @ us-east-1)',
     state: 'SUCCESSFUL',
     url: 'https://us-east-1.console.aws.amazon.com/codesuite/codepipeline/pipelines/myPipeline/view',
   });

diff --git a/yarn.lock b/yarn.lock