carlin 1.48.3 → 1.49.0

package/dist/index.js

@@ -813,34 +813,7 @@ var saveEnvironmentOutput = /* @__PURE__ */ __name(async ({ outputs, stackName }
   const latestFilePath = path.join(dotCarlinFolderPath, LATEST_DEPLOY_OUTPUTS_FILENAME);
   await fs3.promises.writeFile(latestFilePath, JSON.stringify(envFile, null, 2));
 }, "saveEnvironmentOutput");
-var exportEnvVars = /* @__PURE__ */ __name(async ({ outputs, envExport }) => {
-  const githubEnvFile = process.env.GITHUB_ENV;
-  for (const [cfOutputKey, envVarName] of Object.entries(envExport)) {
-    const output = outputs.find(({ OutputKey }) => {
-      return OutputKey === cfOutputKey;
-    });
-    if (!output?.OutputValue) {
-      log5.warn(logPrefix3, `envExport: CloudFormation output "${cfOutputKey}" not found or has no value. Skipping export of "${envVarName}".`);
-      continue;
-    }
-    const value = output.OutputValue;
-    if (githubEnvFile) {
-      if (value.includes("\n")) {
-        log5.warn(logPrefix3, `envExport: value for "${cfOutputKey}" contains newlines and cannot be exported to GITHUB_ENV safely. Skipping.`);
-        continue;
-      }
-      await fs3.promises.appendFile(githubEnvFile, `${envVarName}=${value}
-`);
-      log5.info(logPrefix3, `envExport: wrote ${envVarName} to GITHUB_ENV`);
-    } else {
-      const escapedValue = value.replace(/'/g, `'\\''`);
-      process.stdout.write(`export ${envVarName}='${escapedValue}'
-`);
-      log5.info(logPrefix3, `envExport: printed export ${envVarName} to stdout`);
-    }
-  }
-}, "exportEnvVars");
-var printStackOutputsAfterDeploy = /* @__PURE__ */ __name(async ({ stackName, envExport }) => {
+var printStackOutputsAfterDeploy = /* @__PURE__ */ __name(async ({ stackName }) => {
   const { EnableTerminationProtection, StackName, Outputs = [] } = await describeStack({
     stackName
   });
@@ -861,12 +834,6 @@ var printStackOutputsAfterDeploy = /* @__PURE__ */ __name(async ({ stackName, en
       ""
     ].join("\n"));
   }
-  if (envExport && Object.keys(envExport).length > 0) {
-    await exportEnvVars({
-      outputs: Outputs,
-      envExport
-    });
-  }
 }, "printStackOutputsAfterDeploy");
 var deleteStack = /* @__PURE__ */ __name(async ({ stackName }) => {
   log5.info(logPrefix3, `Deleting stack ${stackName}...`);
@@ -939,7 +906,7 @@ var enableTerminationProtection = /* @__PURE__ */ __name(async ({ stackName }) =
     throw error;
   }
 }, "enableTerminationProtection");
-var deploy = /* @__PURE__ */ __name(async ({ terminationProtection = false, envExport, ...paramsAndTemplate }) => {
+var deploy = /* @__PURE__ */ __name(async ({ terminationProtection = false, ...paramsAndTemplate }) => {
   const { params, template } = await addDefaults(paramsAndTemplate);
   const stackName = params.StackName;
   if (!stackName) {
@@ -978,8 +945,7 @@ var deploy = /* @__PURE__ */ __name(async ({ terminationProtection = false, envE
     });
   }
   await printStackOutputsAfterDeploy({
-    stackName,
-    envExport
+    stackName
   });
   return describeStack({
     stackName
@@ -3492,7 +3458,7 @@ var getCloudformationTemplateOptions = /* @__PURE__ */ __name(({ cliOptions, sta
 }, "getCloudformationTemplateOptions");
 var deployCloudFormation = /* @__PURE__ */ __name(async (cliOptions) => {
   try {
-    const { lambdaDockerfile, lambdaEntryPoints, lambdaEntryPointsBaseDir, lambdaImage, lambdaExternal, lambdaFormat, lambdaOutdir, parameters, template, templatePath, envExport } = cliOptions;
+    const { lambdaDockerfile, lambdaEntryPoints, lambdaEntryPointsBaseDir, lambdaImage, lambdaExternal, lambdaFormat, lambdaOutdir, parameters, template, templatePath } = cliOptions;
     const { stackName } = await handleDeployInitialization({
       logPrefix: logPrefix12
     });
@@ -3653,8 +3619,7 @@ var deployCloudFormation = /* @__PURE__ */ __name(async (cliOptions) => {
     await deployCloudFormationDeployLambdaCode();
     const output = await deploy({
       params,
-      template: cloudFormationTemplate,
-      envExport
+      template: cloudFormationTemplate
     });
     return output;
   } catch (error) {
@@ -5063,50 +5028,6 @@ var options6 = {
     describe: "Set the stack name.",
     type: "string"
   },
-  /**
-  * Mapping of CloudFormation output keys to environment variable names.
-  * After a successful deployment, carlin reads the stack outputs and exports
-  * the mapped variables to the CI/CD runner environment:
-  *
-  * - **GitHub Actions**: appends `KEY=VALUE` lines to `$GITHUB_ENV`.
-  * - **Generic shell**: prints `export KEY=VALUE` lines to stdout.
-  *
-  * Configure in your `carlin.ts`:
-  *
-  * ```ts
-  * export default {
-  *   envExport: {
-  *     AppSyncApiGraphQLUrl: 'VITE_APPSYNC_GRAPHQL_ENDPOINT',
-  *     AppSyncApiArn: 'APPSYNC_API_ARN',
-  *   },
-  * };
-  * ```
-  *
-  * Can also be combined with per-environment config:
-  *
-  * ```ts
-  * export default {
-  *   environments: {
-  *     Staging: {
-  *       envExport: {
-  *         AppSyncApiGraphQLUrl: 'VITE_APPSYNC_GRAPHQL_ENDPOINT',
-  *       },
-  *     },
-  *   },
-  * };
-  * ```
-  */
-  "env-export": {
-    describe: "Mapping of CloudFormation output keys to environment variable names to export after deployment.",
-    coerce: /* @__PURE__ */ __name((arg) => {
-      if (typeof arg === "object" && arg !== null && !Array.isArray(arg) && Object.values(arg).every((v) => {
-        return typeof v === "string";
-      })) {
-        return arg;
-      }
-      return void 0;
-    }, "coerce")
-  },
   "template-path": {
     alias: "t",
     describe: "Path to the CloudFormation template.",
@@ -5257,7 +5178,34 @@ var readEnvFile = /* @__PURE__ */ __name(async ({ envFileName, envsPath }) => {
 var writeEnvFile = /* @__PURE__ */ __name(async ({ envFileName, content }) => {
   return fs3.promises.writeFile(path.resolve(process.cwd(), envFileName), content);
 }, "writeEnvFile");
-var generateEnv = /* @__PURE__ */ __name(async ({ defaultEnvironment, path: envsPath }) => {
+var readDeployOutputLines = /* @__PURE__ */ __name(async ({ envFromDeployOutputs }) => {
+  const lines = [];
+  for (const { dir, variables } of envFromDeployOutputs) {
+    const latestDeployPath = path.resolve(process.cwd(), dir, ".carlin", LATEST_DEPLOY_OUTPUTS_FILENAME);
+    let latestDeploy;
+    try {
+      const raw = await fs3.promises.readFile(latestDeployPath, "utf8");
+      latestDeploy = JSON.parse(raw);
+    } catch {
+      log5.warn(logPrefix23, "Could not read latest-deploy.json from %s. Skipping.", latestDeployPath);
+      continue;
+    }
+    const outputs = latestDeploy.outputs ?? {};
+    for (const [envVarName, outputPath] of Object.entries(variables)) {
+      const dotIndex = outputPath.indexOf(".");
+      const outputKey = dotIndex === -1 ? outputPath : outputPath.slice(0, dotIndex);
+      const field = dotIndex === -1 ? "OutputValue" : outputPath.slice(dotIndex + 1);
+      const outputValue = outputs[outputKey]?.[field];
+      if (outputValue === void 0) {
+        log5.warn(logPrefix23, 'Output path "%s" not found in %s. Skipping %s.', outputPath, latestDeployPath, envVarName);
+        continue;
+      }
+      lines.push(`${envVarName}=${outputValue}`);
+    }
+  }
+  return lines;
+}, "readDeployOutputLines");
+var generateEnv = /* @__PURE__ */ __name(async ({ defaultEnvironment, envFromDeployOutputs, path: envsPath }) => {
   const environment = getEnvironment() || defaultEnvironment;
   const envFileName = `.env.${environment}`;
   const envFile = await readEnvFile({
@@ -5268,8 +5216,14 @@ var generateEnv = /* @__PURE__ */ __name(async ({ defaultEnvironment, path: envs
     log5.info(logPrefix23, "Env file %s doesn't exist. Skip generating env file.", envFileName);
     return;
   }
+  const deployOutputLines = envFromDeployOutputs && envFromDeployOutputs.length > 0 ? await readDeployOutputLines({
+    envFromDeployOutputs
+  }) : [];
+  const content = deployOutputLines.length > 0 ? `${envFile}
+${deployOutputLines.join("\n")}
+` : envFile;
   await writeEnvFile({
-    content: envFile,
+    content,
     envFileName: ".env"
   });
   log5.info(logPrefix23, "Generate env file %s from %s successfully.", ".env", envFileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.48.3",
+  "version": "1.49.0",
   "description": "",
   "license": "MIT",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",