carlin 0.19.5 → 0.19.6

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.19.6](https://github.com/ttoss/carlin/compare/v0.19.5...v0.19.6) (2021-09-18)
+
+### Bug Fixes
+
+- pipeline bucket object duplication ([3090748](https://github.com/ttoss/carlin/commit/3090748258818af3c5ca8a38a1c65c0fc1b21760))
+
 ## [0.19.5](https://github.com/ttoss/carlin/compare/v0.19.4...v0.19.5) (2021-09-17)
 
 ### Bug Fixes

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

@@ -183,6 +183,16 @@ const getRepositoryImageBuilder = () => ({
     },
 });
 exports.getRepositoryImageBuilder = getRepositoryImageBuilder;
+/**
+ * This variable is used inside GitHub webhooks to identify the object key
+ * prefix of the file that triggers the pipelines.
+ */
+const triggerPipelinesObjectKeyPrefix = [
+    'cicd',
+    'pipelines',
+    'triggers',
+    utils_1.getProjectName(),
+].join('/');
 const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU, memory = config_2.ECS_TASK_DEFAULT_MEMORY, s3, slackWebhookUrl, taskEnvironment = [], }) => {
     const resources = {};
     const executeEcsTaskVariables = {
@@ -391,7 +401,7 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
                                     Effect: 'Allow',
                                     Resource: {
                                         'Fn::Sub': [
-                                            `arn:aws:s3:::\${BucketName}/${getTriggerPipelineObjectKey_1.TRIGGER_PIPELINES_OBJECT_KEY_PREFIX}*`,
+                                            `arn:aws:s3:::\${BucketName}/${triggerPipelinesObjectKeyPrefix}*`,
                                             {
                                                 BucketName: {
                                                     'Fn::ImportValue': config_1.BASE_STACK_BUCKET_NAME_EXPORTED_NAME,
@@ -481,6 +491,7 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
                         BASE_STACK_BUCKET_NAME: {
                             'Fn::ImportValue': config_1.BASE_STACK_BUCKET_NAME_EXPORTED_NAME,
                         },
+                        TRIGGER_PIPELINES_OBJECT_KEY_PREFIX: triggerPipelinesObjectKeyPrefix,
                         PIPELINES_JSON: JSON.stringify(pipelines),
                         ...executeEcsTaskVariables,
                     },
@@ -729,7 +740,7 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
                                     Action: 's3:*',
                                     Resource: {
                                         'Fn::Sub': [
-                                            `arn:aws:s3:::\${BucketName}/${getTriggerPipelineObjectKey_1.TRIGGER_PIPELINES_OBJECT_KEY_PREFIX}*`,
+                                            `arn:aws:s3:::\${BucketName}/${triggerPipelinesObjectKeyPrefix}*`,
                                             {
                                                 BucketName: {
                                                     'Fn::ImportValue': config_1.BASE_STACK_BUCKET_NAME_EXPORTED_NAME,
@@ -786,7 +797,10 @@ const getCicdTemplate = ({ pipelines = [], cpu = config_2.ECS_TASK_DEFAULT_CPU,
                                         S3Bucket: {
                                             'Fn::ImportValue': config_1.BASE_STACK_BUCKET_NAME_EXPORTED_NAME,
                                         },
-                                        S3ObjectKey: getTriggerPipelineObjectKey_1.getTriggerPipelinesObjectKey(pipeline),
+                                        S3ObjectKey: getTriggerPipelineObjectKey_1.getTriggerPipelinesObjectKey({
+                                            prefix: triggerPipelinesObjectKeyPrefix,
+                                            pipeline,
+                                        }),
                                     },
                                     Name: `Pipeline${pipelinePascalCase}S3SourceAction`,
                                     OutputArtifacts: [

package/dist/deploy/cicd/getTriggerPipelineObjectKey.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTriggerPipelinesObjectKey = exports.TRIGGER_PIPELINES_OBJECT_KEY_PREFIX = void 0;
-exports.TRIGGER_PIPELINES_OBJECT_KEY_PREFIX = 'cicd/pipelines/triggers/';
+exports.getTriggerPipelinesObjectKey = void 0;
 /**
  * The file with this key inside the source S3 key of main and tag pipelines
  * will trigger those pipelines.
  */
-const getTriggerPipelinesObjectKey = (pipeline) => {
-    return `${exports.TRIGGER_PIPELINES_OBJECT_KEY_PREFIX}${pipeline}.zip`;
+const getTriggerPipelinesObjectKey = ({ prefix, pipeline, }) => {
+    return `${prefix}/${pipeline}.zip`;
 };
 exports.getTriggerPipelinesObjectKey = getTriggerPipelinesObjectKey;

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

@@ -5,6 +5,6 @@ const getProcessEnvVariable = (env) => {
     if (process.env[env]) {
         return process.env[env];
     }
-    throw new Error(`process.env.${env} doesn't exist.`);
+    throw new Error(`process.env.${env} is not defined.`);
 };
 exports.getProcessEnvVariable = getProcessEnvVariable;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubWebhooksApiV1Handler = void 0;
+exports.githubWebhooksApiV1Handler = exports.webhooks = void 0;
 const webhooks_1 = require("@octokit/webhooks");
 const adm_zip_1 = __importDefault(require("adm-zip"));
 const aws_sdk_1 = require("aws-sdk");
@@ -12,10 +12,15 @@ const pipelines_1 = require("../pipelines");
 const executeTasks_1 = require("./executeTasks");
 const getProcessEnvVariable_1 = require("./getProcessEnvVariable");
 const s3 = new aws_sdk_1.S3();
+/**
+ * Put outside of the handler to be able to spy on it.
+ */
+exports.webhooks = new webhooks_1.Webhooks({ secret: '123' });
 /**
  * When this file is saved on S3, a CodePipeline pipeline is started.
  */
 const putJobDetails = async ({ pipeline, details, }) => {
+    const prefix = getProcessEnvVariable_1.getProcessEnvVariable('TRIGGER_PIPELINES_OBJECT_KEY_PREFIX');
     const zip = new adm_zip_1.default();
     const content = JSON.stringify(details);
     zip.addFile(pipeline, Buffer.from(content));
@@ -23,7 +28,7 @@ const putJobDetails = async ({ pipeline, details, }) => {
         .putObject({
         Body: zip.toBuffer(),
         Bucket: getProcessEnvVariable_1.getProcessEnvVariable('BASE_STACK_BUCKET_NAME'),
-        Key: getTriggerPipelineObjectKey_1.getTriggerPipelinesObjectKey(pipeline),
+        Key: getTriggerPipelineObjectKey_1.getTriggerPipelinesObjectKey({ prefix, pipeline }),
     })
         .promise();
 };
@@ -49,10 +54,9 @@ const githubWebhooksApiV1Handler = async (event, context) => {
         if (!xHubSignature) {
             throw new Error("X-Hub-Signature-256 or X-Hub-Signature doesn't exist.");
         }
-        const webhooks = new webhooks_1.Webhooks({ secret: '123' });
         const pipelines = JSON.parse(process.env.PIPELINES_JSON || JSON.stringify([]));
         if (pipelines.includes('pr')) {
-            webhooks.on([
+            exports.webhooks.on([
                 'pull_request.opened',
                 'pull_request.reopened',
                 'pull_request.ready_for_review',
@@ -79,7 +83,9 @@ const githubWebhooksApiV1Handler = async (event, context) => {
                     ],
                 });
             });
-            webhooks.on(['pull_request.closed'], async ({ payload }) => {
+        }
+        if (pipelines.includes('closed-pr')) {
+            exports.webhooks.on(['pull_request.closed'], async ({ payload }) => {
                 /**
                  * https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
                  */
@@ -105,29 +111,27 @@ const githubWebhooksApiV1Handler = async (event, context) => {
             });
         }
         if (pipelines.includes('main')) {
-            webhooks.on('push', async (details) => {
+            exports.webhooks.on('push', async (details) => {
                 if (details.payload.ref === 'refs/heads/main') {
                     await putJobDetails({ pipeline: 'main', details });
                 }
             });
         }
         if (pipelines.includes('tag')) {
-            webhooks.on('push', async (details) => {
+            exports.webhooks.on('push', async (details) => {
                 if (details.payload.ref.startsWith('refs/tags/')) {
                     await putJobDetails({ pipeline: 'tag', details });
                 }
             });
         }
-        webhooks.onError((onErrorEvent) => {
-            console.error('Webhooks on error.');
-            console.error(JSON.stringify(onErrorEvent, null, 2));
+        exports.webhooks.onError((onErrorEvent) => {
             throw onErrorEvent;
         });
         /**
          * Replace "receive" for "verifyAndReceive" when WebCrypto exist on Node.js
          * API.
          */
-        await webhooks.receive({
+        await exports.webhooks.receive({
             id: xGitHubDelivery,
             name: xGitHubEvent,
             // signature: xHubSignature,

package/package.json

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