@jaypie/constructs 1.1.41 → 1.1.43

package/dist/esm/JaypieLambda.d.ts

@@ -38,8 +38,8 @@ export interface JaypieLambdaProps {
     paramsAndSecretsOptions?: {
         cacheSize?: number;
         logLevel?: lambda.ParamsAndSecretsLogLevel;
-        parameterStoreTtl?: number;
-        secretsManagerTtl?: number;
+        parameterStoreTtl?: Duration;
+        secretsManagerTtl?: Duration;
     };
     profiling?: boolean;
     profilingGroup?: import("aws-cdk-lib/aws-codeguruprofiler").IProfilingGroup;

package/dist/esm/helpers/{addDatadogLayer.d.ts → addDatadogLayers.d.ts}

@@ -2,4 +2,4 @@ import * as lambda from "aws-cdk-lib/aws-lambda";
 export interface AddDatadogLayerOptions {
     datadogApiKeyArn?: string;
 }
-export declare function addDatadogLayer(lambdaFunction: lambda.Function, options?: AddDatadogLayerOptions): boolean;
+export declare function addDatadogLayers(lambdaFunction: lambda.Function, options?: AddDatadogLayerOptions): boolean;

package/dist/esm/helpers/envHostname.d.ts

@@ -1,4 +1,4 @@
-export declare function envHostname({ component, domain, env, subdomain, }: {
+export declare function envHostname({ component, domain, env, subdomain, }?: {
     component?: string;
     domain?: string;
     env?: string;

package/dist/esm/helpers/index.d.ts

@@ -1,9 +1,10 @@
-export { addDatadogLayer } from "./addDatadogLayer";
-export { addParamsAndSecrets } from "./addParamsAndSecrets";
+export { addDatadogLayers } from "./addDatadogLayers";
 export { constructEnvName } from "./constructEnvName";
 export { constructStackName } from "./constructStackName";
 export { constructTagger } from "./constructTagger";
 export { envHostname } from "./envHostname";
 export { isEnv, isProductionEnv, isSandboxEnv } from "./isEnv";
 export { jaypieLambdaEnv } from "./jaypieLambdaEnv";
+export { resolveDatadogLayers } from "./resolveDatadogLayers";
 export { resolveHostedZone } from "./resolveHostedZone";
+export { resolveParamsAndSecrets } from "./resolveParamsAndSecrets";

package/dist/esm/helpers/resolveDatadogLayers.d.ts

@@ -0,0 +1,7 @@
+import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Construct } from "constructs";
+export interface ResolveDatadogLayerOptions {
+    datadogApiKeyArn?: string;
+    uniqueId?: string;
+}
+export declare function resolveDatadogLayers(scope: Construct, options?: ResolveDatadogLayerOptions): lambda.ILayerVersion[] | undefined;

package/dist/esm/helpers/resolveHostedZone.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import * as route53 from "aws-cdk-lib/aws-route53";
-export declare function resolveHostedZone(scope: Construct, { name, zone, }: {
+export declare function resolveHostedZone(scope: Construct, { name, zone, }?: {
     name?: string;
     zone?: string | route53.IHostedZone;
 }): route53.IHostedZone;

package/dist/esm/helpers/resolveParamsAndSecrets.d.ts

@@ -0,0 +1,10 @@
+import { Duration } from "aws-cdk-lib";
+import * as lambda from "aws-cdk-lib/aws-lambda";
+export interface ResolveParamsAndSecretsOptions {
+    cacheSize?: number;
+    logLevel?: lambda.ParamsAndSecretsLogLevel;
+    parameterStoreTtl?: Duration;
+    secretsManagerTtl?: Duration;
+}
+export declare const resolveParamsAndSecrets: (paramsAndSecretsOptions?: lambda.ParamsAndSecretsLayerVersion | boolean | ResolveParamsAndSecretsOptions) => lambda.ParamsAndSecretsLayerVersion | undefined;
+export default resolveParamsAndSecrets;

package/dist/esm/index.js

@@ -1,14 +1,15 @@
 import { Construct } from 'constructs';
 import * as cdk from 'aws-cdk-lib';
-import { Stack, Tags, Duration, RemovalPolicy, Fn, CfnOutput, SecretValue } from 'aws-cdk-lib';
+import { Tags, Stack, Duration, RemovalPolicy, Fn, CfnOutput, SecretValue } from 'aws-cdk-lib';
 import * as acm from 'aws-cdk-lib/aws-certificatemanager';
 import * as apiGateway from 'aws-cdk-lib/aws-apigateway';
 import * as route53 from 'aws-cdk-lib/aws-route53';
 import { HostedZone } from 'aws-cdk-lib/aws-route53';
 import * as route53Targets from 'aws-cdk-lib/aws-route53-targets';
 import { CDK as CDK$2, ConfigurationError, mergeDomain, isValidSubdomain, isValidHostname } from '@jaypie/cdk';
-import * as lambda from 'aws-cdk-lib/aws-lambda';
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
+import { DatadogLambda } from 'datadog-cdk-constructs-v2';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as s3n from 'aws-cdk-lib/aws-s3-notifications';
 import * as sqs from 'aws-cdk-lib/aws-sqs';
@@ -19,23 +20,14 @@ import * as sso from 'aws-cdk-lib/aws-sso';
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import * as origins from 'aws-cdk-lib/aws-cloudfront-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 = Stack.of(lambdaFunction);
-    // Create Datadog Node.js layer
-    const datadogNodeLayer = lambda.LayerVersion.fromLayerVersionArn(stack, `DatadogNodeLayer-${lambdaFunction.node.id}`, `arn:aws:lambda:${stack.region}:464622532012:layer:Datadog-Node20-x:${CDK$2.DATADOG.LAYER.NODE}`);
-    // Create Datadog Extension layer
-    const datadogExtensionLayer = lambda.LayerVersion.fromLayerVersionArn(stack, `DatadogExtensionLayer-${lambdaFunction.node.id}`, `arn:aws:lambda:${stack.region}:464622532012:layer:Datadog-Extension:${CDK$2.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,
@@ -50,68 +42,21 @@ function addDatadogLayer(lambdaFunction, options = {}) {
     };
     // 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);
     });
-    // Grant Datadog API key read permission
-    const datadogApiKey = secretsmanager.Secret.fromSecretCompleteArn(stack, `DatadogApiKeyGrant-${lambdaFunction.node.id}`, resolvedDatadogApiKeyArn);
-    datadogApiKey.grantRead(lambdaFunction);
+    const datadogApiKeySecret = secretsmanager.Secret.fromSecretNameV2(lambdaFunction.stack, "DatadogApiKey", resolvedDatadogApiKeyArn);
+    const datadogLambda = new DatadogLambda(lambdaFunction.stack, "DatadogLambda", {
+        apiKeySecret: datadogApiKeySecret, // apiKeySecret auto-grants secret access to the added lambdas
+        nodeLayerVersion: CDK$2.DATADOG.LAYER.NODE,
+        extensionLayerVersion: CDK$2.DATADOG.LAYER.EXTENSION,
+        env: process.env.PROJECT_ENV,
+        service: process.env.PROJECT_SERVICE,
+        version: process.env.PROJECT_VERSION,
+    });
+    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 = Stack.of(lambdaFunction);
-    let resolvedLayer = undefined;
-    if (paramsAndSecrets instanceof lambda.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.ParamsAndSecretsVersions.V1_0_103}`;
-        resolvedLayer = lambda.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.ParamsAndSecretsVersions.V1_0_103}`;
-        resolvedLayer = lambda.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.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";
@@ -180,7 +125,7 @@ function constructTagger(construct, { name } = {}) {
     return true;
 }
 
-function envHostname({ component, domain, env, subdomain, }) {
+function envHostname({ component, domain, env, subdomain, } = {}) {
     const resolvedDomain = domain || process.env.CDK_ENV_DOMAIN || process.env.CDK_ENV_HOSTED_ZONE;
     if (!resolvedDomain) {
         throw new ConfigurationError("No hostname `domain` provided. Set CDK_ENV_DOMAIN or CDK_ENV_HOSTED_ZONE to use environment domain");
@@ -270,7 +215,26 @@ function jaypieLambdaEnv(options = {}) {
     return environment;
 }
 
-function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_ENV_HOSTED_ZONE, }) {
+function resolveDatadogLayers(scope, options = {}) {
+    const { datadogApiKeyArn, uniqueId } = options;
+    let resolvedRegion = 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.LayerVersion.fromLayerVersionArn(scope, `DatadogNodeLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Node20-x:${CDK$2.DATADOG.LAYER.NODE}`);
+    // Create Datadog Extension layer
+    const datadogExtensionLayer = lambda.LayerVersion.fromLayerVersionArn(scope, `DatadogExtensionLayer-${layerIdSuffix}`, `arn:aws:lambda:${resolvedRegion}:464622532012:layer:Datadog-Extension:${CDK$2.DATADOG.LAYER.EXTENSION}`);
+    return [datadogNodeLayer, datadogExtensionLayer];
+}
+
+function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_ENV_HOSTED_ZONE, } = {}) {
     if (!zone) {
         throw new ConfigurationError("No `zone` provided. Set CDK_ENV_HOSTED_ZONE to use environment zone");
     }
@@ -282,6 +246,30 @@ function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_
     return zone;
 }
 
+const resolveParamsAndSecrets = (paramsAndSecretsOptions) => {
+    if (paramsAndSecretsOptions === false) {
+        return;
+    }
+    let resolvedParamsAndSecrets;
+    if (paramsAndSecretsOptions instanceof lambda.ParamsAndSecretsLayerVersion) {
+        resolvedParamsAndSecrets = paramsAndSecretsOptions;
+    }
+    else {
+        if (paramsAndSecretsOptions === true ||
+            paramsAndSecretsOptions === undefined) {
+            paramsAndSecretsOptions = {};
+        }
+        resolvedParamsAndSecrets = lambda.ParamsAndSecretsLayerVersion.fromVersion(lambda.ParamsAndSecretsVersions.V1_0_103, {
+            cacheSize: paramsAndSecretsOptions?.cacheSize,
+            logLevel: paramsAndSecretsOptions?.logLevel ||
+                lambda.ParamsAndSecretsLogLevel.WARN,
+            parameterStoreTtl: paramsAndSecretsOptions?.parameterStoreTtl,
+            secretsManagerTtl: paramsAndSecretsOptions?.secretsManagerTtl,
+        });
+    }
+    return resolvedParamsAndSecrets;
+};
+
 class JaypieApiGateway extends Construct {
     constructor(scope, id, props) {
         super(scope, id);
@@ -479,6 +467,10 @@ class JaypieLambda extends Construct {
             }
             return acc;
         }, {});
+        // Add ParamsAndSecrets layer if configured
+        const resolvedParamsAndSecrets = paramsAndSecrets
+            ? resolveParamsAndSecrets(paramsAndSecretsOptions)
+            : undefined;
         // Create Lambda Function
         this._lambda = new lambda.Function(this, "Function", {
             allowAllOutbound,
@@ -506,6 +498,7 @@ class JaypieLambda extends Construct {
             logRetentionRetryOptions,
             maxEventAge,
             memorySize,
+            paramsAndSecrets: resolvedParamsAndSecrets,
             profiling,
             profilingGroup,
             reservedConcurrentExecutions,
@@ -526,13 +519,7 @@ class JaypieLambda extends Construct {
                 }
                 : 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);
@@ -1834,5 +1821,5 @@ class JaypieWebDeploymentBucket extends Construct {
     }
 }
 
-export { JaypieApiGateway, JaypieAppStack, JaypieBucketQueuedLambda, JaypieDatadogSecret, JaypieEnvSecret, JaypieExpressLambda, JaypieHostedZone, JaypieInfrastructureStack, JaypieLambda, JaypieMongoDbSecret, JaypieOpenAiSecret, JaypieQueuedLambda, JaypieSsoGroups, JaypieStack, JaypieTraceSigningKeySecret, JaypieWebDeploymentBucket, PermissionSetType, addDatadogLayer, addParamsAndSecrets, constructEnvName, constructStackName, constructTagger, envHostname, isEnv, isProductionEnv, isSandboxEnv, jaypieLambdaEnv, resolveHostedZone };
+export { JaypieApiGateway, JaypieAppStack, JaypieBucketQueuedLambda, JaypieDatadogSecret, JaypieEnvSecret, JaypieExpressLambda, JaypieHostedZone, JaypieInfrastructureStack, JaypieLambda, JaypieMongoDbSecret, JaypieOpenAiSecret, JaypieQueuedLambda, JaypieSsoGroups, JaypieStack, JaypieTraceSigningKeySecret, JaypieWebDeploymentBucket, PermissionSetType, addDatadogLayers, constructEnvName, constructStackName, constructTagger, envHostname, isEnv, isProductionEnv, isSandboxEnv, jaypieLambdaEnv, resolveDatadogLayers, resolveHostedZone, resolveParamsAndSecrets };
 //# sourceMappingURL=index.js.map