fix(type-safe-api): ensure uniqueness of waf web acl name

Fixes #750
aws · Apr 4, 2024 · f823fcd · f823fcd
1 parent 7afa3b7
commit f823fcd
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 124 deletions.
diff --git a/packages/type-safe-api/src/construct/waf/open-api-gateway-web-acl.ts b/packages/type-safe-api/src/construct/waf/open-api-gateway-web-acl.ts
@@ -33,12 +33,12 @@ export class OpenApiGatewayWebAcl extends Construct {
 
     const aclName = `${PDKNag.getStackPrefix(Stack.of(this))
       .split("/")
-      .join("-")}-${id}-WebAcl`;
+      .join("-")}${id}-${this.node.addr.slice(-8)}`;
     const ipSetName = `${aclName}-IPSet`;
 
     // Create the IP Set if requested
     this.ipSet = props.cidrAllowList
-      ? new CfnIPSet(this, "IPSet", {
+      ? new CfnIPSet(this, "ApiIPSet", {
           name: ipSetName,
           addresses: props.cidrAllowList.cidrRanges,
           ipAddressVersion: props.cidrAllowList.cidrType,
@@ -120,7 +120,7 @@ export class OpenApiGatewayWebAcl extends Construct {
       ),
     ];
 
-    this.webAcl = new CfnWebACL(this, "WebACL", {
+    this.webAcl = new CfnWebACL(this, "ApiWebACL", {
       name: aclName,
       defaultAction: {
         // Allow by default, and use rules to deny unwanted requests