@jaypie/constructs 1.1.46 → 1.1.48

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

@@ -6,5 +6,8 @@ export interface ResolveParamsAndSecretsOptions {
     parameterStoreTtl?: Duration;
     secretsManagerTtl?: Duration;
 }
-export declare const resolveParamsAndSecrets: (paramsAndSecretsOptions?: lambda.ParamsAndSecretsLayerVersion | boolean | ResolveParamsAndSecretsOptions) => lambda.ParamsAndSecretsLayerVersion | undefined;
+export declare const resolveParamsAndSecrets: ({ paramsAndSecrets, options, }: {
+    paramsAndSecrets?: lambda.ParamsAndSecretsLayerVersion | boolean;
+    options?: ResolveParamsAndSecretsOptions;
+}) => lambda.ParamsAndSecretsLayerVersion | undefined;
 export default resolveParamsAndSecrets;

package/dist/esm/index.js

@@ -44,7 +44,7 @@ function addDatadogLayers(lambdaFunction, options = {}) {
     Object.entries(datadogEnvVars).forEach(([key, value]) => {
         lambdaFunction.addEnvironment(key, value);
     });
-    const datadogApiKeySecret = secretsmanager.Secret.fromSecretNameV2(lambdaFunction, "DatadogApiKey", resolvedDatadogApiKeyArn);
+    const datadogApiKeySecret = secretsmanager.Secret.fromSecretCompleteArn(lambdaFunction, "DatadogApiKey", resolvedDatadogApiKeyArn);
     const datadogLambda = new DatadogLambda(lambdaFunction, "DatadogLambda", {
         apiKeySecret: datadogApiKeySecret, // apiKeySecret auto-grants secret access to the added lambdas
         nodeLayerVersion: CDK$2.DATADOG.LAYER.NODE,
@@ -246,25 +246,21 @@ function resolveHostedZone(scope, { name = "HostedZone", zone = process.env.CDK_
     return zone;
 }
 
-const resolveParamsAndSecrets = (paramsAndSecretsOptions) => {
-    if (paramsAndSecretsOptions === false) {
+const resolveParamsAndSecrets = ({ paramsAndSecrets, options, }) => {
+    if (paramsAndSecrets === false) {
         return;
     }
     let resolvedParamsAndSecrets;
-    if (paramsAndSecretsOptions instanceof lambda.ParamsAndSecretsLayerVersion) {
-        resolvedParamsAndSecrets = paramsAndSecretsOptions;
+    if (paramsAndSecrets instanceof lambda.ParamsAndSecretsLayerVersion) {
+        resolvedParamsAndSecrets = paramsAndSecrets;
     }
     else {
-        if (paramsAndSecretsOptions === true ||
-            paramsAndSecretsOptions === undefined) {
-            paramsAndSecretsOptions = {};
-        }
+        const resolvedOptions = options || {};
         resolvedParamsAndSecrets = lambda.ParamsAndSecretsLayerVersion.fromVersion(lambda.ParamsAndSecretsVersions.V1_0_103, {
-            cacheSize: paramsAndSecretsOptions?.cacheSize,
-            logLevel: paramsAndSecretsOptions?.logLevel ||
-                lambda.ParamsAndSecretsLogLevel.WARN,
-            parameterStoreTtl: paramsAndSecretsOptions?.parameterStoreTtl,
-            secretsManagerTtl: paramsAndSecretsOptions?.secretsManagerTtl,
+            cacheSize: resolvedOptions.cacheSize,
+            logLevel: resolvedOptions.logLevel || lambda.ParamsAndSecretsLogLevel.WARN,
+            parameterStoreTtl: resolvedOptions.parameterStoreTtl,
+            secretsManagerTtl: resolvedOptions.secretsManagerTtl,
         });
     }
     return resolvedParamsAndSecrets;
@@ -468,9 +464,10 @@ class JaypieLambda extends Construct {
             return acc;
         }, {});
         // Add ParamsAndSecrets layer if configured
-        const resolvedParamsAndSecrets = paramsAndSecrets
-            ? resolveParamsAndSecrets(paramsAndSecretsOptions)
-            : undefined;
+        const resolvedParamsAndSecrets = resolveParamsAndSecrets({
+            paramsAndSecrets,
+            options: paramsAndSecretsOptions,
+        });
         // Create Lambda Function
         this._lambda = new lambda.Function(this, "Function", {
             allowAllOutbound,