Merge pull request #12 from gammarers/feature/cdk-version-upgrade-wit…

…h-custom-resource-naming-change feat: cdk version upgrade with custom resource naming change
gammarers · Oct 28, 2024 · 2a9d6c9 · 2a9d6c9
2 parents 482da3c + 5e08922
commit 2a9d6c9
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 39 deletions.
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projenrc.ts b/.projenrc.ts
@@ -2,7 +2,7 @@ import { awscdk, javascript } from 'projen';
 const project = new awscdk.AwsCdkConstructLibrary({
   author: 'yicr',
   authorAddress: '[email protected]',
-  cdkVersion: '2.100.0',
+  cdkVersion: '2.145.0',
   defaultReleaseBranch: 'main',
   typescriptVersion: '5.5.x',
   jsiiVersion: '5.5.x',

diff --git a/API.md b/API.md
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ const codeConnectionsHostCustomResource = new CodeConnectionsHostCustomResource(
 });
 
 // get host arn
-const hostArn = codeConnectionsHostCustomResource.getResponseField('HostArn');
+const hostArn = gitLabSelfManagedConnectionHostCustomResource.findHostArn();
 
 new codeconnections.CfnConnection(this, 'Connection', {
   connectionName: 'example-gitlab-connection',

diff --git a/package.json b/package.json
diff --git a/src/index.ts b/src/index.ts
@@ -13,6 +13,10 @@ export enum CodeConnectionsHostProviderType {
   GIT_LAB_SELF_MANAGED = 'GitLabSelfManaged',
 }
 
+export enum ResponseField {
+  HOST_ARN = 'HostArn',
+}
+
 export interface CodeConnectionsHostCustomResourceProps {
   readonly name: string;
   readonly providerEndpoint: string;
@@ -25,7 +29,7 @@ export class CodeConnectionsHostCustomResource extends cr.AwsCustomResource {
 
     // 👇 Create random 8 length string
     const random: string = crypto.createHash('shake256', { outputLength: 4 })
-      .update(cdk.Names.uniqueId(scope))
+      .update(`${cdk.Names.uniqueId(scope)}.${props.name}.${props.providerEndpoint}.${props.providerType}`)
       .digest('hex');
 
     const account = cdk.Stack.of(scope).account;
@@ -89,4 +93,9 @@ export class CodeConnectionsHostCustomResource extends cr.AwsCustomResource {
       },
     });
   }
+
+  findHostArn(): string {
+    return this.getResponseField(ResponseField.HOST_ARN);
+  }
+
 }
diff --git a/test/__snapshots__/custom-resource.bitbucket.test.ts.snap b/test/__snapshots__/custom-resource.bitbucket.test.ts.snap
diff --git a/test/__snapshots__/custom-resource.github-enterprise.test.ts.snap b/test/__snapshots__/custom-resource.github-enterprise.test.ts.snap
diff --git a/test/__snapshots__/custom-resource.github.test.ts.snap b/test/__snapshots__/custom-resource.github.test.ts.snap
diff --git a/test/__snapshots__/custom-resource.gitlab-self-managed.test.ts.snap b/test/__snapshots__/custom-resource.gitlab-self-managed.test.ts.snap
diff --git a/test/__snapshots__/custom-resource.gitlab.test.ts.snap b/test/__snapshots__/custom-resource.gitlab.test.ts.snap
diff --git a/test/custom-resource.bitbucket.test.ts b/test/custom-resource.bitbucket.test.ts
@@ -1,5 +1,6 @@
 import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
+import * as codeconnections from 'aws-cdk-lib/aws-codeconnections';
 import { AwsCustomResource } from 'aws-cdk-lib/custom-resources';
 import { CodeConnectionsHostCustomResource, CodeConnectionsHostProviderType } from '../src';
 
@@ -19,6 +20,13 @@ describe('CustomResource Testing', () => {
     providerType: CodeConnectionsHostProviderType.BIT_BUCKET,
   });
 
+  const hostArn = bitbucketConnectionHostCustomResource.findHostArn();
+
+  new codeconnections.CfnConnection(stack, 'Connection', {
+    connectionName: 'example-bitbucket-connection',
+    hostArn,
+  });
+
   const template = Template.fromStack(stack);
 
   it('Is Bitbucket Connection Host CustomResource', () => {

diff --git a/test/custom-resource.github-enterprise.test.ts b/test/custom-resource.github-enterprise.test.ts
@@ -1,5 +1,6 @@
 import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
+import * as codeconnections from 'aws-cdk-lib/aws-codeconnections';
 import { AwsCustomResource } from 'aws-cdk-lib/custom-resources';
 import { CodeConnectionsHostCustomResource, CodeConnectionsHostProviderType } from '../src';
 
@@ -19,6 +20,13 @@ describe('CustomResource Testing', () => {
     providerType: CodeConnectionsHostProviderType.GIT_HUB_ENTERPRISE_SERVER,
   });
 
+  const hostArn = gitHubEnterpriseConnectionHostCustomResource.findHostArn();
+
+  new codeconnections.CfnConnection(stack, 'Connection', {
+    connectionName: 'example-github-enterprise-connection',
+    hostArn,
+  });
+
   const template = Template.fromStack(stack);
 
   it('Is GitHub Enterprise Connection Host CustomResource', () => {

diff --git a/test/custom-resource.github.test.ts b/test/custom-resource.github.test.ts
@@ -1,5 +1,6 @@
 import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
+import * as codeconnections from 'aws-cdk-lib/aws-codeconnections';
 import { AwsCustomResource } from 'aws-cdk-lib/custom-resources';
 import { CodeConnectionsHostCustomResource, CodeConnectionsHostProviderType } from '../src';
 
@@ -19,6 +20,13 @@ describe('CustomResource Testing', () => {
     providerType: CodeConnectionsHostProviderType.GIT_HUB,
   });
 
+  const hostArn = gitHubConnectionHostCustomResource.findHostArn();
+
+  new codeconnections.CfnConnection(stack, 'Connection', {
+    connectionName: 'example-github-connection',
+    hostArn,
+  });
+
   const template = Template.fromStack(stack);
 
   it('Is GitHub Connection Host CustomResource', () => {