fix: main tag report

ttoss · Sep 16, 2021 · 2a47c1c · 2a47c1c
1 parent 348bf04
commit 2a47c1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/cli/src/deploy/cicd/ecsTaskReportCommand.ts b/packages/cli/src/deploy/cicd/ecsTaskReportCommand.ts
@@ -41,7 +41,7 @@ const sendEcsTaskReport = async ({ status }: { status: Status }) => {
 
 const options = {
   status: {
-    choices: ['Approved', 'Rejected'] as Status[],
+    choices: ['Approved', 'Rejected', 'MainTagFound'] as Status[],
     demandOption: true,
     type: 'string',
   },

diff --git a/packages/cli/src/deploy/cicd/lambdas/ecsTaskReport.handler.ts b/packages/cli/src/deploy/cicd/lambdas/ecsTaskReport.handler.ts
@@ -36,7 +36,7 @@ export const getEcsTaskLogsUrl = ({ ecsTaskArn }: { ecsTaskArn: string }) => {
   return ecsTaskLogsUrl;
 };
 
-export type Status = 'Approved' | 'Rejected';
+export type Status = 'Approved' | 'Rejected' | 'MainTagFound';
 
 export type Event = {
   status: Status;
@@ -60,14 +60,21 @@ export const ecsTaskReportHandler: Handler<Event> = async ({
       await putApprovalResultManualTask({
         pipelineName,
         result: {
-          status,
+          status: status === 'MainTagFound' ? 'Approved' : status,
           summary: JSON.stringify({ status, logs }),
         },
       });
     }
   };
 
   const handleStackNotification = async () => {
+    /**
+     * Do not send a notification if the task was main pipeline with tag.
+     */
+    if (status === 'MainTagFound') {
+      return;
+    }
+
     const url = process.env.SLACK_WEBHOOK_URL;
 
     if (!url) {

diff --git a/packages/cli/src/deploy/cicd/pipelines.ts b/packages/cli/src/deploy/cicd/pipelines.ts
@@ -40,7 +40,10 @@ export const getMainCommands = () => [
   'git fetch',
   'git pull origin main',
   'git rev-parse HEAD',
-  'if git describe --exact-match; then echo "Tag found" && exit 0; fi',
+  /**
+   * Reporting `MainTagFound` before exiting the process.
+   */
+  'if git describe --exact-match; then echo "Tag found" && carlin cicd-ecs-task-report --status=MainTagFound && exit 0; fi',
   'yarn',
   executeCommandFile('main'),
 ];