feat(aws-wafwebacl-agigateway): enable govcloud (#900)

* Remove hardcoded partition * Use partition where mistakenly pasted Region * Use same pattern for region * Update integration tests
awslabs · Feb 14, 2023 · dd19d93 · dd19d93
1 parent 8a6cc12
commit dd19d93
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
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"
               },