fix(api-usage-plan): update cfn templates with api usage plan (#400)

hnishar · web-flow · commit 57afba81ce0d · 2021-09-27T14:58:30.000-04:00
* fix(api-usage-plan): update cfn templates with api usage plan

* fix(api-usage-plan): update cfn templates with api usage plan
diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.overrideParams.expected.json
@@ -1263,7 +1263,7 @@
         ]
       }
     },
-    "testapigatewayiotRestApiUsagePlanUsagePlanKeyResource427DC49B": {
+    "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideParamstestapigatewayiotRestApiApiKey9DF117C022AD8BF0": {
       "Type": "AWS::ApiGateway::UsagePlanKey",
       "Properties": {
         "KeyId": {
diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json b/source/patterns/@aws-solutions-constructs/aws-apigateway-iot/test/integ.override_auth_api_keys.expected.json
@@ -1261,7 +1261,7 @@
         ]
       }
     },
-    "testapigatewayiotRestApiUsagePlanUsagePlanKeyResource427DC49B": {
+    "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideauthapikeystestapigatewayiotRestApiApiKey393D3E36B43FA58D": {
       "Type": "AWS::ApiGateway::UsagePlanKey",
       "Properties": {
         "KeyId": {
diff --git a/source/tools/cdk-integ-tools/bin/cdk-integ-assert.ts b/source/tools/cdk-integ-tools/bin/cdk-integ-assert.ts
@@ -24,7 +24,8 @@ async function main() {
     // Enable Default KMS policy to match with CDK v2 expected KMS policy
     let actual = await test.cdkSynthFast(deepmerge(DEFAULT_SYNTH_OPTIONS, {
       context: {
-        '@aws-cdk/aws-kms:defaultKeyPolicies': true
+        '@aws-cdk/aws-kms:defaultKeyPolicies': true,
+        '@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId' : true
       }
     }));
 
diff --git a/source/tools/cdk-integ-tools/bin/cdk-integ.ts b/source/tools/cdk-integ-tools/bin/cdk-integ.ts
@@ -54,7 +54,8 @@ async function main() {
       // Enable Default KMS policy to match with CDK v2 expected KMS policy
       const actual = await test.cdkSynthFast(deepmerge(DEFAULT_SYNTH_OPTIONS, {
         context: {
-          '@aws-cdk/aws-kms:defaultKeyPolicies': true
+          '@aws-cdk/aws-kms:defaultKeyPolicies': true,
+          '@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId' : true
         }
       }));
 

Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@`
`1263`	`1263`	`]`
`1264`	`1264`	`}`
`1265`	`1265`	`},`
`1266`		`- "testapigatewayiotRestApiUsagePlanUsagePlanKeyResource427DC49B": {`
	`1266`	`+ "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideParamstestapigatewayiotRestApiApiKey9DF117C022AD8BF0": {`
`1267`	`1267`	`"Type": "AWS::ApiGateway::UsagePlanKey",`
`1268`	`1268`	`"Properties": {`
`1269`	`1269`	`"KeyId": {`
Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,7 @@`
`1261`	`1261`	`]`
`1262`	`1262`	`}`
`1263`	`1263`	`},`
`1264`		`- "testapigatewayiotRestApiUsagePlanUsagePlanKeyResource427DC49B": {`
	`1264`	`+ "testapigatewayiotRestApiUsagePlanUsagePlanKeyResourceoverrideauthapikeystestapigatewayiotRestApiApiKey393D3E36B43FA58D": {`
`1265`	`1265`	`"Type": "AWS::ApiGateway::UsagePlanKey",`
`1266`	`1266`	`"Properties": {`
`1267`	`1267`	`"KeyId": {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ async function main() {`
`24`	`24`	`// Enable Default KMS policy to match with CDK v2 expected KMS policy`
`25`	`25`	`let actual = await test.cdkSynthFast(deepmerge(DEFAULT_SYNTH_OPTIONS, {`
`26`	`26`	`context: {`
`27`		`- '@aws-cdk/aws-kms:defaultKeyPolicies': true`
	`27`	`+ '@aws-cdk/aws-kms:defaultKeyPolicies': true,`
	`28`	`+ '@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId' : true`
`28`	`29`	`}`
`29`	`30`	`}));`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ async function main() {`
`54`	`54`	`// Enable Default KMS policy to match with CDK v2 expected KMS policy`
`55`	`55`	`const actual = await test.cdkSynthFast(deepmerge(DEFAULT_SYNTH_OPTIONS, {`
`56`	`56`	`context: {`
`57`		`- '@aws-cdk/aws-kms:defaultKeyPolicies': true`
	`57`	`+ '@aws-cdk/aws-kms:defaultKeyPolicies': true,`
	`58`	`+ '@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId' : true`
`58`	`59`	`}`
`59`	`60`	`}));`
`60`	`61`