carlin 0.19.14 → 0.20.0

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.20.0](https://github.com/ttoss/carlin/compare/v0.19.17...v0.20.0) (2022-02-01)
+
+### Bug Fixes
+
+- update cloudfront protocol ([13678cd](https://github.com/ttoss/carlin/commit/13678cd3551924aa47d72ec322ea3d8c0e0502bc))
+
+### Features
+
+- add tags to ecs report ([d0bf69d](https://github.com/ttoss/carlin/commit/d0bf69d82a737053a539356d8ba7afba966dacc3))
+
+## [0.19.17](https://github.com/ttoss/carlin/compare/v0.19.16...v0.19.17) (2022-01-24)
+
+### Bug Fixes
+
+- pipelines commands ([1c01d40](https://github.com/ttoss/carlin/commit/1c01d4077ae6fc9fc1ab6a565c0d08b50a575664))
+
+## [0.19.16](https://github.com/ttoss/carlin/compare/v0.19.15...v0.19.16) (2022-01-04)
+
+### Bug Fixes
+
+- add set -e to cicd pipelines ([95ba9a7](https://github.com/ttoss/carlin/commit/95ba9a7317e02a8e60b579a6f50132ef7629c1f8))
+
+## [0.19.15](https://github.com/ttoss/carlin/compare/v0.19.14...v0.19.15) (2021-12-23)
+
+### Bug Fixes
+
+- improve cicd docs ([3265dbc](https://github.com/ttoss/carlin/commit/3265dbc9a353cdd176aa6d79b2adb638db30931a))
+
 ## [0.19.14](https://github.com/ttoss/carlin/compare/v0.19.9...v0.19.14) (2021-12-09)
 
 ### Bug Fixes

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

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ecsTaskReportHandler = exports.getEcsTaskLogsUrl = void 0;
+exports.ecsTaskReportHandler = exports.getEcsTaskTags = exports.getEcsTaskLogsUrl = void 0;
 const webhook_1 = require("@slack/webhook");
+const aws_sdk_1 = require("aws-sdk");
 const putApprovalResultManualTask_1 = require("./putApprovalResultManualTask");
-const getEcsTaskLogsUrl = ({ ecsTaskArn }) => {
-    if (!process.env.ECS_TASK_CONTAINER_NAME ||
-        !process.env.ECS_TASK_LOGS_LOG_GROUP) {
-        return undefined;
-    }
+const ecs = new aws_sdk_1.ECS({ apiVersion: '2014-11-13' });
+const getEcsTaskId = ({ ecsTaskArn }) => {
     /**
      * Arn has the following format:
      * arn:aws:ecs:us-east-1:483684946879:task/CarlinCicdCarlinMonorepo-RepositoryTasksECSCluster-1J6saGT91hCr/6fcc78682de442ae89a0b7339ac7d981
@@ -15,6 +13,24 @@ const getEcsTaskLogsUrl = ({ ecsTaskArn }) => {
      * We want the "6fcc78682de442ae89a0b7339ac7d981" part.
      */
     const ecsTaskId = ecsTaskArn.split('/')[2];
+    return ecsTaskId;
+};
+const getEcsTaskCluster = ({ ecsTaskArn }) => {
+    /**
+     * Arn has the following format:
+     * arn:aws:ecs:us-east-1:483684946879:task/CarlinCicdCarlinMonorepo-RepositoryTasksECSCluster-1J6saGT91hCr/6fcc78682de442ae89a0b7339ac7d981
+     *
+     * We want the "CarlinCicdCarlinMonorepo-RepositoryTasksECSCluster-1J6saGT91hCr" part.
+     */
+    const ecsTaskCluster = ecsTaskArn.split('/')[1];
+    return ecsTaskCluster;
+};
+const getEcsTaskLogsUrl = ({ ecsTaskArn }) => {
+    if (!process.env.ECS_TASK_CONTAINER_NAME ||
+        !process.env.ECS_TASK_LOGS_LOG_GROUP) {
+        return undefined;
+    }
+    const ecsTaskId = getEcsTaskId({ ecsTaskArn });
     const ecsTaskLogsUrl = new URL([
         /**
          * https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime
@@ -30,6 +46,19 @@ const getEcsTaskLogsUrl = ({ ecsTaskArn }) => {
     return ecsTaskLogsUrl.href;
 };
 exports.getEcsTaskLogsUrl = getEcsTaskLogsUrl;
+const getEcsTaskTags = async ({ ecsTaskArn, }) => {
+    const cluster = getEcsTaskCluster({ ecsTaskArn });
+    const taskId = getEcsTaskId({ ecsTaskArn });
+    const { tasks } = await ecs
+        .describeTasks({ cluster, include: ['TAGS'], tasks: [taskId] })
+        .promise();
+    const task = tasks === null || tasks === void 0 ? void 0 : tasks[0];
+    if (!task) {
+        return undefined;
+    }
+    return task.tags;
+};
+exports.getEcsTaskTags = getEcsTaskTags;
 /**
  * This method is invoked when an ECS task is executed and the success or
  * failure commands calls `carlin cicd-ecs-task-report --status=<status>`.
@@ -47,6 +76,7 @@ const ecsTaskReportHandler = async ({ ecsTaskArn, status, pipelineName, }) => {
             });
         }
     };
+    const ecsTaskTags = ecsTaskArn && (await exports.getEcsTaskTags({ ecsTaskArn }));
     const handleStackNotification = async () => {
         /**
          * Do not send a notification if the task was main pipeline with tag.
@@ -79,6 +109,7 @@ const ecsTaskReportHandler = async ({ ecsTaskArn, status, pipelineName, }) => {
                         text: `\`\`\`${JSON.stringify({
                             status,
                             pipelineName,
+                            ecsTaskTags,
                         }, null, 2)}\`\`\``,
                     },
                 },

package/dist/deploy/cicd/pipelines.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTagCommands = exports.getMainCommands = exports.getClosedPrCommands = exports.getPrCommands = exports.pipelines = void 0;
+exports.getTagCommands = exports.getMainCommands = exports.getClosedPrCommands = exports.getPrCommands = exports.getCommandFileDir = exports.pipelines = void 0;
 exports.pipelines = ['pr', 'main', 'tag'];
-const executeCommandFile = (pipeline) => `chmod +x ./cicd/commands/${pipeline} && ./cicd/commands/${pipeline}`;
+const getCommandFileDir = (pipeline) => `./cicd/commands/${pipeline}`;
+exports.getCommandFileDir = getCommandFileDir;
 const getPrCommands = ({ branch }) => [
+    'set -e',
     'git status',
     'git fetch',
     /**
@@ -15,7 +17,7 @@ const getPrCommands = ({ branch }) => [
     'git rev-parse HEAD',
     'git status',
     'yarn',
-    executeCommandFile('pr'),
+    `sh -e ${exports.getCommandFileDir('pr')}`,
 ];
 exports.getPrCommands = getPrCommands;
 const getClosedPrCommands = ({ branch }) => [
@@ -27,10 +29,11 @@ const getClosedPrCommands = ({ branch }) => [
     'git pull origin main',
     'git rev-parse HEAD',
     `export CARLIN_BRANCH=${branch}`,
-    executeCommandFile('closed-pr'),
+    `sh ${exports.getCommandFileDir('closed-pr')} || true`,
 ];
 exports.getClosedPrCommands = getClosedPrCommands;
 const getMainCommands = () => [
+    'set -e',
     `export CARLIN_ENVIRONMENT=Staging`,
     'git status',
     'git fetch',
@@ -41,16 +44,17 @@ const getMainCommands = () => [
      */
     'if git describe --exact-match; then echo "Tag found" && carlin cicd-ecs-task-report --status=MainTagFound && exit 0; fi',
     'yarn',
-    executeCommandFile('main'),
+    `sh -e ${exports.getCommandFileDir('main')}`,
 ];
 exports.getMainCommands = getMainCommands;
 const getTagCommands = ({ tag }) => [
+    'set -e',
     `export CARLIN_ENVIRONMENT=Production`,
     'git status',
     'git fetch --tags',
     `git checkout tags/${tag} -b ${tag}-branch`,
     'git rev-parse HEAD',
     'yarn',
-    executeCommandFile('tag'),
+    `sh -e ${exports.getCommandFileDir('tag')}`,
 ];
 exports.getTagCommands = getTagCommands;

package/dist/deploy/command.js

@@ -42,8 +42,8 @@ const checkAwsAccountId = async (awsAccountId) => {
             throw new Error(`AWS account id does not match. Current is "${currentAwsAccountId}" but the defined in configuration files is "${awsAccountId}".`);
         }
     }
-    catch (err) {
-        npmlog_1.default.error(logPrefix, err.message);
+    catch (error) {
+        npmlog_1.default.error(logPrefix, error.message);
         process.exit();
     }
 };
@@ -55,8 +55,8 @@ const describeDeployCommand = {
             const newStackName = stackName || (await stackName_1.getStackName());
             await cloudFormation_core_1.printStackOutputsAfterDeploy({ stackName: newStackName });
         }
-        catch (err) {
-            npmlog_1.default.info(logPrefix, 'Cannot describe stack. Message: %s', err.message);
+        catch (error) {
+            npmlog_1.default.info(logPrefix, 'Cannot describe stack. Message: %s', error.message);
         }
     },
 };
@@ -192,12 +192,20 @@ exports.deployCommand = {
                 npmlog_1.default.warn(logPrefix, "Skip deploy flag is true, then the deploy command wasn't executed.");
                 process.exit(0);
             }
-        })
-            .command(command_3.deployLambdaLayerCommand)
-            .command(describeDeployCommand)
-            .command(command_1.deployBaseStackCommand)
-            .command(command_4.deployStaticAppCommand)
-            .command(command_2.deployCicdCommand);
+        });
+        const commands = [
+            command_3.deployLambdaLayerCommand,
+            describeDeployCommand,
+            command_1.deployBaseStackCommand,
+            command_4.deployStaticAppCommand,
+            command_2.deployCicdCommand,
+        ];
+        yargsBuilder.positional('deploy', {
+            choices: commands.map(({ command }) => command),
+            describe: 'Type of deployment.',
+            type: 'string',
+        });
+        commands.forEach((command) => yargsBuilder.command(command));
         return yargsBuilder;
     },
     handler: ({ destroy, ...rest }) => {
@@ -205,6 +213,7 @@ exports.deployCommand = {
             cloudFormation_1.destroyCloudFormation();
         }
         else {
+            console.log(rest);
             cloudFormation_1.deployCloudFormation(rest);
         }
     },

package/dist/deploy/lambdaLayer/command.js

@@ -10,18 +10,18 @@ const config_1 = require("../../config");
 const utils_1 = require("../../utils");
 const deployLambdaLayer_1 = require("./deployLambdaLayer");
 const logPrefix = 'deploy-lambda-layer';
+/**
+ * https://stackoverflow.com/a/64880672/8786986
+ */
+const packageNameRegex = /@[~^]?([\dvx*]+(?:[-.](?:[\dx*]+|alpha|beta))*)/;
 exports.options = {
     packages: {
         array: true,
-        describe: "NPM packages' names to be deployed as Lambda Layers. ",
+        describe: `NPM packages' names to be deployed as Lambda Layers. It must follow the format: ${packageNameRegex.toString()}.`,
         required: true,
         type: 'string',
     },
 };
-/**
- * https://stackoverflow.com/a/64880672/8786986
- */
-const packageNameRegex = /@[~^]?([\dvx*]+(?:[-.](?:[\dx*]+|alpha|beta))*)/;
 exports.deployLambdaLayerCommand = {
     command: 'lambda-layer',
     describe: 'Deploy Lambda Layer.',
@@ -34,7 +34,7 @@ exports.deployLambdaLayerCommand = {
         })
             .filter((packageName) => !!packageName);
         if (invalidPackages.length > 0) {
-            throw new Error(`Some package names are invalid: ${invalidPackages.join(', ')}`);
+            throw new Error(`Some package names are invalid: ${invalidPackages.join(', ')}. The package must follow the pattern: ${packageNameRegex.toString()}.`);
         }
         else {
             return true;

package/dist/deploy/staticApp/staticApp.template.js

@@ -777,6 +777,12 @@ const getCloudFrontTemplate = ({ acm, aliases, cloudfront, gtmId, csp, spa, host
         },
     };
     if (acm) {
+        const acmRegex = /^arn:aws:acm:[-a-z0-9]+:\d{12}:certificate\/[-a-z0-9]+$/;
+        const acmCertificateArn = acmRegex.test(acm)
+            ? acm
+            : {
+                'Fn::ImportValue': acm,
+            };
         /**
          * Add ACM to CloudFront template.
          */
@@ -785,11 +791,11 @@ const getCloudFrontTemplate = ({ acm, aliases, cloudfront, gtmId, csp, spa, host
                 .DistributionConfig,
             Aliases: aliases || { Ref: 'AWS::NoValue' },
             ViewerCertificate: {
-                AcmCertificateArn: /^arn:aws:acm:[-a-z0-9]+:\d{12}:certificate\/[-a-z0-9]+$/.test(acm)
-                    ? acm
-                    : {
-                        'Fn::ImportValue': acm,
-                    },
+                AcmCertificateArn: acmCertificateArn,
+                /**
+                 * AWS CloudFront recommendation.
+                 */
+                MinimumProtocolVersion: 'TLSv1.2_2021',
                 SslSupportMethod: 'sni-only',
             },
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "0.19.14",
+  "version": "0.20.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {