@jaypie/constructs 1.2.44 → 1.2.46

package/dist/cjs/JaypieDistribution.d.ts

@@ -9,6 +9,15 @@ import * as wafv2 from "aws-cdk-lib/aws-wafv2";
 import { Construct } from "constructs";
 import { HostConfig } from "./helpers";
 export interface JaypieWafConfig {
+    /**
+     * Unique name for this distribution's WAF resources. Required when passing a
+     * WAF config object. Injected into the WebACL name and WAF log bucket name
+     * so multiple JaypieDistribution instances can coexist in the same
+     * account/env without S3/WAFv2 name collisions.
+     *
+     * Pass `waf: true` (or omit) to retain the legacy, non-namespaced names.
+     */
+    name: string;
     /**
      * Whether WAF is enabled
      * @default true

package/dist/cjs/index.cjs

@@ -965,6 +965,13 @@ class JaypieEnvSecret extends constructs.Construct {
         else {
             exportName = cleanName$1(exportParam);
         }
+        if (!consumer &&
+            envKey &&
+            !process.env[envKey] &&
+            value === undefined &&
+            !generateSecretString) {
+            throw new errors.ConfigurationError(`JaypieEnvSecret(${id}): envKey "${envKey}" is empty in process.env and no value or generateSecretString was provided`);
+        }
         if (consumer) {
             const secretName = cdk.Fn.importValue(exportName);
             this._secret = secretsmanager__namespace.Secret.fromSecretNameV2(this, id, secretName);
@@ -2689,14 +2696,17 @@ class JaypieDistribution extends constructs.Construct {
                         sampledRequestsEnabled: true,
                     },
                 });
+                const webAclName = wafConfig.name
+                    ? constructEnvName(`${wafConfig.name}-WebAcl`)
+                    : constructEnvName("WebAcl");
                 const webAcl = new wafv2__namespace.CfnWebACL(this, "WebAcl", {
                     defaultAction: { allow: {} },
-                    name: constructEnvName("WebAcl"),
+                    name: webAclName,
                     rules,
                     scope: "CLOUDFRONT",
                     visibilityConfig: {
                         cloudWatchMetricsEnabled: true,
-                        metricName: constructEnvName("WebAcl"),
+                        metricName: webAclName,
                         sampledRequestsEnabled: true,
                     },
                 });
@@ -2712,8 +2722,14 @@ class JaypieDistribution extends constructs.Construct {
             let wafLogBucket;
             if (wafLogBucketProp === true) {
                 // Create inline WAF logging bucket with Datadog forwarding
-                const createdBucket = new s3__namespace.Bucket(this, constructEnvName("WafLogBucket"), {
-                    bucketName: `aws-waf-logs-${constructEnvName("waf").toLowerCase()}`,
+                const wafLogBucketId = wafConfig.name
+                    ? constructEnvName(`${wafConfig.name}-WafLogBucket`)
+                    : constructEnvName("WafLogBucket");
+                const wafLogBucketName = wafConfig.name
+                    ? `aws-waf-logs-${constructEnvName(`${wafConfig.name}-waf`).toLowerCase()}`
+                    : `aws-waf-logs-${constructEnvName("waf").toLowerCase()}`;
+                const createdBucket = new s3__namespace.Bucket(this, wafLogBucketId, {
+                    bucketName: wafLogBucketName,
                     lifecycleRules: [
                         {
                             expiration: cdk.Duration.days(90),