carlin 1.31.2 → 1.31.4

package/dist/cli.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,19 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cli = exports.options = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-param-reassign */
-const yargs = __importStar(require("yargs"));
 const config_1 = require("./config");
 const utils_1 = require("./utils");
 const change_case_1 = require("change-case");
 const command_1 = require("./deploy/command");
 const ecsTaskReportCommand_1 = require("./deploy/cicd/ecsTaskReportCommand");
 const generateEnvCommand_1 = require("./generateEnv/generateEnvCommand");
+const helpers_1 = require("yargs/helpers");
 const cloudformation_1 = require("@ttoss/cloudformation");
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const deep_equal_1 = __importDefault(require("deep-equal"));
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
 const path_1 = __importDefault(require("path"));
+const yargs_1 = __importDefault(require("yargs"));
 const coerceSetEnvVar = (env) => {
     return (value) => {
         (0, utils_1.setEnvVar)(env, value);
@@ -167,7 +145,7 @@ const cli = () => {
         finalConfig = deepmerge_1.default.all(configs.reverse());
         return finalConfig;
     };
-    return (yargs
+    return ((0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         /**
          * It can't be full strict because options may overlap among carlin config
          * files.
@@ -205,13 +183,12 @@ const cli = () => {
                  * - Case 3 if the two above are falsy.
                  */
                 const isKeyFromCli = (() => {
-                    var _a;
                     const paramCaseKey = (0, change_case_1.paramCase)(key);
                     /**
                      * Case 1.
                      * Fixes #16 https://github.com/ttoss/carlin/issues/16
                      */
-                    if ((_a = parsed === null || parsed === void 0 ? void 0 : parsed.defaulted) === null || _a === void 0 ? void 0 : _a[paramCaseKey]) {
+                    if (parsed?.defaulted?.[paramCaseKey]) {
                         return false;
                     }
                     /**

package/dist/deploy/addDefaults.cloudFormation.js

@@ -54,8 +54,7 @@ const addLogGroupToResources = (template) => {
              * Properties includes the Lambda logical id.
              */
             const logGroup = resourcesEntries.find(([, resource2]) => {
-                var _a, _b;
-                const logGroupNameStr = JSON.stringify(((_b = (_a = resource2.Properties) === null || _a === void 0 ? void 0 : _a.LogGroupName) === null || _b === void 0 ? void 0 : _b['Fn::Join']) || '');
+                const logGroupNameStr = JSON.stringify(resource2.Properties?.LogGroupName?.['Fn::Join'] || '');
                 return logGroupNameStr.includes(key);
             });
             if (!logGroup) {

package/dist/deploy/cicd/command.options.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCicdConfig = exports.options = void 0;
 const change_case_1 = require("change-case");
+const helpers_1 = require("yargs/helpers");
 const pipelines_1 = require("./pipelines");
 const yargs_1 = __importDefault(require("yargs"));
 exports.options = {
@@ -60,7 +61,7 @@ exports.options = {
     },
 };
 const getCicdConfig = () => {
-    const { parsed } = yargs_1.default.config();
+    const { parsed } = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv)).config();
     if (!parsed) {
         return false;
     }
@@ -71,6 +72,7 @@ const getCicdConfig = () => {
             acc[key] = value;
         }
         return acc;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }, {});
     return config;
 };

package/dist/deploy/cicd/lambdas/ecsTaskReport.handler.js

@@ -52,7 +52,7 @@ const getEcsTaskTags = async ({ ecsTaskArn, }) => {
         const { tasks } = await ecs
             .describeTasks({ cluster, include: ['TAGS'], tasks: [ecsTaskArn] })
             .promise();
-        const task = tasks === null || tasks === void 0 ? void 0 : tasks[0];
+        const task = tasks?.[0];
         if (!task) {
             return undefined;
         }

package/dist/deploy/cicd/lambdas/pipelines.handler.js

@@ -68,7 +68,6 @@ const getJobDetails = async (event) => {
 };
 exports.getJobDetails = getJobDetails;
 const pipelinesHandler = async (event) => {
-    var _a, _b;
     const jobId = event['CodePipeline.job'].id;
     let pipelineName;
     try {
@@ -77,7 +76,7 @@ const pipelinesHandler = async (event) => {
         const { jobDetails } = await codepipeline
             .getJobDetails({ jobId })
             .promise();
-        pipelineName = (_b = (_a = jobDetails === null || jobDetails === void 0 ? void 0 : jobDetails.data) === null || _a === void 0 ? void 0 : _a.pipelineContext) === null || _b === void 0 ? void 0 : _b.pipelineName;
+        pipelineName = jobDetails?.data?.pipelineContext?.pipelineName;
         const executeTasksInput = (() => {
             const tags = [
                 {

package/dist/deploy/cicd/lambdas/putApprovalResultManualTask.js

@@ -8,7 +8,6 @@ const FIVE_SECONDS = 5 * 1000;
 const getApprovalActionToken = ({ actionName, stageName, pipelineName, }) => new Promise((resolve, reject) => {
     setTimeout(() => {
         codepipeline.getPipelineState({ name: pipelineName }, async (err, { stageStates = [] }) => {
-            var _a;
             if (err) {
                 return reject(err);
             }
@@ -16,7 +15,7 @@ const getApprovalActionToken = ({ actionName, stageName, pipelineName, }) => new
             if (!approvalStageState) {
                 throw new Error('ApprovalStageStateIsUndefined');
             }
-            const approvalActionState = (_a = approvalStageState.actionStates) === null || _a === void 0 ? void 0 : _a.find((a) => a.actionName === actionName);
+            const approvalActionState = approvalStageState.actionStates?.find((a) => a.actionName === actionName);
             if (!approvalActionState) {
                 throw new Error('ApprovalActionStateIsUndefined');
             }

package/dist/deploy/cloudFormation.core.js

@@ -132,7 +132,7 @@ const describeStack = async ({ stackName }) => {
 exports.describeStack = describeStack;
 const getStackOutput = async ({ stackName, outputKey, }) => {
     const { Outputs = [] } = await (0, exports.describeStack)({ stackName });
-    const output = Outputs === null || Outputs === void 0 ? void 0 : Outputs.find(({ OutputKey }) => {
+    const output = Outputs?.find(({ OutputKey }) => {
         return OutputKey === outputKey;
     });
     if (!output) {

package/dist/deploy/cloudFormation.js

@@ -31,9 +31,8 @@ const deployCloudFormation = async ({ lambdaDockerfile, lambdaInput, lambdaImage
          * Add Parameters passed on CLI to CloudFormation template if they don't exist.
          * Also, automatically add the Type of the parameter.
          */
-        parameters === null || parameters === void 0 ? void 0 : parameters.forEach((parameter) => {
-            var _a;
-            if ((_a = cloudFormationTemplate.Parameters) === null || _a === void 0 ? void 0 : _a[parameter.key]) {
+        parameters?.forEach((parameter) => {
+            if (cloudFormationTemplate.Parameters?.[parameter.key]) {
                 return;
             }
             if (!cloudFormationTemplate.Parameters) {
@@ -59,14 +58,14 @@ const deployCloudFormation = async ({ lambdaDockerfile, lambdaInput, lambdaImage
             .promise();
         const params = {
             StackName: stackName,
-            Parameters: (parameters === null || parameters === void 0 ? void 0 : parameters.map((parameter) => {
+            Parameters: parameters?.map((parameter) => {
                 return {
                     ParameterKey: parameter.key,
                     ParameterValue: parameter.value,
                     UsePreviousValue: parameter.usePreviousValue,
                     ResolvedValue: parameter.resolvedValue,
                 };
-            })) || [],
+            }) || [],
         };
         const deployCloudFormationDeployLambdaCode = async () => {
             const response = await (0, deployLambdaCode_1.deployLambdaCode)({

package/dist/deploy/command.js

@@ -138,8 +138,9 @@ exports.deployCommand = {
              * Set stack name.
              */
             .middleware(({ stackName }) => {
-            if (stackName)
+            if (stackName) {
                 (0, stackName_1.setPreDefinedStackName)(stackName);
+            }
         })
             /**
              * Set lambdaImage if lambdaDockerfile exists.

package/dist/deploy/lambda/uploadCodeToECR.js

@@ -43,7 +43,7 @@ const uploadCodeToECR = async ({ bucket, key, lambdaExternals, lambdaDockerfile,
         sourceTypeOverride: 'S3',
     })
         .promise();
-    if (!(build === null || build === void 0 ? void 0 : build.id)) {
+    if (!build?.id) {
         throw new Error('Cannot start build.');
     }
     await (0, utils_1.waitCodeBuildFinish)({ buildId: build.id, name: 'lambda-builder' });

package/dist/deploy/lambdaLayer/deployLambdaLayer.js

@@ -14,7 +14,6 @@ const utils_2 = require("../utils");
 const npmlog_1 = __importDefault(require("npmlog"));
 const logPrefix = 'lambda-layer';
 const createLambdaLayerZipFile = async ({ codeBuildProjectName, packageName, }) => {
-    var _a, _b;
     npmlog_1.default.info(logPrefix, `Creating zip file for package ${packageName}...`);
     const codeBuild = new aws_sdk_1.CodeBuild();
     const { build } = await codeBuild
@@ -28,16 +27,16 @@ const createLambdaLayerZipFile = async ({ codeBuildProjectName, packageName, })
         projectName: codeBuildProjectName,
     })
         .promise();
-    if (!(build === null || build === void 0 ? void 0 : build.id)) {
+    if (!build?.id) {
         throw new Error('Cannot start build.');
     }
     const result = await (0, utils_1.waitCodeBuildFinish)({
         buildId: build.id,
         name: packageName,
     });
-    if ((_a = result.artifacts) === null || _a === void 0 ? void 0 : _a.location) {
+    if (result.artifacts?.location) {
         const location = result.artifacts.location.split('/');
-        const bucket = (_b = location.shift()) === null || _b === void 0 ? void 0 : _b.replace('arn:aws:s3:::', '');
+        const bucket = location.shift()?.replace('arn:aws:s3:::', '');
         if (!bucket) {
             throw new Error('Cannot retrieve bucket name.');
         }

package/dist/deploy/staticApp/getStaticAppBucket.js

@@ -10,7 +10,7 @@ const getStaticAppBucket = async ({ stackName, }) => {
     };
     try {
         const { StackResourceDetail } = await (0, cloudFormation_core_1.describeStackResource)(params);
-        return StackResourceDetail === null || StackResourceDetail === void 0 ? void 0 : StackResourceDetail.PhysicalResourceId;
+        return StackResourceDetail?.PhysicalResourceId;
     }
     catch (error) {
         return undefined;

package/dist/deploy/staticApp/invalidateCloudFront.js

@@ -15,7 +15,7 @@ const invalidateCloudFront = async ({ outputs, }) => {
         return;
     }
     const cloudFrontDistributionIDOutput = outputs.find((output) => output.OutputKey === CLOUDFRONT_DISTRIBUTION_ID);
-    if (cloudFrontDistributionIDOutput === null || cloudFrontDistributionIDOutput === void 0 ? void 0 : cloudFrontDistributionIDOutput.OutputValue) {
+    if (cloudFrontDistributionIDOutput?.OutputValue) {
         const distributionId = cloudFrontDistributionIDOutput.OutputValue;
         const params = {
             DistributionId: distributionId,

package/dist/deploy/staticApp/removeOldVersions.js

@@ -29,11 +29,13 @@ const removeOldVersions = async ({ bucket }) => {
         const { CommonPrefixes = [] } = await s3_1.s3
             .listObjectsV2({ Bucket: bucket, Delimiter: '/' })
             .promise();
-        const versions = CommonPrefixes === null || CommonPrefixes === void 0 ? void 0 : CommonPrefixes.map(({ Prefix }) => {
-            return Prefix === null || Prefix === void 0 ? void 0 : Prefix.replace('/', '');
-        }).filter((version) => {
+        const versions = CommonPrefixes?.map(({ Prefix }) => {
+            return Prefix?.replace('/', '');
+        })
+            .filter((version) => {
             return semver_1.default.valid(version);
-        }).sort((a, b) => {
+        })
+            .sort((a, b) => {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             return semver_1.default.gt(a, b) ? -1 : 1;
         });

package/dist/deploy/utils.js

@@ -8,7 +8,7 @@ const stackName_1 = require("./stackName");
 const npmlog_1 = __importDefault(require("npmlog"));
 const deployErrorLogs = ({ error, logPrefix, }) => {
     npmlog_1.default.error(logPrefix, `An error occurred. Cannot deploy ${logPrefix}.`);
-    npmlog_1.default.error(logPrefix, 'Error message: %j', error === null || error === void 0 ? void 0 : error.message);
+    npmlog_1.default.error(logPrefix, 'Error message: %j', error?.message);
 };
 exports.deployErrorLogs = deployErrorLogs;
 const handleDeployError = ({ error, logPrefix, }) => {

package/dist/generateEnv/generateEnvCommand.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEnvCommand = void 0;
 const generateEnv_1 = require("./generateEnv");
 exports.generateEnvCommand = {
-    command: 'generate-env',
+    command: ['generate-env', 'ge', 'env'],
     describe: 'Generate environment files.',
     handler: generateEnv_1.generateEnv,
 };

package/dist/utils/codeBuild.js

@@ -20,8 +20,8 @@ const waitCodeBuildFinish = async ({ buildId, name, }) => {
             .promise();
         return new Promise((resolve, reject) => {
             setTimeout(() => {
-                const executedBuild = builds === null || builds === void 0 ? void 0 : builds.find(({ id }) => id === buildId);
-                npmlog_1.default.info(logPrefix, `Build status of ${name || buildId}: ${executedBuild === null || executedBuild === void 0 ? void 0 : executedBuild.buildStatus}`);
+                const executedBuild = builds?.find(({ id }) => id === buildId);
+                npmlog_1.default.info(logPrefix, `Build status of ${name || buildId}: ${executedBuild?.buildStatus}`);
                 if (executedBuild && executedBuild.currentPhase === 'COMPLETED') {
                     if (executedBuild.buildStatus === 'SUCCEEDED') {
                         resolve(executedBuild);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.31.2",
+  "version": "1.31.4",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -22,17 +22,17 @@
     "dist/"
   ],
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.454.0",
+    "@aws-sdk/client-cloudformation": "^3.460.0",
     "@octokit/webhooks": "^12.0.8",
     "@slack/webhook": "^7.0.1",
     "adm-zip": "^0.5.10",
-    "aws-sdk": "^2.1502.0",
+    "aws-sdk": "^2.1505.0",
     "builtin-modules": "^3.3.0",
     "change-case": "^4.1.2",
     "deep-equal": "^2.2.3",
     "deepmerge": "^4.3.1",
     "dotenv": "^16.3.1",
-    "esbuild": "^0.19.7",
+    "esbuild": "^0.19.8",
     "findup-sync": "^5.0.0",
     "glob": "^10.3.10",
     "js-yaml": "^4.1.0",
@@ -45,7 +45,7 @@
     "uglify-js": "^3.17.4",
     "vercel": "^32.5.6",
     "yargs": "^17.7.2",
-    "@ttoss/cloudformation": "^0.8.2"
+    "@ttoss/cloudformation": "^0.8.4"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
@@ -56,14 +56,14 @@
     "@types/jest": "^29.5.10",
     "@types/js-yaml": "^4.0.9",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.9.4",
-    "@types/npmlog": "^4.1.6",
+    "@types/node": "^20.10.0",
+    "@types/npmlog": "^7.0.0",
     "@types/semver": "^7.5.6",
     "@types/uglify-js": "^3.17.4",
     "@types/yargs": "^17.0.32",
     "jest": "^29.7.0",
     "typescript": "~5.2.2",
-    "@ttoss/test-utils": "^2.0.0"
+    "@ttoss/test-utils": "^2.0.2"
   },
   "keywords": [],
   "publishConfig": {