@kumologica/sdk 3.2.0-beta12 → 3.2.0-beta14

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

@@ -1,7 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
 const AWS = require('aws-sdk');
-const AWSCFTemplate = require('./cf');
 const CAAWSCloudWatch = require('./ca-cloudwatch-api');
 const CAS3 = require('./ca-s3-api');
 const CASNS = require('./ca-sns-api');
@@ -14,7 +13,7 @@ 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
  */
@@ -44,7 +43,6 @@ 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();
@@ -180,7 +178,7 @@ class AWSDeployer {
         settings.flowName
       );
 
-      const zipFileName = await this.buildLambda(settings, projectInfo);
+      await this.buildLambda(settings, projectInfo);
 
       const nodes = this.loadJsonFile(
         path.join(projectInfo.projectDir, projectInfo.projectFlowName)
@@ -212,95 +210,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) {
 
@@ -417,21 +407,23 @@ class AWSDeployer {
         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 "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}});
-                            break;
-            }
+              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);
     };
@@ -484,7 +476,6 @@ 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
@@ -496,7 +487,9 @@ class AWSDeployer {
       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}`);
 
@@ -517,8 +510,7 @@ class AWSDeployer {
 		args["flow-file-name"] = projectInfo.projectFlowName;
 		args["zip-file-name"] = settings.zipFileName;
 
-    const buildFileName = await build("aws", args);
-    return buildFileName;
+    await build("aws", args);
   }
 
   /*
@@ -565,7 +557,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...');
@@ -577,6 +571,7 @@ class AWSDeployer {
             })
             .promise();
         } catch (error) {
+      
           await this.describeStackEvents(
             stackParams.StackName,
             deploymentStartTimestamp
@@ -595,95 +590,6 @@ class AWSDeployer {
     return this.describeStack(stackParams.StackName);
   }
 
-  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();
   }
@@ -693,10 +599,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;
     }
@@ -740,157 +653,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(
@@ -929,12 +691,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;

package/src/app/ui/editor-client/public/red/red.js

@@ -22217,6 +22217,7 @@ RED.view.tools = (function() {
             <!--option value="lex">Amazon Lex</option-->
             <!--option value="alexa">Amazon Alexa</option-->
             <option selected value="api">Amazon API Gateway</option>
+            <option selected value="websocket">Amazon WebSocket API</option>
             <!--option value="cf">Amazon CloudFront (Lambda@Edge)</option-->
             <!--option value="firehose">Amazon Kinesis Data Firehose</option-->
             <option disabled>────────────────────</option>
@@ -23273,6 +23274,16 @@ RED.view.tools = (function() {
     { label: 'Resource', key: 'resource', value: '', required: false },
     { label: 'Authorizer Id', key: 'authorizerId', value: '', required: false }
   ];
+  parameterSets['websocket'] = [
+    {
+      label: 'ApiId',
+      key: 'apiId',
+      value: '',
+      required: true,
+      function: 'attachDataList',
+    },
+    { label: 'Deployment Stage', key: 'stage', value: '', required: true }
+  ];
   parameterSets['alb'] = [
     {
       label: 'App Load Balancer',
@@ -23322,7 +23333,15 @@ RED.view.tools = (function() {
   parameterSets['cwevents'] = [
     { label: 'Expression', key: 'expression', value: 'cron()', required: true },
     { label: 'Reference', key: 'reference', value: '' },
-    { label: 'Name', key: 'name', value: ''}
+    { label: 'Name', key: 'name', value: ''},
+    { label: 'State',
+      key: 'state',
+      value: '',
+      list: [
+        { k: 'ENABLED', v: 'ENABLED' },
+        { k: 'DISABLED', v: 'DISABLED' }
+      ],
+    },
   ];
   //parameterSets['cwlogs'] = [
   //  {