Merge branch 'Issue853' of https://github.com/awslabs/aws-solutions-c…

…onstructs into Issue853
awslabs · Feb 15, 2023 · 3a88f07 · 3a88f07
2 parents 7a8f9d8 + b8516cb
commit 3a88f07
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.32.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.31.0...v2.32.0) (2023-02-14)
+
+Build on CDK 2.64.0
+
+### Features
+
+* **aws-wafwebacl-agigateway:** enable govcloud ([#900](https://github.com/awslabs/aws-solutions-constructs/issues/900)) ([dd19d93](https://github.com/awslabs/aws-solutions-constructs/commit/dd19d9363fa6c33b0c616a1a5392c26369bc02b2))
+
 ## [2.31.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.30.0...v2.31.0) (2023-02-09)
 
 Build on CDK 2.64.0

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.31.0"
+  "version": "2.32.0"
 }
diff --git a/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-wafwebacl-apigateway/lib/index.ts
@@ -17,7 +17,7 @@ import * as api from 'aws-cdk-lib/aws-apigateway';
 import * as waf from 'aws-cdk-lib/aws-wafv2';
 import * as defaults from '@aws-solutions-constructs/core';
 // Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate
-import { Stack } from 'aws-cdk-lib';
+import { Aws } from 'aws-cdk-lib';
 
 /**
  * @summary The properties for the WafwebaclToApiGateway class.
@@ -62,7 +62,7 @@ export class WafwebaclToApiGateway extends Construct {
       webaclProps: props.webaclProps,
     });
 
-    const resourceArn = `arn:aws:apigateway:${Stack.of(scope).region}::/restapis/${props.existingApiGatewayInterface.restApiId}/stages/${props.existingApiGatewayInterface.deploymentStage.stageName}`;
+    const resourceArn = `arn:${Aws.PARTITION}:apigateway:${Aws.REGION}::/restapis/${props.existingApiGatewayInterface.restApiId}/stages/${props.existingApiGatewayInterface.deploymentStage.stageName}`;
 
     // Setup the Web ACL Association
     new waf.CfnWebACLAssociation(scope, `${id}-WebACLAssociation`, {

diff --git a/...ructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json b/...ructs/aws-wafwebacl-apigateway/test/integ.existing-waf-to-multiple-gateways.expected.json
@@ -1055,7 +1055,11 @@
           "Fn::Join": [
             "",
             [
-              "arn:aws:apigateway:",
+              "arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":apigateway:",
               {
                 "Ref": "AWS::Region"
               },
@@ -1085,7 +1089,11 @@
           "Fn::Join": [
             "",
             [
-              "arn:aws:apigateway:",
+              "arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":apigateway:",
               {
                 "Ref": "AWS::Region"
               },

diff --git a/.../@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json b/.../@aws-solutions-constructs/aws-wafwebacl-apigateway/test/integ.no-arguments.expected.json
@@ -602,7 +602,11 @@
           "Fn::Join": [
             "",
             [
-              "arn:aws:apigateway:",
+              "arn:",
+              {
+                "Ref": "AWS::Partition"
+              },
+              ":apigateway:",
               {
                 "Ref": "AWS::Region"
               },