@kumologica/sdk 3.2.0-beta2 → 3.2.0-beta21

package/src/app/lib/aws/index.js

@@ -1,28 +1,19 @@
 const fs = require('fs-extra');
 const path = require('path');
 const AWS = require('aws-sdk');
-const AdmZip = require('adm-zip');
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
-const rimraf = require('rimraf');
-const { codegen } = require('@kumologica/builder');
-const AWSCFTemplate = require('./cf');
 const CAAWSCloudWatch = require('./ca-cloudwatch-api');
-const CAAWSIot = require('./ca-iot-api');
 const CAS3 = require('./ca-s3-api');
 const CASNS = require('./ca-sns-api');
 const CASQS = require('./ca-sqs-api');
 const CAAWSApiGateway = require('./ca-apigw-api');
 const CADynamoDb = require('./ca-dynamodb-api');
-const CAElb = require('./ca-elb-api');
 const CAEvents = require('./ca-events-api');
-const CAAlexa = require('./ca-alexa-api');
-const CACodeCommit = require('./ca-codecommit-api');
 const AWSProfile = require('./aws-profile');
-const KLIAM = require('./kl-iam-api');
 const { openFileOnEditor } = require('../utils/editor');
+const { exp } = require('@kumologica/builder');
+const { build } = require('@kumologica/builder');
 
-/**
+/** 
  * sample events:
  * https://docs.aws.amazon.com/lambda/latest/dg/lambda-services.html
  */
@@ -45,7 +36,6 @@ class AWSDeployer {
  
     this.cw = false;
 
-    this.iot = new CAAWSIot(this.log.bind(this));
     this.apiGateway = new CAAWSApiGateway(this.log.bind(this));
     this.dynamoDb = new CADynamoDb(this.log.bind(this));
     this.cf = new AWS.CloudFormation();
@@ -53,15 +43,10 @@ class AWSDeployer {
     this.sns = new CASNS(this.log.bind(this));
     this.sqs = new CASQS(this.log.bind(this));
     this.lambdaApi = new AWS.Lambda();
-    this.cfTemplate = new AWSCFTemplate();
     this.cwLogs = new CAAWSCloudWatch(this.logCloud.bind(this));
     this.cwevents = new AWS.CloudWatchEvents();
     this.cognito = new AWS.CognitoIdentityServiceProvider();
-    this.elb = new CAElb(this.log.bind(this));
     this.events = new CAEvents(this.log.bind(this));
-    this.alexa = new CAAlexa(this.log.bind(this));
-    this.codecommit = new CACodeCommit(this.log.bind(this));
-    this.iam = new KLIAM(this.log.bind(this));
   }
 
   chalk(c, t) {
@@ -107,23 +92,9 @@ class AWSDeployer {
   }
 
   prepare(projectDir, flowFileName, originaLambdaName) {
-    const deployDir = projectDir + '/deploy';
     
+    const deployDir = path.join(projectDir, "build");  
     const flowName = flowFileName.replace('.json', '');
-
-    // setup deployment directory
-    fs.ensureDirSync(deployDir);
-    fs.emptyDirSync(deployDir);
-    fs.ensureDirSync(deployDir + '/node_modules');
-
-    // copy project files
-    codegen.generateProjectCode(
-      deployDir,
-      flowFileName
-    );
-
-    this.processPackageJson(projectDir, deployDir);
-
     const zipFileName = `${flowName}/lambda${Date.now()}.zip`;
     const lambdaName = this.sanitizeLambdaName(originaLambdaName);
 
@@ -141,34 +112,6 @@ class AWSDeployer {
     };
   }
 
-  processPackageJson(projectDir, deployDir) {
-    
-    const pckg = this.loadJsonFile(path.join(projectDir, 'package.json'));
-
-    // ensure dependencies contain runtime
-    if (!pckg.dependencies["@kumologica/runtime"]) {
-      pckg.dependencies["@kumologica/runtime"] = `^${pckg.version.substr(0, 1)}`;
-      this.createFile(deployDir, 'package.json', JSON.stringify(pckg));
-
-    } else {
-      fs.copySync(
-        path.join(projectDir, 'package.json'),
-        path.join(deployDir, 'package.json')
-      );  
-    }
-
-    if (pckg.files) {
-      pckg.files.forEach(f => {
-        
-        if (!["node_modules/**/*", "lambda.js" ].includes(f)) {
-          fs.copySync(
-            path.join(projectDir, f),
-            path.join(deployDir, f)
-          );
-        }
-      });
-    }
-  }
 
   /**
    *
@@ -234,7 +177,8 @@ class AWSDeployer {
       settings.deploymentBucketName = await this.prepareS3Bucket(
         settings.flowName
       );
-      await this.buildLambda(settings);
+
+      await this.buildLambda(settings, projectInfo);
 
       const nodes = this.loadJsonFile(
         path.join(projectInfo.projectDir, projectInfo.projectFlowName)
@@ -246,17 +190,38 @@ class AWSDeployer {
         settings,
         params,
         deploymentStart,
-        nodes
+        nodes,
+        projectInfo
       );
+/*
+      "Outputs": [
+        {
+          "OutputKey": "LambdaArn",
+          "OutputValue": "arn:aws:lambda:ap-southeast-2:174842903734:function:sockets-flow",
+          "Description": "The Arn of the kumologica flow lambda."
+        },
+        {
+          "OutputKey": "RootResourceId",
+          "OutputValue": "qb9cfkwah9",
+          "Description": "The root resource id of rest api gateway created in this script."
+        },
+        {
+          "OutputKey": "RestApiId",
+          "OutputValue": "h1eihbg3gb",
+          "Description": "The id of rest api gateway created in this script."
+        }
+   */
+
       lambdaArn = stackDetails.Stacks[0].Outputs[0].OutputValue;
 
+      this.log(JSON.stringify(stackDetails));
       this.log(`${this.chalk('greenBright', 'Deployment successful.')}`);
       this.log(
         `  ${this.chalk('#F5DEB3', 'StackId:')}   ${this.chalk('whiteBright', 
           stackDetails.Stacks[0].StackId
         )}`,
         false
-      );
+      ); 
       this.log(`  ${this.chalk('#F5DEB3', 'LambdaArn:')} ${this.chalk('whiteBright',lambdaArn)}`, false);
       this.log('', false);
 
@@ -265,95 +230,87 @@ class AWSDeployer {
         this.cwLogs.startCWLogs(settings.functionName, AWS.config.region);
         this.cw = true;
       }*/
-    } catch (error) {
-      this.log(`${this.chalk('redBright', 'Deployment failed.')}`);
-      this.log(`  ${this.chalk('redBright', error)}`);
-    } finally {
-      //this.s3.deleteS3Bucket(deploymentBucketName);
-    }
 
-    let response = {};
-    if (lambdaArn) {
-      try {
-        response = await this.runTriggers(params, settings, lambdaArn);
-        if (response) {
-          const url = `https://${response.apiId}.execute-api.${AWS.config.region}.amazonaws.com/${response.stage}`;
-          this.printSignature(url, flowListeners, params);
-        }
-      } catch (error) {
-        this.log(`${this.chalk('redBright', 'Trigger creation failed.')}`);
-        this.log(`  ${this.chalk('redBright', error)}`);
-      }
-    }
-    return response;
+} catch (error) {
+  this.log(`${this.chalk('redBright', 'Deployment failed.')}`);
+  this.log(`  ${this.chalk('redBright', error)}`);
+} finally {
+  //this.s3.deleteS3Bucket(deploymentBucketName);
+}
+
+if (lambdaArn) {
+   // response = await this.runTriggers(params, settings, lambdaArn);
+      const url = `https://${response.apiId}.execute-api.${AWS.config.region}.amazonaws.com/${response.stage}`;
+    this.printSignature(url, flowListeners, params);
   }
+}
 
-  printSignature(url, s, p) {
-    this.log(' ')
-    
-    if (s.api && s.api.length > 0) {
-      this.log('API Gateway:');
-      s.api.forEach(a => this.log(`  ${('    ' + a.verb.toUpperCase()).slice(-6)}  ${url}${a.url}`), this);
-      this.log('');
-    }
+printSignature(url, s, p) {
+this.log(' ')
 
-    if (s.dynamodb && s.dynamodb.length > 0) {
-      this.log('DynamoDB Streams:');
-      s.dynamodb.forEach(a => this.log(` ${a.startingPosition} ${a.stream}`), this);
-      this.log('');
-    }
+if (s.api && s.api.length > 0) {
+  this.log('API Gateway:');
+  s.api.forEach(a => this.log(`  ${('    ' + a.verb.toUpperCase()).slice(-6)}  ${url}${a.url}`), this);
+  this.log('');
+}
 
-    if (s.s3 && s.s3.length > 0) {
-      this.log('S3:');
-      s.s3.forEach(a => this.log(` ${a.eventType} ${a.bucket}`), this);
-      this.log('');
-    }
-    
-    if (s.sns && s.sns.length > 0) {
-      this.log('SNS Topics:');
-      s.sns.forEach(a => this.log(` ${a.topic}`), this);
-      this.log('');
-    }
-  
-    if (s.iot && s.iot.length > 0) {
-      this.log('IOT:');
-      s.iot.forEach(a => this.log(` ${a.rule} ${a.query}`), this);
-      this.log('');
-    }
+if (s.dynamodb && s.dynamodb.length > 0) {
+  this.log('DynamoDB Streams:');
+  s.dynamodb.forEach(a => this.log(` ${a.startingPosition} ${a.stream}`), this);
+  this.log('');
+}
 
-    if (s.alb && s.alb.length > 0) {
-      this.log('Application Load Balancer:');
-      s.alb.forEach(a => this.log(` ${a.alb} ${a.listener}`), this);
-      this.log('');
-    }
+if (s.s3 && s.s3.length > 0) {
+  this.log('S3:');
+  s.s3.forEach(a => this.log(` ${a.eventType} ${a.bucket}`), this);
+  this.log('');
+}
 
-    if (p.events && p.events.length > 0) {
-      const sqs = p.events.filter(i => i.source == 'sqs');
-      if (sqs && sqs.length > 0) {
-        this.log('SQS URL:');
-        sqs.forEach(a => this.log(` ${a.url}`), this);
-        this.log('');
-      }
-    }
+if (s.sns && s.sns.length > 0) {
+  this.log('SNS Topics:');
+  s.sns.forEach(a => this.log(` ${a.topic}`), this);
+  this.log('');
+}
 
-    if (s.alexa && s.alexa.length > 0) {
-      this.log('Alexa Skills:');
-      s.alexa.forEach(a => this.log(` ${a.skillId}`), this);
-      this.log('');
-    }
+if (s.iot && s.iot.length > 0) {
+  this.log('IOT:');
+  s.iot.forEach(a => this.log(` ${a.rule} ${a.query}`), this);
+  this.log('');
+}
 
-    if (s.kinesis && s.kinesis.length > 0) {
-      this.log('Kinesis:');
-      s.kinesis.forEach(a => this.log(` ${a.startingPosition} ${a.stream}`), this);
-      this.log('');
-    }
+if (s.alb && s.alb.length > 0) {
+  this.log('Application Load Balancer:');
+  s.alb.forEach(a => this.log(` ${a.alb} ${a.listener}`), this);
+  this.log('');
+}
 
-    if (s.cwevents && s.cwevents.length > 0) {
-      this.log('Cloud Watch Events Rules:');
-      s.cwevents.forEach(a => this.log(` ${a.rule}`), this);
-      this.log('');
-    }
+if (p.events && p.events.length > 0) {
+  const sqs = p.events.filter(i => i.source == 'sqs');
+  if (sqs && sqs.length > 0) {
+    this.log('SQS URL:');
+    sqs.forEach(a => this.log(` ${a.url}`), this);
+    this.log('');
   }
+}
+
+if (s.alexa && s.alexa.length > 0) {
+  this.log('Alexa Skills:');
+  s.alexa.forEach(a => this.log(` ${a.skillId}`), this);
+  this.log('');
+}
+
+if (s.kinesis && s.kinesis.length > 0) {
+  this.log('Kinesis:');
+  s.kinesis.forEach(a => this.log(` ${a.startingPosition} ${a.stream}`), this);
+  this.log('');
+}
+
+if (s.cwevents && s.cwevents.length > 0) {
+  this.log('Cloud Watch Events Rules:');
+  s.cwevents.forEach(a => this.log(` ${a.rule}`), this);
+  this.log('');
+}
+}
 
   processFlow(flow) {
 
@@ -421,6 +378,105 @@ class AWSDeployer {
     };  
   }
 
+  mapParams(params) {
+    let vpcConf;
+    if (params.vpcConfig && params.vpcConfig.sn && params.vpcConfig.sn.length > 0
+          && params.vpcConfig.sg && params.vpcConfig.sg.length > 0) {
+        let sn = params.vpcConfig.sn.split(",").map(s => s.trim());
+        let sg = params.vpcConfig.sg.split(",").map(s => s.trim());
+      
+         vpcConf = JSON.stringify({ 
+            SubnetIds: sn,
+            SecurityGroupIds: sg
+        });
+    }
+    
+    let tags;
+    if ( params.tags &&  params.tags.length > 0) {
+        tags = {};
+        params.tags.forEach(t => tags[t.key] = t.value)
+        tags = JSON.stringify(tags);
+    }
+    
+    let env;
+    if ( params.environment &&  params.environment.length > 0) {
+        env = {
+            Variables: {}
+        };
+        params.environment.forEach(e => env.Variables[e.key] = e.value)
+        env = JSON.stringify(env);
+    }
+
+    let tracing;
+    if (params.xRay) {
+        tracing = '{"Mode":"Active"}';
+    }
+  //  KL_TRIGGERS: '[{"api": {"apiId": "CHANGE_IT_TO_API_GATEWAY_ID", "parentId": "CHANGE_IT_TO_PARENT_ID", "stage": "test", "resource": "accounts"}},  {"event": {"expression": "cron(0 1 * * ? *)", "reference": "1am", "name": "CliBuildDemoEvent1am"}}, {"event": {"expression": "rate(1 minute)", "reference": "5min", "name": "CliBuildDemoEvent5min"}}]'
+
+   // "events":[{"source":"api","api":"qyhtzl0n39","stage":"test","parentId":"xfdg32","resource":"sample","authorizerId":"fdr3"}]
+  // "events":[{"source":"api","api":"qyhtzl0n39","stage":"test","parentId":"xfdg32","resource":"sample","authorizerId":"fdr3"},
+   //{"source":"dynamodb","stream":"arn:aws:dynamodb:ap-southeast-2:174842903734:table/contact_us/stream/2021-04-25T15:02:15.028","batchSize":"23","batchWindow":"3","startingPosition":"LATEST"},
+   //{"source":"sqs","stream":"https://sqs.ap-southeast-2.amazonaws.com/174842903734/devq2","batchSize":"32"},
+   //{"source":"kinesis","stream":"arn:aws:dynamodb:ap-southeast-2:174842903734:table/contact_us/stream/2021-04-25T15:02:15.028","batchSize":"34","batchWindow":"33","startingPosition":"LATEST"},
+  // {"source":"cwevents","rule":"arn:aws:events:ap-southeast-2:174842903734:rule/Test"},
+   //{"source":"sns","topic":"arn:aws:sns:ap-southeast-2:174842903734:t1"},
+   //{"source":"s3","bucket":"kumoexcelstore","eventType":"s3:ObjectCreated:*","prefix":"cc","suffix":"fd"}],"vpcConfig":{"sg":"","sn":""}}
+   ///Users/wojtek/Development/kumologica/sdk/kumologica/packages/sdk/src/app/lib/github/index.js:114 
+   let triggers;
+    if (params.events) {
+        triggers = [];
+        params.events.forEach(e => {
+            switch(e.source) {
+              case "api": triggers.push({"api": {"apiId": e.api, "stage": e.stage, "parentId": e.parentId, "resource": e.resource, "authorizerId": e.authorizerId}});
+                          break;
+              case "websocket": triggers.push({"websocket": {"apiId": e.apiId, "stage": e.stage}});
+                          break;
+              case "sns": triggers.push({"sns": {"topicArn": e.topic}});
+                          break;
+              case "sqs": triggers.push({"sqs": {"queueArn": e.queueArn, "batchSize": e.batchSize}});
+                          break;
+              case "dynamodb": triggers.push({"dynamodb": {"streamArn": e.stream, "startingPosition": e.startingPosition, "batchSize": e.batchSize, "batchWindow": e.batchWindow}});
+                          break;
+              case "kinesis": triggers.push({"kinesis": {"streamArn": e.stream, "startingPosition": e.startingPosition, "batchSize": e.batchSize, "batchWindow": e.batchWindow}});
+                          break;
+              case "s3": triggers.push({"s3": {"bucket": e.bucket, "eventType": e.eventType, "prefix": e.prefix, "suffix": e.suffix}});
+                          break;
+              case "cwevents": triggers.push({"event": {"expression": e.expression, "reference": e.reference, "name": e.name, "state": e.state}});
+                          break;
+          }
+        })
+        triggers = JSON.stringify(triggers);
+    };
+
+    let args = {
+        "zip-file-name": params.zipFileName,
+        "bucket-name": params.bucketName,
+        "lambda-name": params.functionName,
+        "memory-size":  params.memory,
+        "description":  params.description,
+        "environment": env,
+        "tags": tags,
+        "timeout": params.timeout,
+        "triggers": triggers,
+        "vpc-config": vpcConf,
+        "role-arn": params.role,
+        "tracing-config": tracing,
+        "reserved-concurrency": params.reservedConcurrency
+    //   not present 
+        // "role-name": params.roleName,
+        // "layers": params.layers,
+        // "policy": params.policy,
+        // "strict-mode": params.strictMode,
+        // "log-retention-days": params.logRetentionDays,
+        // "file-system-configs": params.fileSystemConfigs,
+        // "dead-letter-config": params.deadLetterConfig,
+        // "runtime": params.runtime,
+        // "architectures": params.architectures,
+        // "kms-key-arn": params.kmsKeyArn,
+    }
+    return args;
+  }
+
   async generateScript(projectInfo, params, profile) {
     if (!profile) {
       throw new Error(
@@ -440,34 +496,23 @@ class AWSDeployer {
       this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', AWS.config.region)}`, false);
       
       const settings = this.prepare(projectInfo.projectDir, projectInfo.projectFlowName, params.functionName, params.description);
-      const nodes = await this.prepareNodes(this.loadJsonFile(path.join(projectInfo.projectDir, projectInfo.projectFlowName)));
       
       settings.deploymentBucketName = await this.prepareS3Bucket(
         settings.flowName
       );
       
-      const lambdaCfTemplate = JSON.stringify(
-        this.cfTemplate.createCfTemplate(
-          params,
-          settings,
-          nodes,
-          AWS.config.region
-        ),
-        null,
-        2
-      );
-
-      this.createFile(
-        settings.deployDir,
-        `cf-${projectInfo.projectFlowName}`,
-        lambdaCfTemplate
-      );
+      // NEW 
+      const args = this.mapParams(params); 
+      args.region =  AWS.config.region;
+      args["bucket-name"] = settings.deploymentBucketName; 
+      args["project-directory"] = projectInfo.projectDir;
+		  args["flow-file-name"] = projectInfo.projectFlowName;
+      args["zip-file-name"] = settings.zipFileName;
+
+      console.log(`args: ${JSON.stringify(args)}`);
+      const scriptFileName = exp("cloudformation", "aws", args);
+      this.log(`Cloudformation script has been created: ${scriptFileName}`);
 
-      const scriptFileName = path.join(
-        settings.deployDir,
-        `cf-${projectInfo.projectFlowName}`
-      );
-      this.log(`Cloud formation script created: ${scriptFileName}`);
       openFileOnEditor(scriptFileName);
     } catch (Error) {
       this.log(`${this.chalk('redBright', 'Script creation failed.')}`);
@@ -476,49 +521,16 @@ class AWSDeployer {
     }
   }
 
-  
   /*
    * Builds lambda and zips all sources.
-   */
-  async buildLambda(settings) {
-    this.log('Building lambda...');
-
-    const npmCmd = `npm install --production --prefix "${settings.deployDir}"`;
-    const response = await exec(npmCmd, { cwd: settings.deployDir });
-
-    if (response) {
-      this.log('', false);
-      const lines = response.stdout.split('\n');
-      for (var i = 0; i < lines.length; i++) {
-        if (lines[i]) {
-          this.log(lines[i], false);
-        }
-      }
-      this.log('', false);
-    }
-
-    this.log('Excluding optional dependencies...');
-
-    // for npm 8 on windows is creating symlink that causes recursions and zip to fail
-    const splitdir = path.dirname(settings.deployDir).split(path.sep);
-    const linkname = splitdir[splitdir.length-1];
-    try {
-      fs.unlinkSync(path.join(settings.deployDir, 'node_modules', linkname));
-    } catch (e) {
-      // ignore ENOENT
-      if (e.code !== "ENOENT") {
-        throw e;
-      }
-    }
-    
-    // Remove aws-sdk library as it is provided by aws nodejs runtime.
-    // Reducing the resulting lambda zip file by more than 70%
-    rimraf.sync(path.join(settings.deployDir, 'node_modules', 'aws-sdk'));
-
-    this.log('Zipping lambda...');
-    const zip = new AdmZip();
-    zip.addLocalFolder(settings.deployDir);
-    zip.writeZip(path.join(settings.deployDir, settings.zipFileName));
+   */ 
+  async buildLambda(settings, projectInfo) {
+    let args = {};
+    args["project-directory"] = projectInfo.projectDir;
+		args["flow-file-name"] = projectInfo.projectFlowName;
+		args["zip-file-name"] = settings.zipFileName;
+
+    await build("aws", args);
   }
 
   /*
@@ -526,7 +538,7 @@ class AWSDeployer {
    * and executes create or update stack.
    * Returns stack id
    */
-  async executeStack(settings, params, deploymentStartTimestamp, nodes) {
+  async executeStack(settings, params, deploymentStartTimestamp, nodes, projectInfo) {
     this.log(`Uploading zip file to bucket...`);
     var body = fs.createReadStream(
       path.join(settings.deployDir, settings.zipFileName)
@@ -535,19 +547,21 @@ class AWSDeployer {
     await this.s3.upload({
       Bucket: settings.deploymentBucketName,
       Key: settings.zipFileName,
-      Body: body,
+      Body: body
     });
 
-    params = await this.prepareParams(params);
-    nodes = await this.prepareNodes(nodes);
-
-    const lambdaCfTemplate = this.cfTemplate.createCfTemplate(
-      params,
-      settings,
-      nodes,
-      AWS.config.region
-    );
-
+    const args = this.mapParams(params); 
+    args.region =  AWS.config.region;
+    args["bucket-name"] = settings.deploymentBucketName; 
+    args["project-directory"] = projectInfo.projectDir;
+    args["flow-file-name"] = projectInfo.projectFlowName;
+    args["zip-file-name"] = settings.zipFileName;
+    args.skipPrepare = "true"; // no need for cloudformation prepare
+    
+    const scriptFileName = exp("cloudformation", "aws", args);
+ 
+    const lambdaCfTemplate = this.loadJsonFile(scriptFileName);
+    
     const stackParams = {
       StackName: settings.stackName,
       Capabilities: ['CAPABILITY_NAMED_IAM'],
@@ -563,7 +577,9 @@ class AWSDeployer {
       await this.cf
         .waitFor('stackCreateComplete', { StackName: stackParams.StackName })
         .promise();
+      
     } catch (error) {
+      
       if (error.code == 'AlreadyExistsException') {
         stack = await this.cf.updateStack(stackParams).promise();
         this.log('Waiting for stack update complete...');
@@ -575,6 +591,7 @@ class AWSDeployer {
             })
             .promise();
         } catch (error) {
+      
           await this.describeStackEvents(
             stackParams.StackName,
             deploymentStartTimestamp
@@ -593,137 +610,6 @@ class AWSDeployer {
     return this.describeStack(stackParams.StackName);
   }
 
-  /**
-   * Function links additional details for parameters that are not needed
-   * in ui but are required by cloud formation
-   *
-   * @param {*} params
-   */
-  async prepareParams(params) {
-    for (var i = 0; i < params.events.length; i++) {
-      if (params.events[i].source === 'sqs') {
-        if (!params.events[i].stream) {
-          throw Error(`Missing Trigger Parameter: SQS Queue Url.`);
-        }
-        params.events[i].url = params.events[i].stream;
-        params.events[i].stream = await this.sqs.getQueueArn(
-          params.events[i].stream
-        );
-      } else if (params.events[i].source === 'codecommit') {
-        if (!params.events[i].repository) {
-          throw Error(`Missing Trigger Parameter: CodeCommit Repository.`);
-        }
-        const repository = await this.codecommit.getRepository(
-          params.events[i].repository
-        );
-        params.events[i].repositoryArn = repository.Arn;
-        params.events[i].account = repository.accountId;
-      }
-    }
-    return params;
-  }
-
-  async prepareNodes(nodes) {
-    for (var i = 0; i < nodes.length; i++) {
-      if (nodes[i].type === 'SQS') {
-        if (!nodes[i].QueueUrl) {
-          throw Error(`Missing Node Parameter: SQS Queue Url.`);
-        }
-        nodes[i].QueueArn = await this.sqs.getQueueArn(nodes[i].QueueUrl);
-      }
-    }
-    return nodes;
-  }
-
-  async runTriggers(params, settings, lambdaArn) {
-    let response = {};
-
-    if (params.events) {
-      this.log('Adding flow triggers ...');
-
-      for (var i = 0; i < params.events.length; i++) {
-        if (params.events[i].source === 's3') {
-          await this.addS3Event(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'sns') {
-          await this.addSNSEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'cwevents') {
-          await this.addCWEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'cwlogs') {
-          await this.addCWLogsEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'cognito') {
-          await this.addCognitoEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'alexa') {
-          await this.addAlexaEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'codecommit') {
-          await this.addCodeCommitEvent(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-        } else if (params.events[i].source === 'iot') {
-          var rule = await this.iot.addTrigger(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-          if (rule) {
-            await this.addLambdaPermission(
-              'iot.amazonaws.com',
-              settings.functionName,
-              null,
-              rule.ruleArn
-            );
-          }
-        } else if (params.events[i].source === 'api') {
-          const newApiId = await this.apiGateway.addTrigger(
-            params.events[i],
-            settings.functionName,
-            lambdaArn
-          );
-         
-          response.apiId = newApiId? newApiId: params.events[i].api;
-          response.stage = params.events[i].stage;
-          
-          //arn:aws:lambda:ap-southeast-2:640233474616:function:kumologica-aws-inbound-test-flow-lambda
-          const lambdaArnParts = lambdaArn.split(':');
-          const apiArn = `arn:aws:execute-api:${lambdaArnParts[3]}:${lambdaArnParts[4]}:${params.events[i].api}/*/*/{proxy+}`;
-          await this.addLambdaPermission(
-            'apigateway.amazonaws.com',
-            settings.functionName,
-            null,
-            apiArn
-          );
-        }
-      }
-      this.log(`${this.chalk('greenBright', 'All triggers added successfully:')}`);
-    }
-    return response;
-  }
-
   async describeStack(stackName) {
     return this.cf.describeStacks({ StackName: stackName }).promise();
   }
@@ -733,10 +619,17 @@ class AWSDeployer {
    */
   async describeStackEvents(stackName, deploymentStartTimestamp) {
     this.log('Calling describe stack events...');
+    let events;
 
-    const events = await this.cf
+    try {
+      events = await this.cf
       .describeStackEvents({ StackName: stackName })
       .promise();
+    } catch (error) {
+      //this.log(`de: ${error}`);
+      // may throw stack does not exists for the first ever call
+    }
+
     if (!events || events == undefined) {
       return;
     }
@@ -780,157 +673,6 @@ class AWSDeployer {
     fs.outputFileSync(path.join(baseDir, fileName), content, 'utf-8');
   }
 
-  async addLambdaPermission(
-    principal,
-    lambdaName,
-    sourceAccount,
-    sourceArn,
-    eventSourceToken
-  ) {
-    var request = {
-      Action: 'lambda:InvokeFunction',
-      FunctionName: lambdaName,
-      Principal: principal,
-      SourceAccount: sourceAccount,
-      SourceArn: sourceArn,
-      EventSourceToken: eventSourceToken,
-      StatementId: `${lambdaName}-${Date.now()}`,
-    };
-
-    // wait for response, the subsequent calls require permissions to be present.
-    await this.lambdaApi.addPermission(request).promise();
-  }
-
-  async addS3Event(event, lambdaName, lambdaArn) {
-    if (!event.bucket) {
-      throw Error(`Missing Trigger Parameter: Bucket Name.`);
-    }
-
-    this.log(
-      `Setting lambda execution permissions for bucket ${event.bucket} ...`
-    );
-    await this.addLambdaPermission(
-      's3.amazonaws.com',
-      lambdaName,
-      event.sourceAccount,
-      `arn:aws:s3:::${event.bucket}`
-    );
-
-    await this.s3.bucketNotificationConfiguration(
-      lambdaArn,
-      event.bucket,
-      event.eventType,
-      event.prefix,
-      event.suffix
-    );
-  }
-
-  async addAlexaEvent(event, lambdaName, lambdaArn) {
-    this.log(`Setting  configuration for alexa skill id ${event.skillID} ...`);
-    await this.addLambdaPermission(
-      'alexa-appkit.amazon.com',
-      lambdaName,
-      null,
-      null,
-      event.skillID
-    );
-  }
-
-  async addCodeCommitEvent(event, lambdaName, lambdaArn) {
-    this.log(
-      `Setting configuration for code commit repository ${event.repository} ...`
-    );
-
-    await this.addLambdaPermission(
-      'codecommit.amazon.com',
-      lambdaName,
-      event.account,
-      event.repositoryArn
-    );
-
-    this.log('Adding permissions for lambda to call codecommit.');
-    await this.codecommit.addLambdaPermissions(event, lambdaArn);
-  }
-
-  async addSNSEvent(event, lambdaName, lambdaArn) {
-    await this.addLambdaPermission(
-      'sns.amazonaws.com',
-      lambdaName,
-      null,
-      event.topic
-    );
-
-    this.log(`Setting notification configuration for topic ${event.topic} ...`);
-    await this.sns.subscribe(event.topic, lambdaArn);
-  }
-
-  async addCWEvent(event, lambdaName, lambdaArn) {
-    await this.addLambdaPermission(
-      'events.amazonaws.com',
-      lambdaName,
-      null,
-      event.rule
-    );
-
-    const ruleName = event.rule.split('rule/').pop();
-
-    this.log(
-      `Setting notification configuration for cloudwatch event ${ruleName} ...`
-    );
-
-    var params = {
-      Rule: ruleName,
-      Targets: [
-        {
-          Arn: lambdaArn,
-          Id: `${lambdaName}`,
-        },
-      ],
-    };
-
-    await this.cwevents.putTargets(params).promise();
-  }
-
-  /**
-   * https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/CloudWatchLogs.html#putSubscriptionFilter-property
-   *
-   * @param {*} event
-   * @param {*} lambdaName
-   * @param {*} lambdaArn
-   */
-  async addCWLogsEvent(event, lambdaName, lambdaArn) {
-    //await this.addLambdaPermission("events.amazonaws.com",
-    //  lambdaName, null, event.rule);
-
-    /*this.log(`Setting notification configuration for cloudwatch event ${ruleName} ...`);
-    var params = {
-      destinationArn: 'STRING_VALUE', // required 
-      filterName: 'STRING_VALUE', // required 
-      filterPattern: 'STRING_VALUE', // required 
-      logGroupName: 'STRING_VALUE', // required 
-      distribution: Random | ByLogStream,
-      roleArn: 'STRING_VALUE'
-    };*/
-    await this.cwLogs.putSubscriptionFilter(params).promise();
-  }
-
-  async addCognitoEvent(event, lambdaName, lambdaArn) {
-    await this.addLambdaPermission(
-      'cognito-idp.amazonaws.com',
-      lambdaName,
-      null,
-      event.identityPool
-    );
-
-    const ruleName = event.rule.split('rule/').pop();
-
-    // TODO: add cognito implementation
-    //this.log(`Setting notification configuration for cloudwatch event ${ruleName} ...`);
-    var params = {};
-
-    await this.cognito.updateUserPool(params).promise();
-  }
-
   async listServices(type, profile) {
     if (!profile) {
       throw new Error(
@@ -969,12 +711,6 @@ class AWSDeployer {
       case 'iot':
         res = await this.iot.listTopicRules();
         break;
-      case 'alexa':
-        res = await this.alexa.listSkills();
-        break;
-      case 'codecommit':
-        res = await this.codecommit.listRepositories();
-        break;
       case 'iamroles':
         res = await this.iam.listRoles();
         break;