Merge branch 'master' into feature/new-ebs-types

aws · Jan 21, 2021 · 0fd879d · 0fd879d
2 parents 9ecf7b1 + 96cbe32
commit 0fd879d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts b/packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts
@@ -179,10 +179,8 @@ export class UsagePlan extends Resource {
    * @param apiKey
    */
   public addApiKey(apiKey: IApiKey): void {
-    const prefix = 'UsagePlanKeyResource';
-
     // Postfixing apikey id only from the 2nd child, to keep physicalIds of UsagePlanKey for existing CDK apps unmodifed.
-    const id = this.node.tryFindChild(prefix) ? `${prefix}:${Names.nodeUniqueId(apiKey.node)}` : prefix;
+    const id = `UsagePlanKeyResource:${Names.nodeUniqueId(apiKey.node)}`;
 
     new CfnUsagePlanKey(this, id, {
       keyId: apiKey.keyId,

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json
@@ -602,7 +602,7 @@
         "UsagePlanName": "Basic"
       }
     },
-    "myapiUsagePlanUsagePlanKeyResource050D133F": {
+    "myapiUsagePlanUsagePlanKeyResourcetestapigatewayrestapimyapiApiKeyC43601CB600D112D": {
       "Type": "AWS::ApiGateway::UsagePlanKey",
       "Properties": {
         "KeyId": {

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.usage-plan.multikey.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.usage-plan.multikey.expected.json
@@ -3,7 +3,7 @@
     "myusageplan4B391740": {
       "Type": "AWS::ApiGateway::UsagePlan"
     },
-    "myusageplanUsagePlanKeyResource095B4EA9": {
+    "myusageplanUsagePlanKeyResourcetestapigatewayusageplanmultikeymyapikey1DDABC389A2809A73": {
       "Type": "AWS::ApiGateway::UsagePlanKey",
       "Properties": {
         "KeyId": {

diff --git a/packages/@aws-cdk/aws-apigateway/test/usage-plan.test.ts b/packages/@aws-cdk/aws-apigateway/test/usage-plan.test.ts
@@ -205,4 +205,32 @@ describe('usage plan', () => {
       },
     }, ResourcePart.Properties);
   });
+
+  test('UsagePlanKeys have unique logical ids', () => {
+    // GIVEN
+    const app = new cdk.App();
+    const stack = new cdk.Stack(app, 'my-stack');
+    const usagePlan = new apigateway.UsagePlan(stack, 'my-usage-plan');
+    const apiKey1 = new apigateway.ApiKey(stack, 'my-api-key-1', {
+      apiKeyName: 'my-api-key-1',
+    });
+    const apiKey2 = new apigateway.ApiKey(stack, 'my-api-key-2', {
+      apiKeyName: 'my-api-key-2',
+    });
+
+    // WHEN
+    usagePlan.addApiKey(apiKey1);
+    usagePlan.addApiKey(apiKey2);
+
+    // THEN
+    const template = app.synth().getStackByName(stack.stackName).template;
+    const logicalIds = Object.entries(template.Resources)
+      .filter(([_, v]) => (v as any).Type === 'AWS::ApiGateway::UsagePlanKey')
+      .map(([k, _]) => k);
+
+    expect(logicalIds).toEqual([
+      'myusageplanUsagePlanKeyResourcemystackmyapikey1EE9AA1B359121274',
+      'myusageplanUsagePlanKeyResourcemystackmyapikey2B4E8EB1456DC88E9',
+    ]);
+  });
 });