carlin 1.31.21 → 1.32.0

package/dist/index.js

@@ -2392,19 +2392,22 @@ var getCicdTemplate = ({
   };
 };
 var logPrefix5 = "lambda";
-var outFolder = "dist";
-var outFile = "index.js";
-var buildLambdaSingleFile = async ({
-  lambdaExternals,
-  lambdaInput
+var buildLambdaCode = async ({
+  lambdaEntryPoints,
+  lambdaEntryPointsBaseDir = ".",
+  lambdaExternal = [],
+  lambdaOutdir
 }) => {
   log5.info(logPrefix5, "Building Lambda single file...");
+  const entryPoints = lambdaEntryPoints.map((entryPoint) => {
+    return path__default.resolve(process.cwd(), lambdaEntryPointsBaseDir, entryPoint);
+  });
   const { errors } = esbuild.buildSync({
     banner: {
       js: "// Powered by carlin (https://ttoss.dev/docs/carlin/)"
     },
     bundle: true,
-    entryPoints: [path__default.resolve(process.cwd(), lambdaInput)],
+    entryPoints,
     external: [
       /**
        * Only AWS SDK v3 on Node.js 18.x or higher.
@@ -2412,7 +2415,7 @@ var buildLambdaSingleFile = async ({
        */
       "@aws-sdk/*",
       ...builtins,
-      ...lambdaExternals
+      ...lambdaExternal
     ],
     /**
      * Some packages as `graphql` are not compatible with ESM yet.
@@ -2424,7 +2427,8 @@ var buildLambdaSingleFile = async ({
      */
     minifySyntax: true,
     platform: "node",
-    outfile: path__default.join(process.cwd(), outFolder, outFile),
+    outbase: path__default.join(process.cwd(), lambdaEntryPointsBaseDir),
+    outdir: path__default.join(process.cwd(), lambdaOutdir),
     target: typescriptConfig.target,
     treeShaking: true
   });
@@ -2570,14 +2574,14 @@ var deployLambdaLayer = async ({
 };
 var logPrefix7 = "lambda";
 var deployLambdaLayers = async ({
-  lambdaExternals = []
+  lambdaExternal = []
 }) => {
-  if (lambdaExternals.length === 0) {
+  if (lambdaExternal.length === 0) {
     return;
   }
   log5.info(
     logPrefix7,
-    `--lambda-externals [${lambdaExternals.join(
+    `--lambda-externals [${lambdaExternal.join(
       ", "
     )}] was found. Creating other layers...`
   );
@@ -2595,14 +2599,12 @@ var deployLambdaLayers = async ({
       return {};
     }
   })();
-  const packages = lambdaExternals.map((lambdaExternal) => {
+  const packages = lambdaExternal.map((external) => {
     try {
-      const semver2 = dependencies[lambdaExternal].replace(/(~|\^)/g, "");
-      return `${lambdaExternal}@${semver2}`;
+      const semver2 = dependencies[external].replace(/(~|\^)/g, "");
+      return `${external}@${semver2}`;
     } catch {
-      throw new Error(
-        `Cannot find ${lambdaExternal} on package.json dependencies.`
-      );
+      throw new Error(`Cannot find ${external} on package.json dependencies.`);
     }
   });
   await deployLambdaLayer({ packages, deployIfExists: false });
@@ -2611,7 +2613,7 @@ new AWS.CodeBuild({ region: AWS_DEFAULT_REGION });
 var uploadCodeToECR = async ({
   bucket,
   key,
-  lambdaExternals,
+  lambdaExternal,
   lambdaDockerfile
 }) => {
   {
@@ -2620,15 +2622,18 @@ var uploadCodeToECR = async ({
 };
 var logPrefix8 = "lambda";
 var zipFileName = "lambda.zip";
-var uploadCodeToS3 = async ({ stackName }) => {
+var uploadCodeToS3 = async ({
+  stackName,
+  lambdaOutdir
+}) => {
   log5.info(logPrefix8, `Uploading code to S3...`);
   const zip = new AdmZip();
-  const code = fs3__default.readFileSync(path__default.join(process.cwd(), outFolder, outFile));
-  zip.addFile(outFile, code);
-  if (!fs3__default.existsSync(outFolder)) {
-    fs3__default.mkdirSync(outFolder);
+  const zipFile = `${lambdaOutdir}/${zipFileName}`;
+  if (fs3__default.existsSync(zipFile)) {
+    await fs3__default.promises.rm(zipFile);
   }
-  zip.writeZip(`${outFolder}/${zipFileName}`);
+  zip.addLocalFolder(lambdaOutdir);
+  zip.writeZip(`${lambdaOutdir}/${zipFileName}`);
   const bucketName = await getBaseStackResource(
     "BASE_STACK_BUCKET_LOGICAL_NAME"
   );
@@ -2642,19 +2647,32 @@ var uploadCodeToS3 = async ({ stackName }) => {
 var logPrefix9 = "lambda";
 var deployLambdaCode = async ({
   lambdaDockerfile,
-  lambdaExternals,
+  lambdaExternal = [],
   lambdaImage,
-  lambdaInput,
+  lambdaEntryPoints,
+  lambdaEntryPointsBaseDir = "src",
+  lambdaOutdir = "dist",
   stackName
 }) => {
-  if (!fs3__default.existsSync(lambdaInput)) {
-    return void 0;
-  }
   log5.info(logPrefix9, "Deploying Lambda code...");
-  await buildLambdaSingleFile({ lambdaExternals, lambdaInput });
-  const { bucket, key, versionId } = await uploadCodeToS3({ stackName });
+  for (const entryPoint of lambdaEntryPoints) {
+    const entryPointPath = path__default.resolve(lambdaEntryPointsBaseDir, entryPoint);
+    if (!fs3__default.existsSync(entryPointPath)) {
+      throw new Error(`Entry point ${entryPointPath} does not exist.`);
+    }
+  }
+  await buildLambdaCode({
+    lambdaExternal,
+    lambdaEntryPoints,
+    lambdaEntryPointsBaseDir,
+    lambdaOutdir
+  });
+  const { bucket, key, versionId } = await uploadCodeToS3({
+    stackName,
+    lambdaOutdir
+  });
   if (!lambdaImage) {
-    await deployLambdaLayers({ lambdaExternals });
+    await deployLambdaLayers({ lambdaExternal });
     return { bucket, key, versionId };
   }
   const { imageUri } = await uploadCodeToECR({
@@ -2662,7 +2680,7 @@ var deployLambdaCode = async ({
     key,
     versionId,
     lambdaDockerfile,
-    lambdaExternals
+    lambdaExternal
   });
   return { imageUri };
 };
@@ -2685,8 +2703,8 @@ var deployCicdLambdas = async ({ stackName }) => {
     throw new Error("Cannot read CICD lambdas file.");
   })();
   const s32 = await deployLambdaCode({
-    lambdaInput,
-    lambdaExternals: [],
+    lambdaEntryPoints: [lambdaInput],
+    lambdaExternal: [],
     /**
      * Needs stackName to define the S3 key.
      */
@@ -3010,14 +3028,32 @@ var findAndReadCloudFormationTemplate = async ({
   const configFilePath = path.resolve(process.cwd(), templatePath);
   return readConfigFile({ configFilePath });
 };
+
+// src/deploy/lambda/getLambdaEntryPointsFromTemplate.ts
+var getLambdaEntryPointsFromTemplate = (template) => {
+  const lambdaResources = Object.keys(template.Resources).filter((key) => {
+    return ["AWS::Lambda::Function", "AWS::Serverless::Function"].includes(
+      template.Resources[key].Type
+    );
+  });
+  const handlers = lambdaResources.map((key) => {
+    return template.Resources[key].Properties.Handler;
+  });
+  const handlersPaths = handlers.map((handler) => {
+    return handler.split(".")[0] + ".ts";
+  });
+  return handlersPaths;
+};
 var logPrefix12 = "cloudformation";
 log5.addLevel("event", 1e4, { fg: "yellow" });
 log5.addLevel("output", 1e4, { fg: "blue" });
 var deployCloudFormation = async ({
   lambdaDockerfile,
-  lambdaInput,
+  lambdaEntryPoints,
+  lambdaEntryPointsBaseDir,
   lambdaImage,
-  lambdaExternals = [],
+  lambdaExternal,
+  lambdaOutdir,
   parameters,
   template,
   templatePath
@@ -3065,11 +3101,19 @@ var deployCloudFormation = async ({
       }) || []
     };
     const deployCloudFormationDeployLambdaCode = async () => {
+      const finalLambdaEntryPoints = (() => {
+        if (lambdaEntryPoints && lambdaEntryPoints.length > 0) {
+          return lambdaEntryPoints;
+        }
+        return getLambdaEntryPointsFromTemplate(cloudFormationTemplate);
+      })();
       const response = await deployLambdaCode({
         lambdaDockerfile,
-        lambdaExternals,
-        lambdaInput,
+        lambdaExternal,
+        lambdaEntryPoints: finalLambdaEntryPoints,
+        lambdaEntryPointsBaseDir,
         lambdaImage,
+        lambdaOutdir,
         stackName
       });
       if (response) {
@@ -3964,7 +4008,7 @@ var options5 = {
   },
   destroy: {
     default: false,
-    describe: 'Destroy the deployment. You cannot destroy a deploy with "environment" is defined.',
+    describe: 'Destroy the deployment. You cannot destroy a deploy when "environment" is defined.',
     type: "boolean"
   },
   "lambda-dockerfile": {
@@ -3980,14 +4024,24 @@ var options5 = {
     describe: "A Lambda image will be created instead using S3.",
     type: "boolean"
   },
-  "lambda-externals": {
+  "lambda-external": {
     default: [],
-    describe: "Lambda external packages.",
+    describe: "External modules that will not be bundled in the Lambda code.",
     type: "array"
   },
-  "lambda-input": {
-    default: "src/lambda.ts",
-    describe: "Lambda input file. This file export all handlers used by the Lambda Functions.",
+  "lambda-entry-points-base-dir": {
+    default: "src",
+    describe: "Base directory for Lambda entry points.",
+    type: "string"
+  },
+  "lambda-entry-points": {
+    default: [],
+    describe: "This is an array of files that each serve as an input to the bundling algorithm for Lambda functions.",
+    type: "string"
+  },
+  "lambda-outdir": {
+    default: "dist",
+    describe: "Output directory for built Lambda code.",
     type: "string"
   },
   /**
@@ -4010,15 +4064,16 @@ var options5 = {
   "skip-deploy": {
     alias: "skip",
     default: false,
-    describe: "Skip deploy.",
+    describe: "Skip the deploy command.",
     type: "boolean"
   },
   "stack-name": {
-    describe: "CloudFormation Stack name.",
+    describe: "Set the stack name.",
     type: "string"
   },
   "template-path": {
     alias: "t",
+    describe: "Path to the CloudFormation template.",
     type: "string"
   }
 };
@@ -4029,7 +4084,7 @@ var examples = [
   ],
   ["carlin deploy -e Production", "Set environment."],
   [
-    "carlin deploy --lambda-input src/lambda/index.ts --lambda-externals momentjs",
+    "carlin deploy --lambda-externals momentjs",
     "Lambda exists. Don't bundle momentjs."
   ],
   [
@@ -4075,6 +4130,17 @@ var deployCommand = {
         );
         process.exit(0);
       }
+    }).middleware(({ lambdaExternals, lambdaInput }) => {
+      if (lambdaInput) {
+        throw new Error(
+          'Option "lambdaInput" was removed. Please use "lambdaEntryPoints" instead.'
+        );
+      }
+      if (lambdaExternals) {
+        throw new Error(
+          'Option "lambdaExternals" was removed. Please use "lambdaExternal" instead.'
+        );
+      }
     });
     const commands = [
       deployLambdaLayerCommand,
@@ -4088,7 +4154,7 @@ var deployCommand = {
       choices: commands.map(({ command }) => {
         return command;
       }),
-      describe: "Type of deployment.",
+      describe: "Deploy command.",
       type: "string"
     });
     commands.forEach((command) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.31.21",
+  "version": "1.32.0",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -46,9 +46,9 @@
     "uglify-js": "^3.17.4",
     "vercel": "^34.1.3",
     "yargs": "^17.7.2",
-    "@ttoss/config": "^1.32.3",
     "@ttoss/cloudformation": "^0.9.7",
-    "@ttoss/read-config-file": "^1.0.2"
+    "@ttoss/read-config-file": "^1.0.2",
+    "@ttoss/config": "^1.32.3"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",