Update github check with aws log

dist/index.js

@@ -1415,6 +1415,7 @@ const aws_cloud_formation_templates_1 = __nccwpck_require__(54837);
 const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
 const aws_error_1 = __nccwpck_require__(94669);
 const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
+const cleanup_cron_formation_1 = __nccwpck_require__(26162);
 class AWSJobStack {
     constructor(baseStackName) {
         this.baseStackName = baseStackName;
@@ -1508,13 +1509,43 @@ class AWSJobStack {
             };
             try {
                 yield CF.createStack(createStackInput).promise();
-                cloud_runner_logger_1.default.log('Creating cloud runner job');
                 yield CF.waitFor('stackCreateComplete', { StackName: taskDefStackName }).promise();
             }
             catch (error) {
                 yield aws_error_1.AWSError.handleStackCreationFailure(error, CF, taskDefStackName);
                 throw error;
             }
+            const createCleanupStackInput = {
+                StackName: `${taskDefStackName}-cleanup`,
+                TemplateBody: cleanup_cron_formation_1.CleanupCronFormation.formation,
+                Capabilities: ['CAPABILITY_IAM'],
+                Parameters: [
+                    {
+                        ParameterKey: 'StackName',
+                        ParameterValue: taskDefStackName,
+                    },
+                    {
+                        ParameterKey: 'DeleteStackName',
+                        ParameterValue: `${taskDefStackName}-cleanup`,
+                    },
+                    {
+                        ParameterKey: 'TTL',
+                        ParameterValue: `1080`,
+                    },
+                    {
+                        ParameterKey: 'BUILDGUID',
+                        ParameterValue: mountdir,
+                    },
+                ],
+            };
+            try {
+                yield CF.createStack(createCleanupStackInput).promise();
+                yield CF.waitFor('stackCreateComplete', { StackName: createCleanupStackInput.StackName }).promise();
+            }
+            catch (error) {
+                yield aws_error_1.AWSError.handleStackCreationFailure(error, CF, taskDefStackName);
+                throw error;
+            }
             const taskDefResources = (yield CF.describeStackResources({
                 StackName: taskDefStackName,
             }).promise()).StackResources;
@@ -2162,6 +2193,164 @@ Outputs:
 `;
 
 
+/***/ }),
+
+/***/ 26162:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CleanupCronFormation = void 0;
+class CleanupCronFormation {
+}
+exports.CleanupCronFormation = CleanupCronFormation;
+CleanupCronFormation.formation = `AWSTemplateFormatVersion: '2010-09-09'
+Description: Schedule automatic deletion of CloudFormation stacks
+Metadata:
+  AWS::CloudFormation::Interface:
+    ParameterGroups:
+      - Label:
+          default: Input configuration
+        Parameters:
+          - StackName
+          - TTL
+    ParameterLabels:
+      StackName:
+        default: Stack name
+      TTL:
+        default: Time-to-live
+Parameters:
+  EnvironmentName:
+    Type: String
+    Default: development
+    Description: 'Your deployment environment: DEV, QA , PROD'
+  BUILDGUID:
+    Type: String
+    Default: ''
+  StackName:
+    Type: String
+    Description: Stack name that will be deleted.
+  DeleteStackName:
+    Type: String
+    Description: Stack name that will be deleted.
+  TTL:
+    Type: Number
+    Description: Time-to-live in minutes for the stack.
+Resources:
+  DeleteCFNLambda:
+    Type: "AWS::Lambda::Function"
+    Properties:
+      FunctionName: !Join [ "", [ 'DeleteCFNLambda', !Ref BUILDGUID ] ]
+      Code:
+        ZipFile: |
+          import boto3
+          import os
+          import json
+
+          stack_name = os.environ['stackName']
+          delete_stack_name = os.environ['deleteStackName']
+
+          def delete_cfn(stack_name):
+              try:
+                  cfn = boto3.resource('cloudformation')
+                  stack = cfn.Stack(stack_name)
+                  stack.delete()
+                  return "SUCCESS"
+              except:
+                  return "ERROR"
+
+          def handler(event, context):
+              print("Received event:")
+              print(json.dumps(event))
+              result = delete_cfn(stack_name)
+              delete_cfn(delete_stack_name)
+              return result
+      Environment:
+        Variables:
+          stackName: !Ref 'StackName'
+          deleteStackName: !Ref 'DeleteStackName'
+      Handler: "index.handler"
+      Runtime: "python3.6"
+      Timeout: "5"
+      Role:
+       'Fn::ImportValue': !Sub '\${EnvironmentName}:DeleteCFNLambdaExecutionRole'
+  DeleteStackEventRule:
+     DependsOn:
+       - DeleteCFNLambda
+       - GenerateCronExpression
+     Type: "AWS::Events::Rule"
+     Properties:
+       Name: !Join [ "", [ 'DeleteStackEventRule', !Ref BUILDGUID ] ]
+       Description: Delete stack event
+       ScheduleExpression: !GetAtt GenerateCronExpression.cron_exp
+       State: "ENABLED"
+       Targets:
+          -
+            Arn: !GetAtt DeleteCFNLambda.Arn
+            Id: 'DeleteCFNLambda'
+  PermissionForDeleteCFNLambda:
+    Type: "AWS::Lambda::Permission"
+    DependsOn:
+      - DeleteStackEventRule
+    Properties:
+      FunctionName: !Join [ "", [ 'DeleteCFNLambda', !Ref BUILDGUID ] ]
+      Action: "lambda:InvokeFunction"
+      Principal: "events.amazonaws.com"
+      SourceArn: !GetAtt DeleteStackEventRule.Arn
+  GenerateCronExpLambda:
+    Type: "AWS::Lambda::Function"
+    Properties:
+      FunctionName: !Join [ "", [ 'GenerateCronExpressionLambda', !Ref BUILDGUID ] ]
+      Code:
+        ZipFile: |
+          from datetime import datetime, timedelta
+          import os
+          import logging
+          import json
+          import cfnresponse
+
+          def deletion_time(ttl):
+              delete_at_time = datetime.now() + timedelta(minutes=int(ttl))
+              hh = delete_at_time.hour
+              mm = delete_at_time.minute
+              yyyy = delete_at_time.year
+              month = delete_at_time.month
+              dd = delete_at_time.day
+              # minutes hours day month day-of-week year
+              cron_exp = "cron({} {} {} {} ? {})".format(mm, hh, dd, month, yyyy)
+              return cron_exp
+
+          def handler(event, context):
+            print('Received event: %s' % json.dumps(event))
+            status = cfnresponse.SUCCESS
+            try:
+                if event['RequestType'] == 'Delete':
+                    cfnresponse.send(event, context, status, {})
+                else:
+                    ttl = event['ResourceProperties']['ttl']
+                    responseData = {}
+                    responseData['cron_exp'] = deletion_time(ttl)
+                    cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData)
+            except Exception as e:
+                logging.error('Exception: %s' % e, exc_info=True)
+                status = cfnresponse.FAILED
+                cfnresponse.send(event, context, status, {}, None)
+      Handler: "index.handler"
+      Runtime: "python3.6"
+      Timeout: "5"
+      Role:
+       'Fn::ImportValue': !Sub '\${EnvironmentName}:DeleteCFNLambdaExecutionRole'
+  GenerateCronExpression:
+    Type: "Custom::GenerateCronExpression"
+    Version: "1.0"
+    Properties:
+      Name: !Join [ "", [ 'GenerateCronExpression', !Ref BUILDGUID ] ]
+      ServiceToken: !GetAtt GenerateCronExpLambda.Arn
+      ttl: !Ref 'TTL'
+`;
+
+
 /***/ }),
 
 /***/ 97647:
@@ -2481,6 +2670,9 @@ class AWSBuildEnvironment {
             yield CF.deleteStack({
                 StackName: taskDef.taskDefStackName,
             }).promise();
+            yield CF.deleteStack({
+                StackName: `${taskDef.taskDefStackName}-cleanup`,
+            }).promise();
             yield CF.waitFor('stackDeleteComplete', {
                 StackName: taskDef.taskDefStackName,
             }).promise();

src/model/cloud-runner/providers/aws/aws-job-stack.ts

@@ -5,6 +5,7 @@ import { AWSCloudFormationTemplates } from './aws-cloud-formation-templates';
 import CloudRunnerLogger from '../../services/cloud-runner-logger';
 import { AWSError } from './aws-error';
 import CloudRunner from '../../cloud-runner';
+import { CleanupCronFormation } from './cloud-formations/cleanup-cron-formation';
 
 export class AWSJobStack {
   private baseStackName: string;
@@ -133,13 +134,44 @@ export class AWSJobStack {
 
     try {
       await CF.createStack(createStackInput).promise();
-      CloudRunnerLogger.log('Creating cloud runner job');
       await CF.waitFor('stackCreateComplete', { StackName: taskDefStackName }).promise();
     } catch (error) {
       await AWSError.handleStackCreationFailure(error, CF, taskDefStackName);
       throw error;
     }
 
+    const createCleanupStackInput: SDK.CloudFormation.CreateStackInput = {
+      StackName: `${taskDefStackName}-cleanup`,
+      TemplateBody: CleanupCronFormation.formation,
+      Capabilities: ['CAPABILITY_IAM'],
+      Parameters: [
+        {
+          ParameterKey: 'StackName',
+          ParameterValue: taskDefStackName,
+        },
+        {
+          ParameterKey: 'DeleteStackName',
+          ParameterValue: `${taskDefStackName}-cleanup`,
+        },
+        {
+          ParameterKey: 'TTL',
+          ParameterValue: `1080`,
+        },
+        {
+          ParameterKey: 'BUILDGUID',
+          ParameterValue: mountdir,
+        },
+      ],
+    };
+
+    try {
+      await CF.createStack(createCleanupStackInput).promise();
+      await CF.waitFor('stackCreateComplete', { StackName: createCleanupStackInput.StackName }).promise();
+    } catch (error) {
+      await AWSError.handleStackCreationFailure(error, CF, taskDefStackName);
+      throw error;
+    }
+
     const taskDefResources = (
       await CF.describeStackResources({
         StackName: taskDefStackName,

src/model/cloud-runner/providers/aws/cloud-formations/cleanup-cron-formation.ts

@@ -1,4 +1,5 @@
-AWSTemplateFormatVersion: '2010-09-09'
+export class CleanupCronFormation {
+  public static readonly formation: string = `AWSTemplateFormatVersion: '2010-09-09'
 Description: Schedule automatic deletion of CloudFormation stacks
 Metadata:
   AWS::CloudFormation::Interface:
@@ -67,7 +68,7 @@ Resources:
       Runtime: "python3.6"
       Timeout: "5"
       Role:
-       'Fn::ImportValue': !Sub '${EnvironmentName}:DeleteCFNLambdaExecutionRole'
+       'Fn::ImportValue': !Sub '\${EnvironmentName}:DeleteCFNLambdaExecutionRole'
   DeleteStackEventRule:
      DependsOn:
        - DeleteCFNLambda
@@ -133,7 +134,7 @@ Resources:
       Runtime: "python3.6"
       Timeout: "5"
       Role:
-       'Fn::ImportValue': !Sub '${EnvironmentName}:DeleteCFNLambdaExecutionRole'
+       'Fn::ImportValue': !Sub '\${EnvironmentName}:DeleteCFNLambdaExecutionRole'
   GenerateCronExpression:
     Type: "Custom::GenerateCronExpression"
     Version: "1.0"
@@ -141,3 +142,5 @@ Resources:
       Name: !Join [ "", [ 'GenerateCronExpression', !Ref BUILDGUID ] ]
       ServiceToken: !GetAtt GenerateCronExpLambda.Arn
       ttl: !Ref 'TTL'
+`;
+}

src/model/cloud-runner/providers/aws/index.ts

@@ -133,6 +133,9 @@ class AWSBuildEnvironment implements ProviderInterface {
     await CF.deleteStack({
       StackName: taskDef.taskDefStackName,
     }).promise();
+    await CF.deleteStack({
+      StackName: `${taskDef.taskDefStackName}-cleanup`,
+    }).promise();
 
     await CF.waitFor('stackDeleteComplete', {
       StackName: taskDef.taskDefStackName,