@kumologica/sdk 3.2.0-beta23 → 3.2.0-beta25

package/package.json

@@ -3,7 +3,7 @@
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
-  "version": "3.2.0-beta23",
+  "version": "3.2.0-beta25",
   "description": "Kumologica Designer, harnessing Serverless for your cloud integration needs",
   "main": "src/app/main.js",
   "files": [
@@ -64,9 +64,9 @@
   "license": "Proprietary",
   "dependencies": {
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.2.0-beta23",
-    "@kumologica/devkit": "3.2.0-beta23",
-    "@kumologica/runtime": "3.2.0-beta23",
+    "@kumologica/builder": "3.2.0-beta25",
+    "@kumologica/devkit": "3.2.0-beta25",
+    "@kumologica/runtime": "3.2.0-beta25",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

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

@@ -153,7 +153,6 @@ class AWSDeployer {
     }
 
     const deploymentStart = Date.now();
-    var lambdaArn;
 
     this.log(`Deployment to AWS Started:`);
     this.log(`  ${this.chalk('#F5DEB3', 'flow:')}              ${this.chalk('whiteBright', projectInfo.projectFlowName)}`, false);
@@ -212,9 +211,8 @@ class AWSDeployer {
         }
    */
 
-      lambdaArn = stackDetails.Stacks[0].Outputs[0].OutputValue;
+      const res = this.parseStackOutput(stackDetails);
 
-      this.log(JSON.stringify(stackDetails));
       this.log(`${this.chalk('greenBright', 'Deployment successful.')}`);
       this.log(
         `  ${this.chalk('#F5DEB3', 'StackId:')}   ${this.chalk('whiteBright', 
@@ -222,9 +220,11 @@ class AWSDeployer {
         )}`,
         false
       ); 
-      this.log(`  ${this.chalk('#F5DEB3', 'LambdaArn:')} ${this.chalk('whiteBright',lambdaArn)}`, false);
+      this.log(`  ${this.chalk('#F5DEB3', 'LambdaArn:')} ${this.chalk('whiteBright',res.LambdaArn)}`, false);
       this.log('', false);
 
+      this.printSignature(flowListeners, params, res);
+
       // this call to be moved out to the terminals panel
       /*if (this.cw == false) {
         this.cwLogs.startCWLogs(settings.functionName, AWS.config.region);
@@ -235,41 +235,65 @@ class AWSDeployer {
   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) {
+  parseStackOutput(stackDetails) {
+    let res = {};
+    stackDetails.Stacks[0].Outputs.forEach(o => {
+      res[o.OutputKey] = o.OutputValue;
+    });
+    return res;
+  }
+
+printSignature(s, p, output) {
 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('');
+  const _api = p.events.find(e => e.source === "api");
+
+  if (_api) {
+    this.log('API Gateway:');
+  
+    let apiId = _api.api;
+    let stage = _api.stage;
+
+    if (_api.api === "create new") {
+      apiId = output.RestApiId || "unknown api gateway";
+    }
+
+    let url = `https://${apiId}.execute-api.${AWS.config.region}.amazonaws.com/${stage}`;
+    s.api.forEach(a => this.log(`  ${('    ' + a.verb.toUpperCase()).slice(-6)}  ${url}${a.url}`), 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('');
+  const _ddb = p.events.find(e => e.source === "dynamodb");
+  if (_ddb) {
+    this.log('DynamoDB Streams:');
+    s.dynamodb.forEach(a => this.log(` ${a.startingPosition} ${a.stream}`), 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('');
+  const _s3 = p.events.find(e => e.source === "s3");
+  if (_s3) {
+    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('');
+  const _sns = p.events.find(e => e.source === "sns");
+  if (_sns) {
+    this.log('SNS Topics:');
+    s.sns.forEach(a => this.log(` ${a.topic}`), this);
+    this.log('');
+  }
 }
 
 if (s.iot && s.iot.length > 0) {
@@ -293,22 +317,22 @@ if (p.events && p.events.length > 0) {
   }
 }
 
-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('');
+  const _k = p.events.find(e => e.source === "kinesis");
+  if (_k) {
+    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('');
+  const _ev = p.events.find(e => e.source === "event");
+  if (_ev) {
+    this.log('Cloud Watch Events Rules:');
+    s.cwevents.forEach(a => this.log(` ${a.rule}`), this);
+    this.log('');
+  }
 }
 }
 

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

@@ -31083,9 +31083,9 @@ RED.editor = (function () {
       resize: function (dimensions) {
         editTrayWidthCache[type] = dimensions.width;
         $('.editor-tray-content').height(dimensions.height - 50);
-        var form = $('.editor-tray-content form').height(
-          dimensions.height - 50 - 40
-        );
+        // var form = $('.editor-tray-content form').height(
+        //   dimensions.height - 50 - 40
+        // );
         if (editing_node && editing_node._def.oneditresize) {
           try {
             editing_node._def.oneditresize.call(editing_node, {