@jaypie/constructs 1.1.42 → 1.1.43

package/dist/cjs/index.cjs

@@ -1,14 +1,15 @@
 'use strict';
 
 var constructs = require('constructs');
-var cdk = require('aws-cdk-lib');
+var cdk$1 = require('aws-cdk-lib');
 var acm = require('aws-cdk-lib/aws-certificatemanager');
 var apiGateway = require('aws-cdk-lib/aws-apigateway');
 var route53 = require('aws-cdk-lib/aws-route53');
 var route53Targets = require('aws-cdk-lib/aws-route53-targets');
-var cdk$1 = require('@jaypie/cdk');
-var lambda = require('aws-cdk-lib/aws-lambda');
+var cdk = require('@jaypie/cdk');
 var secretsmanager = require('aws-cdk-lib/aws-secretsmanager');
+var datadogCdkConstructsV2 = require('datadog-cdk-constructs-v2');
+var lambda = require('aws-cdk-lib/aws-lambda');
 var s3 = require('aws-cdk-lib/aws-s3');
 var s3n = require('aws-cdk-lib/aws-s3-notifications');
 var sqs = require('aws-cdk-lib/aws-sqs');
@@ -36,13 +37,13 @@ function _interopNamespaceDefault(e) {
     return Object.freeze(n);
 }
 
-var cdk__namespace = /*#__PURE__*/_interopNamespaceDefault(cdk);
+var cdk__namespace = /*#__PURE__*/_interopNamespaceDefault(cdk$1);
 var acm__namespace = /*#__PURE__*/_interopNamespaceDefault(acm);
 var apiGateway__namespace = /*#__PURE__*/_interopNamespaceDefault(apiGateway);
 var route53__namespace = /*#__PURE__*/_interopNamespaceDefault(route53);
 var route53Targets__namespace = /*#__PURE__*/_interopNamespaceDefault(route53Targets);
-var lambda__namespace = /*#__PURE__*/_interopNamespaceDefault(lambda);
 var secretsmanager__namespace = /*#__PURE__*/_interopNamespaceDefault(secretsmanager);
+var lambda__namespace = /*#__PURE__*/_interopNamespaceDefault(lambda);
 var s3__namespace = /*#__PURE__*/_interopNamespaceDefault(s3);
 var s3n__namespace = /*#__PURE__*/_interopNamespaceDefault(s3n);
 var sqs__namespace = /*#__PURE__*/_interopNamespaceDefault(sqs);
@@ -51,23 +52,14 @@ var sso__namespace = /*#__PURE__*/_interopNamespaceDefault(sso);
 var cloudfront__namespace = /*#__PURE__*/_interopNamespaceDefault(cloudfront);
 var origins__namespace = /*#__PURE__*/_interopNamespaceDefault(origins);
 
-function addDatadogLayer(lambdaFunction, options = {}) {
-    const { datadogApiKeyArn } = options;
-    // Resolve the Datadog API key ARN from multiple sources
+function addDatadogLayers(lambdaFunction, options = {}) {
+    const datadogApiKeyArn = options?.datadogApiKeyArn;
     const resolvedDatadogApiKeyArn = datadogApiKeyArn ||
         process.env.DATADOG_API_KEY_ARN ||
         process.env.CDK_ENV_DATADOG_API_KEY_ARN;
-    // Return false if no API key is found
     if (!resolvedDatadogApiKeyArn) {
         return false;
     }
-    const stack = cdk.Stack.of(lambdaFunction);
-    // Create Datadog Node.js layer
-    const datadogNodeLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(stack, `DatadogNodeLayer-${lambdaFunction.node.id}`, `arn:aws:lambda:${stack.region}:464622532012:layer:Datadog-Node20-x:${cdk$1.CDK.DATADOG.LAYER.NODE}`);
-    // Create Datadog Extension layer
-    const datadogExtensionLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(stack, `DatadogExtensionLayer-${lambdaFunction.node.id}`, `arn:aws:lambda:${stack.region}:464622532012:layer:Datadog-Extension:${cdk$1.CDK.DATADOG.LAYER.EXTENSION}`);
-    // Add layers to the lambda function
-    lambdaFunction.addLayers(datadogNodeLayer, datadogExtensionLayer);
     // Define Datadog environment variables
     const datadogEnvVars = {
         DD_API_KEY_SECRET_ARN: resolvedDatadogApiKeyArn,
@@ -76,74 +68,27 @@ function addDatadogLayer(lambdaFunction, options = {}) {
         DD_PROFILING_ENABLED: "false",
         DD_SERVERLESS_APPSEC_ENABLED: "false",
         DD_SERVICE: process.env.PROJECT_SERVICE || "",
-        DD_SITE: cdk$1.CDK.DATADOG.SITE,
-        DD_TAGS: `${cdk$1.CDK.TAG.SPONSOR}:${process.env.PROJECT_SPONSOR || ""}`,
+        DD_SITE: cdk.CDK.DATADOG.SITE,
+        DD_TAGS: `${cdk.CDK.TAG.SPONSOR}:${process.env.PROJECT_SPONSOR || ""}`,
         DD_TRACE_OTEL_ENABLED: "false",
     };
     // Add environment variables only if they don't already exist
     Object.entries(datadogEnvVars).forEach(([key, value]) => {
-        if (lambdaFunction.environment[key] === undefined) {
-            lambdaFunction.addEnvironment(key, value);
-        }
+        lambdaFunction.addEnvironment(key, value);
+    });
+    const datadogApiKeySecret = secretsmanager__namespace.Secret.fromSecretNameV2(lambdaFunction.stack, "DatadogApiKey", resolvedDatadogApiKeyArn);
+    const datadogLambda = new datadogCdkConstructsV2.DatadogLambda(lambdaFunction.stack, "DatadogLambda", {
+        apiKeySecret: datadogApiKeySecret, // apiKeySecret auto-grants secret access to the added lambdas
+        nodeLayerVersion: cdk.CDK.DATADOG.LAYER.NODE,
+        extensionLayerVersion: cdk.CDK.DATADOG.LAYER.EXTENSION,
+        env: process.env.PROJECT_ENV,
+        service: process.env.PROJECT_SERVICE,
+        version: process.env.PROJECT_VERSION,
     });
-    // Grant Datadog API key read permission
-    const datadogApiKey = secretsmanager__namespace.Secret.fromSecretCompleteArn(stack, `DatadogApiKeyGrant-${lambdaFunction.node.id}`, resolvedDatadogApiKeyArn);
-    datadogApiKey.grantRead(lambdaFunction);
+    datadogLambda.addLambdaFunctions([lambdaFunction]);
     return true;
 }
 
-function addParamsAndSecrets(lambdaFunction, options = {}) {
-    const { paramsAndSecrets, paramsAndSecretsOptions } = options;
-    // Return false if explicitly disabled
-    if (paramsAndSecrets === false) {
-        return false;
-    }
-    const stack = cdk.Stack.of(lambdaFunction);
-    let resolvedLayer = undefined;
-    if (paramsAndSecrets instanceof lambda__namespace.ParamsAndSecretsLayerVersion) {
-        // For custom ParamsAndSecretsLayerVersion, we need to extract the ARN
-        // This is a workaround since ParamsAndSecretsLayerVersion doesn't implement ILayerVersion
-        const layerArn = `arn:aws:lambda:${stack.region}:017000801446:layer:AWSLambdaParametersAndSecrets:${lambda__namespace.ParamsAndSecretsVersions.V1_0_103}`;
-        resolvedLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(stack, `ParamsAndSecretsLayer-${lambdaFunction.node.id}`, layerArn);
-        // Set environment variables for configuration
-        if (paramsAndSecretsOptions?.cacheSize) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_CACHE_SIZE", paramsAndSecretsOptions.cacheSize.toString());
-        }
-        if (paramsAndSecretsOptions?.logLevel) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_LOG_LEVEL", paramsAndSecretsOptions.logLevel);
-        }
-        if (paramsAndSecretsOptions?.parameterStoreTtl) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_PARAMETER_STORE_TTL", paramsAndSecretsOptions.parameterStoreTtl.toString());
-        }
-        if (paramsAndSecretsOptions?.secretsManagerTtl) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_SECRETS_MANAGER_TTL", paramsAndSecretsOptions.secretsManagerTtl.toString());
-        }
-    }
-    else {
-        // Create default ParamsAndSecrets layer using LayerVersion.fromLayerVersionArn
-        const layerArn = `arn:aws:lambda:${stack.region}:017000801446:layer:AWSLambdaParametersAndSecrets:${lambda__namespace.ParamsAndSecretsVersions.V1_0_103}`;
-        resolvedLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(stack, `ParamsAndSecretsLayer-${lambdaFunction.node.id}`, layerArn);
-        // Set default environment variables
-        if (paramsAndSecretsOptions?.cacheSize) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_CACHE_SIZE", paramsAndSecretsOptions.cacheSize.toString());
-        }
-        const logLevel = paramsAndSecretsOptions?.logLevel || lambda__namespace.ParamsAndSecretsLogLevel.WARN;
-        lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_LOG_LEVEL", logLevel);
-        if (paramsAndSecretsOptions?.parameterStoreTtl) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_PARAMETER_STORE_TTL", paramsAndSecretsOptions.parameterStoreTtl.toString());
-        }
-        if (paramsAndSecretsOptions?.secretsManagerTtl) {
-            lambdaFunction.addEnvironment("PARAMETERS_SECRETS_EXTENSION_SECRETS_MANAGER_TTL", paramsAndSecretsOptions.secretsManagerTtl.toString());
-        }
-    }
-    // Add the layer to the lambda function
-    if (resolvedLayer) {
-        lambdaFunction.addLayers(resolvedLayer);
-        return true;
-    }
-    return false;
-}
-
 function constructEnvName(name, opts) {
     const env = opts?.env ?? process.env.PROJECT_ENV ?? "build";
     const key = opts?.key ?? process.env.PROJECT_KEY ?? "project";
@@ -187,35 +132,35 @@ function constructTagger(construct, { name } = {}) {
     const stackName = name || constructStackName();
     const version = process.env.npm_package_version || process.env.PROJECT_VERSION || null;
     if (process.env.PROJECT_COMMIT && process.env.PROJECT_COMMIT.length > 8) {
-        cdk.Tags.of(construct).add(CDK$1.TAG.BUILD_HEX, process.env.PROJECT_COMMIT.slice(0, 8));
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.BUILD_HEX, process.env.PROJECT_COMMIT.slice(0, 8));
     }
-    cdk.Tags.of(construct).add(CDK$1.TAG.BUILD_DATE, new Date().toISOString());
-    cdk.Tags.of(construct).add(CDK$1.TAG.BUILD_TIME, Date.now().toString());
+    cdk$1.Tags.of(construct).add(CDK$1.TAG.BUILD_DATE, new Date().toISOString());
+    cdk$1.Tags.of(construct).add(CDK$1.TAG.BUILD_TIME, Date.now().toString());
     if (process.env.PROJECT_COMMIT)
-        cdk.Tags.of(construct).add(CDK$1.TAG.COMMIT, process.env.PROJECT_COMMIT);
-    cdk.Tags.of(construct).add(CDK$1.TAG.CREATION, CDK$1.CREATION.CDK);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.COMMIT, process.env.PROJECT_COMMIT);
+    cdk$1.Tags.of(construct).add(CDK$1.TAG.CREATION, CDK$1.CREATION.CDK);
     if (process.env.PROJECT_ENV)
-        cdk.Tags.of(construct).add(CDK$1.TAG.ENV, process.env.PROJECT_ENV);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.ENV, process.env.PROJECT_ENV);
     if (process.env.PROJECT_NONCE)
-        cdk.Tags.of(construct).add(CDK$1.TAG.NONCE, process.env.PROJECT_NONCE);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.NONCE, process.env.PROJECT_NONCE);
     if (process.env.PROJECT_KEY)
-        cdk.Tags.of(construct).add(CDK$1.TAG.PROJECT, process.env.PROJECT_KEY);
-    cdk.Tags.of(construct).add(CDK$1.TAG.ROLE, CDK$1.ROLE.STACK);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.PROJECT, process.env.PROJECT_KEY);
+    cdk$1.Tags.of(construct).add(CDK$1.TAG.ROLE, CDK$1.ROLE.STACK);
     if (process.env.PROJECT_SERVICE)
-        cdk.Tags.of(construct).add(CDK$1.TAG.SERVICE, process.env.PROJECT_SERVICE);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.SERVICE, process.env.PROJECT_SERVICE);
     if (process.env.PROJECT_SPONSOR)
-        cdk.Tags.of(construct).add(CDK$1.TAG.SPONSOR, process.env.PROJECT_SPONSOR);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.SPONSOR, process.env.PROJECT_SPONSOR);
     if (stackName)
-        cdk.Tags.of(construct).add(CDK$1.TAG.STACK, stackName);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.STACK, stackName);
     if (version)
-        cdk.Tags.of(construct).add(CDK$1.TAG.VERSION, version);
+        cdk$1.Tags.of(construct).add(CDK$1.TAG.VERSION, version);
     return true;
 }
 
 function envHostname({ component, domain, env, subdomain, } = {}) {
     const resolvedDomain = domain || process.env.CDK_ENV_DOMAIN || process.env.CDK_ENV_HOSTED_ZONE;
     if (!resolvedDomain) {
-        throw new cdk$1.ConfigurationError("No hostname `domain` provided. Set CDK_ENV_DOMAIN or CDK_ENV_HOSTED_ZONE to use environment domain");
+        throw new cdk.ConfigurationError("No hostname `domain` provided. Set CDK_ENV_DOMAIN or CDK_ENV_HOSTED_ZONE to use environment domain");
     }
     const resolvedComponent = component === "@" || component === "" ? undefined : component;
     const resolvedSubdomain = subdomain || process.env.CDK_ENV_SUBDOMAIN;
@@ -239,13 +184,13 @@ function isEnv(env) {
  * Check if the current environment is production
  */
 function isProductionEnv() {
-    return isEnv(cdk$1.CDK.ENV.PRODUCTION);
+    return isEnv(cdk.CDK.ENV.PRODUCTION);
 }
 /**
  * Check if the current environment is sandbox
  */
 function isSandboxEnv() {
-    return isEnv(cdk$1.CDK.ENV.SANDBOX);
+    return isEnv(cdk.CDK.ENV.SANDBOX);
 }
 
 function jaypieLambdaEnv(options = {}) {
@@ -302,9 +247,28 @@ function jaypieLambdaEnv(options = {}) {
     return environment;
 }
 
+function resolveDatadogLayers(scope, options = {}) {
+    const { datadogApiKeyArn, uniqueId } = options;
+    let resolvedRegion = cdk$1.Stack.of(scope).region || "us-east-1";
+    // Resolve the Datadog API key ARN from multiple sources
+    const resolvedDatadogApiKeyArn = datadogApiKeyArn ||
+        process.env.DATADOG_API_KEY_ARN ||
+        process.env.CDK_ENV_DATADOG_API_KEY_ARN;
+    // Return null if no API key is found
+    if (!resolvedDatadogApiKeyArn) {
+        return undefined;
+    }
+    const layerIdSuffix = uniqueId || process.env.PROJECT_NONCE || Date.now().toString();
+    // Create Datadog Node.js layer
+    const datadogNodeLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `DatadogNodeLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Node20-x:${cdk.CDK.DATADOG.LAYER.NODE}`);
+    // Create Datadog Extension layer
+    const datadogExtensionLayer = lambda__namespace.LayerVersion.fromLayerVersionArn(scope, `DatadogExtensionLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Extension:${cdk.CDK.DATADOG.LAYER.EXTENSION}`);
+    return [datadogNodeLayer, datadogExtensionLayer];
+}
+
 function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_ENV_HOSTED_ZONE, } = {}) {
     if (!zone) {
-        throw new cdk$1.ConfigurationError("No `zone` provided. Set CDK_ENV_HOSTED_ZONE to use environment zone");
+        throw new cdk.ConfigurationError("No `zone` provided. Set CDK_ENV_HOSTED_ZONE to use environment zone");
     }
     if (typeof zone === "string") {
         return route53__namespace.HostedZone.fromLookup(scope, name, {
@@ -314,10 +278,34 @@ function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_
     return zone;
 }
 
+const resolveParamsAndSecrets = (paramsAndSecretsOptions) => {
+    if (paramsAndSecretsOptions === false) {
+        return;
+    }
+    let resolvedParamsAndSecrets;
+    if (paramsAndSecretsOptions instanceof lambda__namespace.ParamsAndSecretsLayerVersion) {
+        resolvedParamsAndSecrets = paramsAndSecretsOptions;
+    }
+    else {
+        if (paramsAndSecretsOptions === true ||
+            paramsAndSecretsOptions === undefined) {
+            paramsAndSecretsOptions = {};
+        }
+        resolvedParamsAndSecrets = lambda__namespace.ParamsAndSecretsLayerVersion.fromVersion(lambda__namespace.ParamsAndSecretsVersions.V1_0_103, {
+            cacheSize: paramsAndSecretsOptions?.cacheSize,
+            logLevel: paramsAndSecretsOptions?.logLevel ||
+                lambda__namespace.ParamsAndSecretsLogLevel.WARN,
+            parameterStoreTtl: paramsAndSecretsOptions?.parameterStoreTtl,
+            secretsManagerTtl: paramsAndSecretsOptions?.secretsManagerTtl,
+        });
+    }
+    return resolvedParamsAndSecrets;
+};
+
 class JaypieApiGateway extends constructs.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { certificate = true, handler, host: propsHost, name, roleTag = cdk$1.CDK.ROLE.API, zone: propsZone, } = props;
+        const { certificate = true, handler, host: propsHost, name, roleTag = cdk.CDK.ROLE.API, zone: propsZone, } = props;
         // Determine zone from props or environment
         let zone = propsZone;
         if (!zone && process.env.CDK_ENV_API_HOSTED_ZONE) {
@@ -331,7 +319,7 @@ class JaypieApiGateway extends constructs.Construct {
             }
             else if (process.env.CDK_ENV_API_SUBDOMAIN &&
                 process.env.CDK_ENV_API_HOSTED_ZONE) {
-                host = cdk$1.mergeDomain(process.env.CDK_ENV_API_SUBDOMAIN, process.env.CDK_ENV_API_HOSTED_ZONE);
+                host = cdk.mergeDomain(process.env.CDK_ENV_API_SUBDOMAIN, process.env.CDK_ENV_API_HOSTED_ZONE);
             }
         }
         const apiGatewayName = name || constructEnvName("ApiGateway");
@@ -346,7 +334,7 @@ class JaypieApiGateway extends constructs.Construct {
                     domainName: host,
                     validation: acm__namespace.CertificateValidation.fromDns(hostedZone),
                 });
-                cdk.Tags.of(certificateToUse).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.HOSTING);
+                cdk$1.Tags.of(certificateToUse).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.HOSTING);
             }
             else if (typeof certificate === "object") {
                 certificateToUse = certificate;
@@ -365,19 +353,19 @@ class JaypieApiGateway extends constructs.Construct {
             handler,
             ...lambdaRestApiProps,
         });
-        cdk.Tags.of(this._api).add(cdk$1.CDK.TAG.ROLE, roleTag);
+        cdk$1.Tags.of(this._api).add(cdk.CDK.TAG.ROLE, roleTag);
         if (host && certificateToUse && hostedZone) {
             this._domainName = this._api.addDomainName(apiDomainName, {
                 domainName: host,
                 certificate: certificateToUse,
             });
-            cdk.Tags.of(this._domainName).add(cdk$1.CDK.TAG.ROLE, roleTag);
+            cdk$1.Tags.of(this._domainName).add(cdk.CDK.TAG.ROLE, roleTag);
             const record = new route53__namespace.ARecord(this, "AliasRecord", {
                 recordName: host,
                 target: route53__namespace.RecordTarget.fromAlias(new route53Targets__namespace.ApiGatewayDomain(this._domainName)),
                 zone: hostedZone,
             });
-            cdk.Tags.of(record).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.NETWORKING);
+            cdk$1.Tags.of(record).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.NETWORKING);
         }
     }
     get api() {
@@ -418,8 +406,8 @@ class JaypieApiGateway extends constructs.Construct {
     }
     get env() {
         return {
-            account: cdk.Stack.of(this).account,
-            region: cdk.Stack.of(this).region,
+            account: cdk$1.Stack.of(this).account,
+            region: cdk$1.Stack.of(this).region,
         };
     }
     get stack() {
@@ -457,7 +445,7 @@ class JaypieApiGateway extends constructs.Construct {
     }
 }
 
-class JaypieStack extends cdk.Stack {
+class JaypieStack extends cdk$1.Stack {
     constructor(scope, id, props = {}) {
         const { key, ...stackProps } = props;
         // Handle stackName
@@ -490,7 +478,7 @@ class JaypieAppStack extends JaypieStack {
 class JaypieLambda extends constructs.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { allowAllOutbound, allowPublicSubnet, architecture = lambda__namespace.Architecture.X86_64, code, codeSigningConfig, datadogApiKeyArn, deadLetterQueue, deadLetterQueueEnabled, deadLetterTopic, description, environment: initialEnvironment = {}, environmentEncryption, envSecrets = {}, ephemeralStorageSize, filesystem, handler = "index.handler", initialPolicy, layers = [], logRetention = cdk$1.CDK.LAMBDA.LOG_RETENTION, logRetentionRole, logRetentionRetryOptions, maxEventAge, memorySize = cdk$1.CDK.LAMBDA.MEMORY_SIZE, paramsAndSecrets, paramsAndSecretsOptions, profiling, profilingGroup, provisionedConcurrentExecutions, reservedConcurrentExecutions, retryAttempts, roleTag = cdk$1.CDK.ROLE.PROCESSING, runtime = lambda__namespace.Runtime.NODEJS_22_X, runtimeManagementMode, secrets = [], securityGroups, timeout = cdk.Duration.seconds(cdk$1.CDK.DURATION.LAMBDA_WORKER), tracing, vendorTag, vpc, vpcSubnets, } = props;
+        const { allowAllOutbound, allowPublicSubnet, architecture = lambda__namespace.Architecture.X86_64, code, codeSigningConfig, datadogApiKeyArn, deadLetterQueue, deadLetterQueueEnabled, deadLetterTopic, description, environment: initialEnvironment = {}, environmentEncryption, envSecrets = {}, ephemeralStorageSize, filesystem, handler = "index.handler", initialPolicy, layers = [], logRetention = cdk.CDK.LAMBDA.LOG_RETENTION, logRetentionRole, logRetentionRetryOptions, maxEventAge, memorySize = cdk.CDK.LAMBDA.MEMORY_SIZE, paramsAndSecrets, paramsAndSecretsOptions, profiling, profilingGroup, provisionedConcurrentExecutions, reservedConcurrentExecutions, retryAttempts, roleTag = cdk.CDK.ROLE.PROCESSING, runtime = lambda__namespace.Runtime.NODEJS_22_X, runtimeManagementMode, secrets = [], securityGroups, timeout = cdk$1.Duration.seconds(cdk.CDK.DURATION.LAMBDA_WORKER), tracing, vendorTag, vpc, vpcSubnets, } = props;
         // Get base environment with defaults
         const environment = jaypieLambdaEnv({ initialEnvironment });
         const codeAsset = typeof code === "string" ? lambda__namespace.Code.fromAsset(code) : code;
@@ -511,6 +499,10 @@ class JaypieLambda extends constructs.Construct {
             }
             return acc;
         }, {});
+        // Add ParamsAndSecrets layer if configured
+        const resolvedParamsAndSecrets = paramsAndSecrets
+            ? resolveParamsAndSecrets(paramsAndSecretsOptions)
+            : undefined;
         // Create Lambda Function
         this._lambda = new lambda__namespace.Function(this, "Function", {
             allowAllOutbound,
@@ -538,6 +530,7 @@ class JaypieLambda extends constructs.Construct {
             logRetentionRetryOptions,
             maxEventAge,
             memorySize,
+            paramsAndSecrets: resolvedParamsAndSecrets,
             profiling,
             profilingGroup,
             reservedConcurrentExecutions,
@@ -545,26 +538,20 @@ class JaypieLambda extends constructs.Construct {
             runtime,
             runtimeManagementMode,
             securityGroups,
-            timeout: typeof timeout === "number" ? cdk.Duration.seconds(timeout) : timeout,
+            timeout: typeof timeout === "number" ? cdk$1.Duration.seconds(timeout) : timeout,
             tracing,
             vpc,
             vpcSubnets,
             // Enable auto-publishing of versions when using provisioned concurrency
             currentVersionOptions: provisionedConcurrentExecutions !== undefined
                 ? {
-                    removalPolicy: cdk.RemovalPolicy.RETAIN,
+                    removalPolicy: cdk$1.RemovalPolicy.RETAIN,
                     description: "Auto-published version for provisioned concurrency",
                     // Don't set provisioned concurrency here - it will be set on the alias
                 }
                 : undefined,
         });
-        // Add ParamsAndSecrets layer if configured
-        addParamsAndSecrets(this._lambda, {
-            paramsAndSecrets,
-            paramsAndSecretsOptions,
-        });
-        // Add Datadog layers and environment variables if configured
-        addDatadogLayer(this._lambda, { datadogApiKeyArn });
+        addDatadogLayers(this._lambda, { datadogApiKeyArn });
         // Grant secret read permissions
         Object.values(envSecrets).forEach((secret) => {
             secret.grantRead(this._lambda);
@@ -587,10 +574,10 @@ class JaypieLambda extends constructs.Construct {
             this._provisioned.node.addDependency(version);
         }
         if (roleTag) {
-            cdk.Tags.of(this._lambda).add(cdk$1.CDK.TAG.ROLE, roleTag);
+            cdk$1.Tags.of(this._lambda).add(cdk.CDK.TAG.ROLE, roleTag);
         }
         if (vendorTag) {
-            cdk.Tags.of(this._lambda).add(cdk$1.CDK.TAG.VENDOR, vendorTag);
+            cdk$1.Tags.of(this._lambda).add(cdk.CDK.TAG.VENDOR, vendorTag);
         }
         // Assign _reference based on provisioned state
         this._reference =
@@ -687,8 +674,8 @@ class JaypieLambda extends constructs.Construct {
     }
     get env() {
         return {
-            account: cdk.Stack.of(this).account,
-            region: cdk.Stack.of(this).region,
+            account: cdk$1.Stack.of(this).account,
+            region: cdk$1.Stack.of(this).region,
         };
     }
     get stack() {
@@ -702,19 +689,19 @@ class JaypieLambda extends constructs.Construct {
 class JaypieQueuedLambda extends constructs.Construct {
     constructor(scope, id, props) {
         super(scope, id);
-        const { batchSize = 1, code, environment = {}, envSecrets = {}, fifo = true, handler = "index.handler", layers = [], logRetention = cdk$1.CDK.LAMBDA.LOG_RETENTION, memorySize = cdk$1.CDK.LAMBDA.MEMORY_SIZE, paramsAndSecrets, reservedConcurrentExecutions, roleTag, runtime = lambda__namespace.Runtime.NODEJS_22_X, secrets = [], timeout = cdk.Duration.seconds(cdk$1.CDK.DURATION.LAMBDA_WORKER), vendorTag, visibilityTimeout = cdk.Duration.seconds(cdk$1.CDK.DURATION.LAMBDA_WORKER), } = props;
+        const { batchSize = 1, code, environment = {}, envSecrets = {}, fifo = true, handler = "index.handler", layers = [], logRetention = cdk.CDK.LAMBDA.LOG_RETENTION, memorySize = cdk.CDK.LAMBDA.MEMORY_SIZE, paramsAndSecrets, reservedConcurrentExecutions, roleTag, runtime = lambda__namespace.Runtime.NODEJS_22_X, secrets = [], timeout = cdk$1.Duration.seconds(cdk.CDK.DURATION.LAMBDA_WORKER), vendorTag, visibilityTimeout = cdk$1.Duration.seconds(cdk.CDK.DURATION.LAMBDA_WORKER), } = props;
         // Create SQS Queue
         this._queue = new sqs__namespace.Queue(this, "Queue", {
             fifo,
             visibilityTimeout: typeof visibilityTimeout === "number"
-                ? cdk.Duration.seconds(visibilityTimeout)
+                ? cdk$1.Duration.seconds(visibilityTimeout)
                 : visibilityTimeout,
         });
         if (roleTag) {
-            cdk.Tags.of(this._queue).add(cdk$1.CDK.TAG.ROLE, roleTag);
+            cdk$1.Tags.of(this._queue).add(cdk.CDK.TAG.ROLE, roleTag);
         }
         if (vendorTag) {
-            cdk.Tags.of(this._queue).add(cdk$1.CDK.TAG.VENDOR, vendorTag);
+            cdk$1.Tags.of(this._queue).add(cdk.CDK.TAG.VENDOR, vendorTag);
         }
         // Create Lambda with JaypieLambda
         this._lambdaConstruct = new JaypieLambda(this, "Function", {
@@ -835,12 +822,12 @@ class JaypieQueuedLambda extends constructs.Construct {
     }
     get env() {
         return {
-            account: cdk.Stack.of(this).account,
-            region: cdk.Stack.of(this).region,
+            account: cdk$1.Stack.of(this).account,
+            region: cdk$1.Stack.of(this).region,
         };
     }
     get stack() {
-        return cdk.Stack.of(this);
+        return cdk$1.Stack.of(this);
     }
     applyRemovalPolicy(policy) {
         this._lambdaConstruct.applyRemovalPolicy(policy);
@@ -915,15 +902,15 @@ class JaypieBucketQueuedLambda extends JaypieQueuedLambda {
         // Create S3 Bucket
         this._bucket = new s3__namespace.Bucket(this, "Bucket", {
             bucketName: bucketOptions.bucketName || bucketName,
-            removalPolicy: bucketOptions.removalPolicy || cdk.RemovalPolicy.RETAIN,
+            removalPolicy: bucketOptions.removalPolicy || cdk$1.RemovalPolicy.RETAIN,
             ...bucketOptions,
         });
         // Add tags to bucket
         if (roleTag) {
-            cdk.Tags.of(this._bucket).add(cdk$1.CDK.TAG.ROLE, roleTag);
+            cdk$1.Tags.of(this._bucket).add(cdk.CDK.TAG.ROLE, roleTag);
         }
         if (vendorTag) {
-            cdk.Tags.of(this._bucket).add(cdk$1.CDK.TAG.VENDOR, vendorTag);
+            cdk$1.Tags.of(this._bucket).add(cdk.CDK.TAG.VENDOR, vendorTag);
         }
         // Add an event notification from the bucket to the queue
         this._bucket.addEventNotification(s3__namespace.EventType.OBJECT_CREATED, new s3n__namespace.SqsDestination(this.queue));
@@ -1088,13 +1075,13 @@ class JaypieBucketQueuedLambda extends JaypieQueuedLambda {
 
 // It is a consumer if the environment is ephemeral
 function checkEnvIsConsumer(env = process.env) {
-    return (env.PROJECT_ENV === cdk$1.CDK.ENV.PERSONAL ||
+    return (env.PROJECT_ENV === cdk.CDK.ENV.PERSONAL ||
         !!env.CDK_ENV_PERSONAL ||
         /** @deprecated */ env.PROJECT_ENV === "ephemeral" ||
         /** @deprecated */ !!env.CDK_ENV_EPHEMERAL);
 }
 function checkEnvIsProvider(env = process.env) {
-    return env.PROJECT_ENV === cdk$1.CDK.ENV.SANDBOX;
+    return env.PROJECT_ENV === cdk.CDK.ENV.SANDBOX;
 }
 function cleanName(name) {
     return name.replace(/[^a-zA-Z0-9:-]/g, "");
@@ -1108,7 +1095,7 @@ function exportEnvName(name, env = process.env) {
     }
     else {
         if (checkEnvIsConsumer(env)) {
-            rawName = `env-${cdk$1.CDK.ENV.SANDBOX}-${env.PROJECT_KEY}-${name}`;
+            rawName = `env-${cdk.CDK.ENV.SANDBOX}-${env.PROJECT_KEY}-${name}`;
         }
         else {
             rawName = `env-${env.PROJECT_ENV}-${env.PROJECT_KEY}-${name}`;
@@ -1129,10 +1116,10 @@ class JaypieEnvSecret extends constructs.Construct {
             exportName = cleanName(exportParam);
         }
         if (consumer) {
-            const secretName = cdk.Fn.importValue(exportName);
+            const secretName = cdk$1.Fn.importValue(exportName);
             this._secret = secretsmanager__namespace.Secret.fromSecretNameV2(this, id, secretName);
             // Add CfnOutput for consumer secrets
-            new cdk.CfnOutput(this, `ConsumedName`, {
+            new cdk$1.CfnOutput(this, `ConsumedName`, {
                 value: this._secret.secretName,
             });
         }
@@ -1141,24 +1128,24 @@ class JaypieEnvSecret extends constructs.Construct {
             const secretProps = {
                 generateSecretString,
                 secretStringValue: !generateSecretString && secretValue
-                    ? cdk.SecretValue.unsafePlainText(secretValue)
+                    ? cdk$1.SecretValue.unsafePlainText(secretValue)
                     : undefined,
             };
             this._secret = new secretsmanager__namespace.Secret(this, id, secretProps);
             if (roleTag) {
-                cdk.Tags.of(this._secret).add(cdk$1.CDK.TAG.ROLE, roleTag);
+                cdk$1.Tags.of(this._secret).add(cdk.CDK.TAG.ROLE, roleTag);
             }
             if (vendorTag) {
-                cdk.Tags.of(this._secret).add(cdk$1.CDK.TAG.VENDOR, vendorTag);
+                cdk$1.Tags.of(this._secret).add(cdk.CDK.TAG.VENDOR, vendorTag);
             }
             if (provider) {
-                new cdk.CfnOutput(this, `ProvidedName`, {
+                new cdk$1.CfnOutput(this, `ProvidedName`, {
                     value: this._secret.secretName,
                     exportName,
                 });
             }
             else {
-                new cdk.CfnOutput(this, `CreatedName`, {
+                new cdk$1.CfnOutput(this, `CreatedName`, {
                     value: this._secret.secretName,
                 });
             }
@@ -1166,12 +1153,12 @@ class JaypieEnvSecret extends constructs.Construct {
     }
     // IResource implementation
     get stack() {
-        return cdk.Stack.of(this);
+        return cdk$1.Stack.of(this);
     }
     get env() {
         return {
-            account: cdk.Stack.of(this).account,
-            region: cdk.Stack.of(this).region,
+            account: cdk$1.Stack.of(this).account,
+            region: cdk$1.Stack.of(this).region,
         };
     }
     applyRemovalPolicy(policy) {
@@ -1223,8 +1210,8 @@ class JaypieDatadogSecret extends JaypieEnvSecret {
     constructor(scope, id = "MongoConnectionString", props) {
         const defaultProps = {
             envKey: "DATADOG_API_KEY",
-            roleTag: cdk$1.CDK.ROLE.MONITORING,
-            vendorTag: cdk$1.CDK.VENDOR.DATADOG,
+            roleTag: cdk.CDK.ROLE.MONITORING,
+            vendorTag: cdk.CDK.VENDOR.DATADOG,
             ...props,
         };
         super(scope, id, defaultProps);
@@ -1234,8 +1221,8 @@ class JaypieDatadogSecret extends JaypieEnvSecret {
 class JaypieExpressLambda extends JaypieLambda {
     constructor(scope, id, props) {
         super(scope, id, {
-            timeout: cdk.Duration.seconds(cdk$1.CDK.DURATION.EXPRESS_API),
-            roleTag: cdk$1.CDK.ROLE.API,
+            timeout: cdk$1.Duration.seconds(cdk.CDK.DURATION.EXPRESS_API),
+            roleTag: cdk.CDK.ROLE.API,
             ...props,
         });
     }
@@ -1251,7 +1238,7 @@ class JaypieHostedZone extends constructs.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         const { destination, zoneName, project } = props;
-        const service = props.service || cdk$1.CDK.SERVICE.INFRASTRUCTURE;
+        const service = props.service || cdk.CDK.SERVICE.INFRASTRUCTURE;
         // Create the log group
         this.logGroup = new awsLogs.LogGroup(this, "LogGroup", {
             logGroupName: process.env.PROJECT_NONCE
@@ -1260,10 +1247,10 @@ class JaypieHostedZone extends constructs.Construct {
             retention: awsLogs.RetentionDays.ONE_WEEK,
         });
         // Add tags
-        cdk__namespace.Tags.of(this.logGroup).add(cdk$1.CDK.TAG.SERVICE, service);
-        cdk__namespace.Tags.of(this.logGroup).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.NETWORKING);
+        cdk__namespace.Tags.of(this.logGroup).add(cdk.CDK.TAG.SERVICE, service);
+        cdk__namespace.Tags.of(this.logGroup).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.NETWORKING);
         if (project) {
-            cdk__namespace.Tags.of(this.logGroup).add(cdk$1.CDK.TAG.PROJECT, project);
+            cdk__namespace.Tags.of(this.logGroup).add(cdk.CDK.TAG.PROJECT, project);
         }
         // Grant Route 53 permissions to write to the log group
         this.logGroup.grantWrite(new awsIam.ServicePrincipal(SERVICE.ROUTE53));
@@ -1280,10 +1267,10 @@ class JaypieHostedZone extends constructs.Construct {
             zoneName,
         });
         // Add tags
-        cdk__namespace.Tags.of(this.hostedZone).add(cdk$1.CDK.TAG.SERVICE, service);
-        cdk__namespace.Tags.of(this.hostedZone).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.NETWORKING);
+        cdk__namespace.Tags.of(this.hostedZone).add(cdk.CDK.TAG.SERVICE, service);
+        cdk__namespace.Tags.of(this.hostedZone).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.NETWORKING);
         if (project) {
-            cdk__namespace.Tags.of(this.hostedZone).add(cdk$1.CDK.TAG.PROJECT, project);
+            cdk__namespace.Tags.of(this.hostedZone).add(cdk.CDK.TAG.PROJECT, project);
         }
     }
 }
@@ -1303,7 +1290,7 @@ class JaypieInfrastructureStack extends JaypieStack {
         super(scope, id, { key, ...stackProps });
         // Add infrastructure-specific tag
         if (process.env.CDK_ENV_INFRASTRUCTURE_STACK_SHA) {
-            cdk.Tags.of(this).add(CDK.TAG.STACK_SHA, process.env.CDK_ENV_INFRASTRUCTURE_STACK_SHA);
+            cdk$1.Tags.of(this).add(CDK.TAG.STACK_SHA, process.env.CDK_ENV_INFRASTRUCTURE_STACK_SHA);
         }
     }
 }
@@ -1312,8 +1299,8 @@ class JaypieMongoDbSecret extends JaypieEnvSecret {
     constructor(scope, id = "MongoConnectionString", props) {
         const defaultProps = {
             envKey: "MONGODB_URI",
-            roleTag: cdk$1.CDK.ROLE.STORAGE,
-            vendorTag: cdk$1.CDK.VENDOR.MONGODB,
+            roleTag: cdk.CDK.ROLE.STORAGE,
+            vendorTag: cdk.CDK.VENDOR.MONGODB,
             ...props,
         };
         super(scope, id, defaultProps);
@@ -1324,8 +1311,8 @@ class JaypieOpenAiSecret extends JaypieEnvSecret {
     constructor(scope, id = "OpenAiApiKey", props) {
         const defaultProps = {
             envKey: "OPENAI_API_KEY",
-            roleTag: cdk$1.CDK.ROLE.PROCESSING,
-            vendorTag: cdk$1.CDK.VENDOR.OPENAI,
+            roleTag: cdk.CDK.ROLE.PROCESSING,
+            vendorTag: cdk.CDK.VENDOR.OPENAI,
             ...props,
         };
         super(scope, id, defaultProps);
@@ -1385,11 +1372,11 @@ class JaypieSsoGroups extends constructs.Construct {
             instanceArn: this.instanceArn,
             name: exports.PermissionSetType.ADMINISTRATOR,
             description: "Full administrative access to all AWS services and resources",
-            sessionDuration: cdk.Duration.hours(8).toIsoString(),
+            sessionDuration: cdk$1.Duration.hours(8).toIsoString(),
             managedPolicies: ["arn:aws:iam::aws:policy/AdministratorAccess"],
             inlinePolicy: mergedPolicy,
         });
-        cdk.Tags.of(permissionSet).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
+        cdk$1.Tags.of(permissionSet).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
         this.permissionSets[exports.PermissionSetType.ADMINISTRATOR] = permissionSet;
     }
     /**
@@ -1422,11 +1409,11 @@ class JaypieSsoGroups extends constructs.Construct {
             instanceArn: this.instanceArn,
             name: exports.PermissionSetType.ANALYST,
             description: "Read-only access with billing visibility and limited write access",
-            sessionDuration: cdk.Duration.hours(4).toIsoString(),
+            sessionDuration: cdk$1.Duration.hours(4).toIsoString(),
             managedPolicies: ["arn:aws:iam::aws:policy/ReadOnlyAccess"],
             inlinePolicy: mergedPolicy,
         });
-        cdk.Tags.of(permissionSet).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
+        cdk$1.Tags.of(permissionSet).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
         this.permissionSets[exports.PermissionSetType.ANALYST] = permissionSet;
     }
     /**
@@ -1474,13 +1461,13 @@ class JaypieSsoGroups extends constructs.Construct {
             instanceArn: this.instanceArn,
             name: exports.PermissionSetType.DEVELOPER,
             description: "System administrator access with expanded write permissions",
-            sessionDuration: cdk.Duration.hours(8).toIsoString(),
+            sessionDuration: cdk$1.Duration.hours(8).toIsoString(),
             managedPolicies: [
                 "arn:aws:iam::aws:policy/job-function/SystemAdministrator",
             ],
             inlinePolicy: mergedPolicy,
         });
-        cdk.Tags.of(permissionSet).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
+        cdk$1.Tags.of(permissionSet).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
         this.permissionSets[exports.PermissionSetType.DEVELOPER] = permissionSet;
     }
     /**
@@ -1547,8 +1534,8 @@ class JaypieSsoGroups extends constructs.Construct {
                 targetId: accountId,
                 targetType: "AWS_ACCOUNT",
             });
-            cdk.Tags.of(assignment).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
-            cdk.Tags.of(assignment).add("Group", "administrators");
+            cdk$1.Tags.of(assignment).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
+            cdk$1.Tags.of(assignment).add("Group", "administrators");
         });
     }
     /**
@@ -1574,8 +1561,8 @@ class JaypieSsoGroups extends constructs.Construct {
                 targetId: accountId,
                 targetType: "AWS_ACCOUNT",
             });
-            cdk.Tags.of(assignment).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
-            cdk.Tags.of(assignment).add("Group", "analysts");
+            cdk$1.Tags.of(assignment).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
+            cdk$1.Tags.of(assignment).add("Group", "analysts");
         });
     }
     /**
@@ -1600,8 +1587,8 @@ class JaypieSsoGroups extends constructs.Construct {
                 targetId: accountId,
                 targetType: "AWS_ACCOUNT",
             });
-            cdk.Tags.of(assignment).add(cdk$1.CDK.TAG.SERVICE, cdk$1.CDK.SERVICE.SSO);
-            cdk.Tags.of(assignment).add("Group", "developers");
+            cdk$1.Tags.of(assignment).add(cdk.CDK.TAG.SERVICE, cdk.CDK.SERVICE.SSO);
+            cdk$1.Tags.of(assignment).add("Group", "developers");
         });
     }
 }
@@ -1610,8 +1597,8 @@ class JaypieTraceSigningKeySecret extends JaypieEnvSecret {
     constructor(scope, id = "TraceSigningKey", props) {
         const defaultProps = {
             envKey: "TRACE_SIGNING_KEY",
-            roleTag: cdk$1.CDK.ROLE.API,
-            vendorTag: cdk$1.CDK.VENDOR.KNOWTRACE,
+            roleTag: cdk.CDK.ROLE.API,
+            vendorTag: cdk.CDK.VENDOR.KNOWTRACE,
             ...props,
         };
         super(scope, id, defaultProps);
@@ -1621,19 +1608,19 @@ class JaypieTraceSigningKeySecret extends JaypieEnvSecret {
 class JaypieWebDeploymentBucket extends constructs.Construct {
     constructor(scope, id, props = {}) {
         super(scope, id);
-        const roleTag = props.roleTag || cdk$1.CDK.ROLE.HOSTING;
+        const roleTag = props.roleTag || cdk.CDK.ROLE.HOSTING;
         // Environment variable validation
         if (process.env.CDK_ENV_WEB_SUBDOMAIN &&
-            !cdk$1.isValidSubdomain(process.env.CDK_ENV_WEB_SUBDOMAIN)) {
-            throw new cdk$1.ConfigurationError("CDK_ENV_WEB_SUBDOMAIN is not a valid subdomain");
+            !cdk.isValidSubdomain(process.env.CDK_ENV_WEB_SUBDOMAIN)) {
+            throw new cdk.ConfigurationError("CDK_ENV_WEB_SUBDOMAIN is not a valid subdomain");
         }
         if (process.env.CDK_ENV_WEB_HOSTED_ZONE &&
-            !cdk$1.isValidHostname(process.env.CDK_ENV_WEB_HOSTED_ZONE)) {
-            throw new cdk$1.ConfigurationError("CDK_ENV_WEB_HOSTED_ZONE is not a valid hostname");
+            !cdk.isValidHostname(process.env.CDK_ENV_WEB_HOSTED_ZONE)) {
+            throw new cdk.ConfigurationError("CDK_ENV_WEB_HOSTED_ZONE is not a valid hostname");
         }
         if (process.env.CDK_ENV_HOSTED_ZONE &&
-            !cdk$1.isValidHostname(process.env.CDK_ENV_HOSTED_ZONE)) {
-            throw new cdk$1.ConfigurationError("CDK_ENV_HOSTED_ZONE is not a valid hostname");
+            !cdk.isValidHostname(process.env.CDK_ENV_HOSTED_ZONE)) {
+            throw new cdk.ConfigurationError("CDK_ENV_HOSTED_ZONE is not a valid hostname");
         }
         // Determine host from props or environment
         let host = props.host;
@@ -1641,7 +1628,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
             try {
                 host =
                     process.env.CDK_ENV_WEB_HOST ||
-                        cdk$1.mergeDomain(process.env.CDK_ENV_WEB_SUBDOMAIN || "", process.env.CDK_ENV_WEB_HOSTED_ZONE ||
+                        cdk.mergeDomain(process.env.CDK_ENV_WEB_SUBDOMAIN || "", process.env.CDK_ENV_WEB_HOSTED_ZONE ||
                             process.env.CDK_ENV_HOSTED_ZONE ||
                             "");
             }
@@ -1649,8 +1636,8 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
                 host = undefined;
             }
         }
-        if (host && !cdk$1.isValidHostname(host)) {
-            throw new cdk$1.ConfigurationError("Host is not a valid hostname");
+        if (host && !cdk.isValidHostname(host)) {
+            throw new cdk.ConfigurationError("Host is not a valid hostname");
         }
         // Determine zone from props or environment
         const zone = props.zone ||
@@ -1663,7 +1650,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
             blockPublicAccess: s3__namespace.BlockPublicAccess.BLOCK_ACLS,
             bucketName: props.name || constructEnvName("web"),
             publicReadAccess: true,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
+            removalPolicy: cdk$1.RemovalPolicy.DESTROY,
             versioned: false,
             websiteErrorDocument: "index.html",
             websiteIndexDocument: "index.html",
@@ -1681,7 +1668,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
         this.isWebsite = this.bucket.isWebsite;
         this.notificationsHandlerRole = undefined;
         this.policy = this.bucket.policy;
-        cdk.Tags.of(this.bucket).add(cdk$1.CDK.TAG.ROLE, roleTag);
+        cdk$1.Tags.of(this.bucket).add(cdk.CDK.TAG.ROLE, roleTag);
         // Create deployment role if repository is configured
         let repo;
         if (process.env.CDK_ENV_REPO) {
@@ -1689,14 +1676,14 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
         }
         if (repo) {
             const bucketDeployRole = new awsIam.Role(this, "DestinationBucketDeployRole", {
-                assumedBy: new awsIam.FederatedPrincipal(cdk.Fn.importValue(cdk$1.CDK.IMPORT.OIDC_PROVIDER), {
+                assumedBy: new awsIam.FederatedPrincipal(cdk$1.Fn.importValue(cdk.CDK.IMPORT.OIDC_PROVIDER), {
                     StringLike: {
                         "token.actions.githubusercontent.com:sub": repo,
                     },
                 }, "sts:AssumeRoleWithWebIdentity"),
-                maxSessionDuration: cdk.Duration.hours(1),
+                maxSessionDuration: cdk$1.Duration.hours(1),
             });
-            cdk.Tags.of(bucketDeployRole).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.DEPLOY);
+            cdk$1.Tags.of(bucketDeployRole).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.DEPLOY);
             // Allow the role to write to the bucket
             bucketDeployRole.addToPolicy(new awsIam.PolicyStatement({
                 effect: awsIam.Effect.ALLOW,
@@ -1721,7 +1708,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
             }));
             this.deployRoleArn = bucketDeployRole.roleArn;
             // Output the deploy role ARN
-            new cdk.CfnOutput(this, "DestinationBucketDeployRoleArn", {
+            new cdk$1.CfnOutput(this, "DestinationBucketDeployRoleArn", {
                 value: bucketDeployRole.roleArn,
             });
         }
@@ -1741,10 +1728,10 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
                             domainName: host,
                             validation: acm__namespace.CertificateValidation.fromDns(hostedZone),
                         });
-                new cdk.CfnOutput(this, "CertificateArn", {
+                new cdk$1.CfnOutput(this, "CertificateArn", {
                     value: this.certificate.certificateArn,
                 });
-                cdk.Tags.of(this.certificate).add(cdk$1.CDK.TAG.ROLE, roleTag);
+                cdk$1.Tags.of(this.certificate).add(cdk.CDK.TAG.ROLE, roleTag);
             }
             // Create CloudFront distribution
             this.distribution = new cloudfront__namespace.Distribution(this, "Distribution", {
@@ -1756,7 +1743,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
                 certificate: this.certificate,
                 domainNames: [host],
             });
-            cdk.Tags.of(this.distribution).add(cdk$1.CDK.TAG.ROLE, roleTag);
+            cdk$1.Tags.of(this.distribution).add(cdk.CDK.TAG.ROLE, roleTag);
             // If this is production, enable caching on everything but index.html
             if (isProductionEnv()) {
                 this.distribution.addBehavior("/*", new origins__namespace.S3Origin(this.bucket), {
@@ -1770,7 +1757,7 @@ class JaypieWebDeploymentBucket extends constructs.Construct {
                 target: route53__namespace.RecordTarget.fromAlias(new route53Targets__namespace.CloudFrontTarget(this.distribution)),
                 zone: hostedZone,
             });
-            cdk.Tags.of(record).add(cdk$1.CDK.TAG.ROLE, cdk$1.CDK.ROLE.NETWORKING);
+            cdk$1.Tags.of(record).add(cdk.CDK.TAG.ROLE, cdk.CDK.ROLE.NETWORKING);
             this.distributionDomainName = this.distribution.distributionDomainName;
         }
     }
@@ -1882,8 +1869,7 @@ exports.JaypieSsoGroups = JaypieSsoGroups;
 exports.JaypieStack = JaypieStack;
 exports.JaypieTraceSigningKeySecret = JaypieTraceSigningKeySecret;
 exports.JaypieWebDeploymentBucket = JaypieWebDeploymentBucket;
-exports.addDatadogLayer = addDatadogLayer;
-exports.addParamsAndSecrets = addParamsAndSecrets;
+exports.addDatadogLayers = addDatadogLayers;
 exports.constructEnvName = constructEnvName;
 exports.constructStackName = constructStackName;
 exports.constructTagger = constructTagger;
@@ -1892,5 +1878,7 @@ exports.isEnv = isEnv;
 exports.isProductionEnv = isProductionEnv;
 exports.isSandboxEnv = isSandboxEnv;
 exports.jaypieLambdaEnv = jaypieLambdaEnv;
+exports.resolveDatadogLayers = resolveDatadogLayers;
 exports.resolveHostedZone = resolveHostedZone;
+exports.resolveParamsAndSecrets = resolveParamsAndSecrets;
 //# sourceMappingURL=index.cjs.map