carlin 1.19.6 → 1.19.7

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

@@ -63,9 +63,6 @@ const getEcsTaskTags = async ({ ecsTaskArn, }) => {
     }
 };
 exports.getEcsTaskTags = getEcsTaskTags;
-(0, exports.getEcsTaskTags)({
-    ecsTaskArn: 'arn:aws:ecs:us-east-1:483684946879:task/CarlinCicdCarlinMonorepo-RepositoryTasksECSCluster-1J6saGT91hCr/f70d559c47804d6383df170712d3e455',
-}).then();
 /**
  * This method is invoked when an ECS task is executed and the success or
  * failure commands calls `carlin cicd-ecs-task-report --status=<status>`.

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

@@ -1,36 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeTasks = exports.shConditionalCommands = void 0;
+exports.executeTasks = void 0;
 const aws_sdk_1 = require("aws-sdk");
+const shConditionalCommands_1 = require("./shConditionalCommands");
 const getProcessEnvVariable_1 = require("./getProcessEnvVariable");
 const ecs = new aws_sdk_1.ECS({ apiVersion: '2014-11-13', maxRetries: 3 });
-const compileCommands = (commands) => {
-    return commands.map((c) => c.replace(/;$/, '')).join(' && ');
-};
-const approvedStatus = 'Approved';
-const rejectedStatus = 'Rejected';
-const successCommands = [
-    `carlin cicd-ecs-task-report --status=${approvedStatus}`,
-];
-const failureCommands = [
-    `carlin cicd-ecs-task-report --status=${rejectedStatus}`,
-];
-const shConditionalCommands = ({ conditionalCommands, }) => {
-    const conditionalCommand = compileCommands(conditionalCommands);
-    const successCommand = compileCommands([
-        'echo "Success Command"',
-        ...successCommands,
-    ]);
-    const failureCommand = compileCommands([
-        'echo "Failure Command"',
-        ...failureCommands,
-    ]);
-    const finallyCommand = compileCommands(['echo "Finally Command"']);
-    return `if ${conditionalCommand}; then ${successCommand}; else ${failureCommand}; fi; ${finallyCommand}`;
-};
-exports.shConditionalCommands = shConditionalCommands;
 const executeTasks = async ({ commands = [], cpu, memory, taskEnvironment = [], tags = [], }) => {
-    const command = compileCommands([
+    const command = (0, shConditionalCommands_1.compileCommands)([
         /**
          * https://stackoverflow.com/questions/2853803/how-to-echo-shell-commands-as-they-are-executed/2853811
          */

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

@@ -8,6 +8,7 @@ const webhooks_1 = require("@octokit/webhooks");
 const executeTasks_1 = require("./executeTasks");
 const getProcessEnvVariable_1 = require("./getProcessEnvVariable");
 const getTriggerPipelineObjectKey_1 = require("../getTriggerPipelineObjectKey");
+const shConditionalCommands_1 = require("./shConditionalCommands");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const s3 = new aws_sdk_1.S3();
 /**
@@ -59,7 +60,7 @@ exports.webhooks.on(['pull_request.opened', 'pull_request.reopened', 'pull_reque
     }
     await (0, executeTasks_1.executeTasks)({
         commands: [
-            (0, executeTasks_1.shConditionalCommands)({
+            (0, shConditionalCommands_1.shConditionalCommands)({
                 conditionalCommands: (0, pipelines_1.getPrCommands)({
                     branch: payload.pull_request.head.ref,
                 }),
@@ -85,7 +86,7 @@ exports.webhooks.on(['pull_request.closed'], async ({ payload }) => {
         cpu: '512',
         memory: '2048',
         commands: [
-            (0, executeTasks_1.shConditionalCommands)({
+            (0, shConditionalCommands_1.shConditionalCommands)({
                 conditionalCommands: (0, pipelines_1.getClosedPrCommands)({
                     branch: payload.pull_request.head.ref,
                 }),

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageUpdaterScheduleHandler = void 0;
+const config_1 = require("../config");
 const executeTasks_1 = require("./executeTasks");
+const shConditionalCommands_1 = require("./shConditionalCommands");
 /**
  * Update CI/CD resources with the newest carlin and repository image.
  */
@@ -10,20 +12,25 @@ const imageUpdaterScheduleHandler = async () => {
     if (!cicdConfig) {
         return;
     }
-    const commands = [
-        'set -e',
-        'git status',
-        'git fetch',
-        'git pull origin main',
-        'git rev-parse HEAD',
-        'yarn global add carlin',
-        'cd cicd',
-        'echo $CICD_CONFIG > carlin.json',
-        'cat carlin.json',
-        `carlin deploy cicd -c carlin.json`,
-    ];
+    const command = (0, shConditionalCommands_1.shConditionalCommands)({
+        conditionalCommands: [
+            /**
+             * -e  Exit immediately if a command exits with a non-zero status.
+             */
+            'set -e',
+            'git status',
+            'git fetch',
+            'git pull origin main',
+            'git rev-parse HEAD',
+            'yarn global add carlin',
+            `cd ${config_1.CICD_FOLDER_NAME}`,
+            'echo $CICD_CONFIG > carlin.json',
+            'cat carlin.json',
+            `carlin deploy cicd -c carlin.json`,
+        ],
+    });
     await (0, executeTasks_1.executeTasks)({
-        commands,
+        commands: [command],
         cpu: '512',
         memory: '2048',
         taskEnvironment: [

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

@@ -7,6 +7,7 @@ const aws_sdk_1 = require("aws-sdk");
 const pipelines_1 = require("../pipelines");
 const executeTasks_1 = require("./executeTasks");
 const putApprovalResultManualTask_1 = require("./putApprovalResultManualTask");
+const shConditionalCommands_1 = require("./shConditionalCommands");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const codepipeline = new aws_sdk_1.CodePipeline();
 const getUserParameters = (event) => {
@@ -75,7 +76,7 @@ const pipelinesHandler = async (event) => {
             if (pipeline === 'main') {
                 return {
                     commands: [
-                        (0, executeTasks_1.shConditionalCommands)({
+                        (0, shConditionalCommands_1.shConditionalCommands)({
                             conditionalCommands: (0, pipelines_1.getMainCommands)(),
                         }),
                     ],
@@ -87,7 +88,7 @@ const pipelinesHandler = async (event) => {
                 const tag = gitHubJobDetails.payload.ref.split('/')[2];
                 return {
                     commands: [
-                        (0, executeTasks_1.shConditionalCommands)({
+                        (0, shConditionalCommands_1.shConditionalCommands)({
                             conditionalCommands: (0, pipelines_1.getTagCommands)({ tag }),
                         }),
                     ],

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shConditionalCommands = exports.compileCommands = void 0;
+const compileCommands = (commands) => {
+    return commands.map((c) => c.replace(/;$/, '')).join(' && ');
+};
+exports.compileCommands = compileCommands;
+const approvedStatus = 'Approved';
+const rejectedStatus = 'Rejected';
+const defaultSuccessCommands = [
+    `carlin cicd-ecs-task-report --status=${approvedStatus}`,
+];
+const defaultFailureCommands = [
+    `carlin cicd-ecs-task-report --status=${rejectedStatus}`,
+];
+const defaultFinallyCommands = ['echo "Finally Command"'];
+const shConditionalCommands = ({ conditionalCommands, successCommands = defaultSuccessCommands, failureCommands = defaultFailureCommands, finallyCommands = defaultFinallyCommands, }) => {
+    const conditionalCommand = (0, exports.compileCommands)(conditionalCommands);
+    const successCommand = (0, exports.compileCommands)([
+        'echo "Success Command"',
+        ...successCommands,
+    ]);
+    const failureCommand = (0, exports.compileCommands)([
+        'echo "Failure Command"',
+        ...failureCommands,
+    ]);
+    const finallyCommand = (0, exports.compileCommands)(finallyCommands);
+    return `if ${conditionalCommand}; then ${successCommand}; else ${failureCommand}; fi; ${finallyCommand}`;
+};
+exports.shConditionalCommands = shConditionalCommands;

package/dist/deploy/cicd/pipelines.js

@@ -6,6 +6,9 @@ exports.pipelines = ['pr', 'main', 'tag'];
 const getCommandFileDir = (pipeline) => `./${config_1.CICD_FOLDER_NAME}/commands/${pipeline}`;
 exports.getCommandFileDir = getCommandFileDir;
 const getPrCommands = ({ branch }) => [
+    /**
+     * -e  Exit immediately if a command exits with a non-zero status.
+     */
     'set -e',
     'git status',
     'git fetch',
@@ -37,6 +40,9 @@ const getClosedPrCommands = ({ branch }) => [
 ];
 exports.getClosedPrCommands = getClosedPrCommands;
 const getMainCommands = () => [
+    /**
+     * -e  Exit immediately if a command exits with a non-zero status.
+     */
     'set -e',
     `export CARLIN_ENVIRONMENT=Staging`,
     'git status',
@@ -55,6 +61,9 @@ const getMainCommands = () => [
 ];
 exports.getMainCommands = getMainCommands;
 const getTagCommands = ({ tag }) => [
+    /**
+     * -e  Exit immediately if a command exits with a non-zero status.
+     */
     'set -e',
     `export CARLIN_ENVIRONMENT=Production`,
     'git status',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.19.6",
+  "version": "1.19.7",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "f5cd08c3e4f80d41492f5d56879348b1bc2948cb"
+  "gitHead": "7e731b5b04483047f3a3a2087fa3de253a4ed134"
 }