carlin 0.20.5 → 0.21.2

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.21.2](https://github.com/ttoss/carlin/compare/v0.21.1...v0.21.2) (2022-03-10)
+
+**Note:** Version bump only for package carlin
+
+## [0.21.1](https://github.com/ttoss/carlin/compare/v0.21.0...v0.21.1) (2022-03-10)
+
+### Bug Fixes
+
+- closed-pr pipeline commands ([#47](https://github.com/ttoss/carlin/issues/47)) ([3eec7f1](https://github.com/ttoss/carlin/commit/3eec7f1ef81e5972c551f793cc4d5ab0b399b200))
+
+# [0.21.0](https://github.com/ttoss/carlin/compare/v0.20.5...v0.21.0) (2022-03-09)
+
+### Features
+
+- add repository image updater ([#45](https://github.com/ttoss/carlin/issues/45)) ([cbcbdea](https://github.com/ttoss/carlin/commit/cbcbdea7f08885dcfe833c637612472236d93b38))
+
 ## [0.20.5](https://github.com/ttoss/carlin/compare/v0.20.4...v0.20.5) (2022-02-24)
 
 ### Bug Fixes

package/dist/deploy/cicd/cicd.template.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCicdTemplate = exports.getRepositoryImageBuilder = exports.PIPELINES_HANDLER_LAMBDA_FUNCTION_LOGICAL_ID = exports.PIPELINES_TAG_LOGICAL_ID = exports.PIPELINES_MAIN_LOGICAL_ID = exports.PIPELINES_ROLE_LOGICAL_ID = exports.PIPELINES_ARTIFACT_STORE_S3_BUCKET_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_TASK_DEFINITION_TASK_ROLE_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_TASK_DEFINITION_EXECUTION_ROLE_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_CLUSTER_LOGS_LOG_GROUP_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_CLUSTER_LOGICAL_ID = exports.REPOSITORY_IMAGE_CODE_BUILD_PROJECT_LOGICAL_ID = exports.REPOSITORY_ECS_TASK_DEFINITION_LOGICAL_ID = exports.REPOSITORY_ECS_TASK_CONTAINER_NAME = exports.PROCESS_ENV_REPOSITORY_IMAGE_CODE_BUILD_PROJECT_NAME = exports.ECS_TASK_REPORT_HANDLER_LAMBDA_FUNCTION_LOGICAL_ID = exports.FUNCTION_IAM_ROLE_LOGICAL_ID = exports.ECR_REPOSITORY_LOGICAL_ID = exports.CODE_BUILD_PROJECT_SERVICE_ROLE_LOGICAL_ID = exports.CODE_BUILD_PROJECT_LOGS_LOGICAL_ID = exports.API_LOGICAL_ID = void 0;
+exports.getCicdTemplate = exports.getRepositoryImageBuilder = exports.IMAGE_UPDATER_SCHEDULE_SERVERLESS_FUNCTION_LOGICAL_ID = exports.PIPELINES_HANDLER_LAMBDA_FUNCTION_LOGICAL_ID = exports.PIPELINES_TAG_LOGICAL_ID = exports.PIPELINES_MAIN_LOGICAL_ID = exports.PIPELINES_ROLE_LOGICAL_ID = exports.PIPELINES_ARTIFACT_STORE_S3_BUCKET_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_TASK_DEFINITION_TASK_ROLE_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_TASK_DEFINITION_EXECUTION_ROLE_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_CLUSTER_LOGS_LOG_GROUP_LOGICAL_ID = exports.REPOSITORY_TASKS_ECS_CLUSTER_LOGICAL_ID = exports.REPOSITORY_IMAGE_CODE_BUILD_PROJECT_LOGICAL_ID = exports.REPOSITORY_ECS_TASK_DEFINITION_LOGICAL_ID = exports.REPOSITORY_ECS_TASK_CONTAINER_NAME = exports.PROCESS_ENV_REPOSITORY_IMAGE_CODE_BUILD_PROJECT_NAME = exports.ECS_TASK_REPORT_HANDLER_LAMBDA_FUNCTION_LOGICAL_ID = exports.FUNCTION_IAM_ROLE_LOGICAL_ID = exports.ECR_REPOSITORY_LOGICAL_ID = exports.CODE_BUILD_PROJECT_SERVICE_ROLE_LOGICAL_ID = exports.CODE_BUILD_PROJECT_LOGS_LOGICAL_ID = exports.API_LOGICAL_ID = void 0;
 const change_case_1 = require("change-case");
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const utils_1 = require("../../utils");
 const config_1 = require("../baseStack/config");
+const command_options_1 = require("./command.options");
 const config_2 = require("./config");
 const getTriggerPipelineObjectKey_1 = require("./getTriggerPipelineObjectKey");
 exports.API_LOGICAL_ID = 'ApiV1ServerlessApi';
@@ -29,6 +30,7 @@ exports.PIPELINES_ROLE_LOGICAL_ID = 'PipelinesMainIAMRole';
 exports.PIPELINES_MAIN_LOGICAL_ID = 'PipelinesMainCodePipeline';
 exports.PIPELINES_TAG_LOGICAL_ID = 'PipelinesTagCodePipeline';
 exports.PIPELINES_HANDLER_LAMBDA_FUNCTION_LOGICAL_ID = 'PipelinesHandlerLambdaFunction';
+exports.IMAGE_UPDATER_SCHEDULE_SERVERLESS_FUNCTION_LOGICAL_ID = 'ImageUpdaterScheduleServerlessFunction';
 /**
  * An [AWS CodeBuild](https://aws.amazon.com/codebuild/) project is created
  * to build (create and update) repository images. It uses a
@@ -251,6 +253,18 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
         },
     });
     resources[exports.ECR_REPOSITORY_LOGICAL_ID] = getEcrRepositoryResource();
+    const commonFunctionProperties = {
+        CodeUri: {
+            Bucket: s3.bucket,
+            Key: s3.key,
+            Version: s3.versionId,
+        },
+        Role: {
+            'Fn::GetAtt': [exports.FUNCTION_IAM_ROLE_LOGICAL_ID, 'Arn'],
+        },
+        Runtime: 'nodejs14.x',
+        Timeout: 60,
+    };
     /**
      * CodeBuild
      */
@@ -313,6 +327,35 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
         };
         resources[exports.REPOSITORY_IMAGE_CODE_BUILD_PROJECT_LOGICAL_ID] =
             (0, exports.getRepositoryImageBuilder)();
+        const cicdConfig = {
+            ...(0, command_options_1.getCicdConfig)(),
+            'ssh-key': '/root/.ssh/id_rsa',
+            environment: (0, utils_1.getEnvironment)(),
+        };
+        resources[exports.IMAGE_UPDATER_SCHEDULE_SERVERLESS_FUNCTION_LOGICAL_ID] = {
+            Type: 'AWS::Serverless::Function',
+            Properties: {
+                ...commonFunctionProperties,
+                Events: {
+                    Schedule: {
+                        Type: 'Schedule',
+                        Properties: {
+                            Schedule: 'rate(7 days)',
+                        },
+                    },
+                },
+                Environment: {
+                    Variables: {
+                        [exports.PROCESS_ENV_REPOSITORY_IMAGE_CODE_BUILD_PROJECT_NAME]: {
+                            Ref: exports.REPOSITORY_IMAGE_CODE_BUILD_PROJECT_LOGICAL_ID,
+                        },
+                        CICD_CONFIG: JSON.stringify(cicdConfig),
+                        ...executeEcsTaskVariables,
+                    },
+                },
+                Handler: 'index.imageUpdaterScheduleHandler',
+            },
+        };
     })();
     const createApiResources = () => {
         resources[exports.API_LOGICAL_ID] = {
@@ -422,18 +465,6 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
                 ],
             },
         };
-        const commonFunctionProperties = {
-            CodeUri: {
-                Bucket: s3.bucket,
-                Key: s3.key,
-                Version: s3.versionId,
-            },
-            Role: {
-                'Fn::GetAtt': [exports.FUNCTION_IAM_ROLE_LOGICAL_ID, 'Arn'],
-            },
-            Runtime: 'nodejs14.x',
-            Timeout: 60,
-        };
         /**
          * Called after ECS task execution success or failure.
          */

package/dist/deploy/cicd/command.js

@@ -3,73 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployCicdCommand = exports.options = exports.readSSHKey = void 0;
+exports.deployCicdCommand = exports.readSSHKey = void 0;
 /* eslint-disable no-param-reassign */
-const change_case_1 = require("change-case");
 const fs_1 = __importDefault(require("fs"));
 const npmlog_1 = __importDefault(require("npmlog"));
 const config_1 = require("../../config");
 const utils_1 = require("../../utils");
-const pipelines_1 = require("./pipelines");
 const deployCicd_1 = require("./deployCicd");
+const command_options_1 = require("./command.options");
 const logPrefix = 'deploy-cicd';
 /**
  * Created to allow mocking.
  */
 const readSSHKey = (dir) => fs_1.default.readFileSync(dir, 'utf-8');
 exports.readSSHKey = readSSHKey;
-exports.options = {
-    cpu: {
-        type: 'string',
-    },
-    memory: {
-        type: 'string',
-    },
-    pipelines: {
-        choices: pipelines_1.pipelines,
-        coerce: (values) => values.map((value) => (0, change_case_1.camelCase)(value)),
-        default: [],
-        description: 'Pipelines that will be implemented with the CICD stack.',
-        type: 'array',
-    },
-    'update-repository': {
-        alias: ['ur'],
-        description: 'Determine if the repository image will be updated.',
-        default: true,
-        type: 'boolean',
-    },
-    'ssh-key': {
-        demandOption: true,
-        type: 'string',
-    },
-    'ssh-url': {
-        demandOption: true,
-        type: 'string',
-    },
-    'slack-webhook-url': {
-        type: 'string',
-    },
-    /**
-     * This option has the format:
-     *
-     * ```ts
-     * Array<{
-     *  name: string,
-     *  value: string,
-     * }>
-     * ```
-     */
-    'task-environment': {
-        alias: ['te'],
-        default: [],
-        describe: 'A list of environment variables that will be passed to the ECS container task.',
-        type: 'array',
-    },
-};
 exports.deployCicdCommand = {
     command: 'cicd',
     describe: 'Deploy CICD.',
-    builder: (yargs) => yargs.options((0, utils_1.addGroupToOptions)(exports.options, 'Deploy CICD Options')),
+    builder: (yargs) => yargs.options((0, utils_1.addGroupToOptions)(command_options_1.options, 'Deploy CICD Options')),
     handler: ({ destroy, ...rest }) => {
         if (destroy) {
             npmlog_1.default.info(logPrefix, `${config_1.NAME} doesn't destroy CICD stack.`);

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

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCicdConfig = exports.options = void 0;
+/* eslint-disable no-param-reassign */
+const change_case_1 = require("change-case");
+const yargs_1 = __importDefault(require("yargs"));
+const pipelines_1 = require("./pipelines");
+exports.options = {
+    cpu: {
+        type: 'string',
+    },
+    memory: {
+        type: 'string',
+    },
+    pipelines: {
+        choices: pipelines_1.pipelines,
+        coerce: (values) => values.map((value) => (0, change_case_1.camelCase)(value)),
+        default: [],
+        description: 'Pipelines that will be implemented with the CICD stack.',
+        type: 'array',
+    },
+    'update-repository': {
+        alias: ['ur'],
+        description: 'Determine if the repository image will be updated.',
+        default: true,
+        type: 'boolean',
+    },
+    'ssh-key': {
+        demandOption: true,
+        type: 'string',
+    },
+    'ssh-url': {
+        demandOption: true,
+        type: 'string',
+    },
+    'slack-webhook-url': {
+        type: 'string',
+    },
+    /**
+     * This option has the format:
+     *
+     * ```ts
+     * Array<{
+     *  name: string,
+     *  value: string,
+     * }>
+     * ```
+     */
+    'task-environment': {
+        alias: ['te'],
+        default: [],
+        describe: 'A list of environment variables that will be passed to the ECS container task.',
+        type: 'array',
+    },
+};
+const getCicdConfig = () => {
+    const { parsed } = yargs_1.default.config();
+    if (!parsed) {
+        return false;
+    }
+    const { argv } = parsed;
+    const config = Object.keys(exports.options).reduce((acc, key) => {
+        const value = argv[key];
+        if (value) {
+            acc[key] = value;
+        }
+        return acc;
+    }, {});
+    return config;
+};
+exports.getCicdConfig = getCicdConfig;

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

@@ -91,8 +91,8 @@ exports.webhooks.on(['pull_request.closed'], async ({ payload }) => {
      * https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
      */
     await (0, executeTasks_1.executeTasks)({
-        cpu: '256',
-        memory: '512',
+        cpu: '512',
+        memory: '2048',
         commands: [
             (0, executeTasks_1.shConditionalCommands)({
                 conditionalCommands: (0, pipelines_1.getClosedPrCommands)({

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.imageUpdaterScheduleHandler = void 0;
+const executeTasks_1 = require("./executeTasks");
+const imageUpdaterScheduleHandler = async () => {
+    const cicdConfig = process.env.CICD_CONFIG;
+    if (!cicdConfig) {
+        console.log('No CICD config found.');
+        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 response = await (0, executeTasks_1.executeTasks)({
+        commands,
+        cpu: '512',
+        memory: '2048',
+        taskEnvironment: [
+            {
+                name: 'CICD_CONFIG',
+                value: cicdConfig,
+            },
+        ],
+    });
+    console.log(JSON.stringify(response, null, 2));
+};
+exports.imageUpdaterScheduleHandler = imageUpdaterScheduleHandler;

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pipelinesHandler = exports.githubWebhooksApiV1Handler = exports.ecsTaskReportHandler = exports.cicdApiV1Handler = void 0;
+exports.pipelinesHandler = exports.imageUpdaterScheduleHandler = exports.githubWebhooksApiV1Handler = exports.ecsTaskReportHandler = exports.cicdApiV1Handler = void 0;
 var cicdApiV1_handler_1 = require("./cicdApiV1.handler");
 Object.defineProperty(exports, "cicdApiV1Handler", { enumerable: true, get: function () { return cicdApiV1_handler_1.cicdApiV1Handler; } });
 var ecsTaskReport_handler_1 = require("./ecsTaskReport.handler");
 Object.defineProperty(exports, "ecsTaskReportHandler", { enumerable: true, get: function () { return ecsTaskReport_handler_1.ecsTaskReportHandler; } });
 var githubWebhooksApiV1_handler_1 = require("./githubWebhooksApiV1.handler");
 Object.defineProperty(exports, "githubWebhooksApiV1Handler", { enumerable: true, get: function () { return githubWebhooksApiV1_handler_1.githubWebhooksApiV1Handler; } });
+var imageUpdaterSchedule_handler_1 = require("./imageUpdaterSchedule.handler");
+Object.defineProperty(exports, "imageUpdaterScheduleHandler", { enumerable: true, get: function () { return imageUpdaterSchedule_handler_1.imageUpdaterScheduleHandler; } });
 var pipelines_handler_1 = require("./pipelines.handler");
 Object.defineProperty(exports, "pipelinesHandler", { enumerable: true, get: function () { return pipelines_handler_1.pipelinesHandler; } });

package/dist/deploy/cicd/pipelines.js

@@ -29,7 +29,7 @@ const getClosedPrCommands = ({ branch }) => [
     'git pull origin main',
     'git rev-parse HEAD',
     `export CARLIN_BRANCH=${branch}`,
-    `sh ${(0, exports.getCommandFileDir)('closed-pr')} || true`,
+    `[ -f "${(0, exports.getCommandFileDir)('closed-pr')}" ] && sh ${(0, exports.getCommandFileDir)('closed-pr')}`,
 ];
 exports.getClosedPrCommands = getClosedPrCommands;
 const getMainCommands = () => [

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

@@ -104,7 +104,7 @@ const getBaseTemplate = ({ cloudfront, spa, }) => {
         },
     };
 };
-const getCloudFrontTemplate = ({ acm, aliases, cloudfront, spa, hostedZoneName, region, }) => {
+const getCloudFrontTemplate = ({ acm, aliases = [], cloudfront, spa, hostedZoneName, region, }) => {
     const template = { ...getBaseTemplate({ cloudfront, spa }) };
     const cloudFrontResources = {
         [CLOUDFRONT_DISTRIBUTION_ORIGIN_ACCESS_IDENTITY_LOGICAL_ID]: {

package/package.json

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