@jaypie/constructs 1.2.64 → 1.2.66

package/dist/cjs/index.cjs

@@ -329,7 +329,7 @@ function addDatadogLayers(lambdaFunction, options = {}) {
         extensionLayerVersion: CDK$2.DATADOG.LAYER.EXTENSION,
         env: process.env.PROJECT_ENV,
         service: resolvedService,
-        version: process.env.PROJECT_VERSION,
+        version: process.env.DD_VERSION || process.env.PROJECT_VERSION,
     });
     datadogLambda.addLambdaFunctions([lambdaFunction]);
     return true;
@@ -776,6 +776,7 @@ function jaypieLambdaEnv(options = {}) {
     // Default environment variables from process.env if present
     const defaultEnvVars = [
         "DATADOG_API_KEY_ARN",
+        "DD_VERSION",
         "LOG_LEVEL",
         "MODULE_LOGGER",
         "MODULE_LOG_LEVEL",
@@ -1158,16 +1159,18 @@ class JaypieEnvSecret extends JaypieSecret {
         super(scope, idOrEnvKey, props);
     }
     buildSecret(context) {
-        const { envKey, id, treatAsEnvKey } = context;
+        const { envKey, id } = context;
         const props = context.props;
         const { consumer = checkEnvIsConsumer$1(), export: exportParam, generateSecretString, provider = checkEnvIsProvider$1(), removalPolicy, roleTag, vendorTag, value, } = props;
         let exportName;
         if (!exportParam) {
-            // When shorthand detection is active, use the full construct id (which
-            // includes the "EnvSecret_" prefix) so the export name matches what was
-            // produced by earlier versions of this construct. Using the raw envKey
-            // here produces a shorter name that breaks existing cross-stack imports.
-            const exportSource = treatAsEnvKey ? id : envKey || id;
+            // Always derive the export name from the construct id so the name is
+            // stable across both call forms. For shorthand detection the id carries
+            // the "EnvSecret_" prefix; for the explicit (id, { envKey }) form the id
+            // is the caller's construct id. Deriving from envKey instead would change
+            // the export name for an unchanged explicit-form call site across a
+            // version bump and break existing cross-stack imports (issues #347, #365).
+            const exportSource = id;
             exportName = exportEnvName$1(exportSource, process.env, consumer);
         }
         else {