@kumologica/sdk 3.0.27-beta4 → 3.0.27-beta6

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.0.27-beta4",
+  "version": "3.0.27-beta6",
   "description": "Kumologica Designer, harnessing Serverless for your cloud integration needs",
   "main": "src/app/main.js",
   "files": [
@@ -65,9 +65,9 @@
   "license": "Proprietary",
   "dependencies": {
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.0.27-beta4",
-    "@kumologica/devkit": "3.0.27-beta4",
-    "@kumologica/runtime": "3.0.27-beta4",
+    "@kumologica/builder": "3.0.27-beta6",
+    "@kumologica/devkit": "3.0.27-beta6",
+    "@kumologica/runtime": "3.0.27-beta6",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "aws-sdk": "2.513.0",

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

@@ -196,8 +196,7 @@ class AWSCFTemplate {
           
           } else if (nodes[i].type === 'Lambda') {
               //arn:aws:lambda:ap-southeast-2:174450237637:function:kumologica-deployments-flow-lambda
-              console.log(`lambda ${JSON.stringify(lambda)} node ${JSON.stringify(nodes[i])}`)
-              let lambdaArn = this.handleValue(lambda, nodes[i].LambdaArn);
+               let lambdaArn = this.handleValue(lambda, nodes[i].LambdaArn);
               let lambdaParts = lambdaArn.split(":");
               let lambdaName = '*';
               
@@ -273,6 +272,7 @@ class AWSCFTemplate {
     if (!params.role) {
       template.Resources['LambdaRole'] = lambdaRole;
     }
+
     return template;
   }
 
@@ -292,7 +292,6 @@ class AWSCFTemplate {
   // to determine the value 
   handleValue(lambda, key) {
     let value;
-    console.log(`key= ${key}`);
 
     if (!key) {
       return key;
@@ -300,7 +299,6 @@ class AWSCFTemplate {
     let keyValue = key.replace(/\s+/g, '');
 
     if (keyValue.startsWith("env.")) {
-    console.log(`keyValue= ${keyValue}`);
       keyValue = keyValue.replace("env.", "");
       value = lambda.Properties.Environment.Variables[keyValue];
       if (!value) {
@@ -329,7 +327,6 @@ class AWSCFTemplate {
   // - updates existing resource policy (if found) with new permissions 
   //
   handlePolicy(lambdaRole, policyName, operation, id) {
-    console.log(`policyName: ${policyName}`);
     policyName = policyName.replace('/', '-').replace('*', 'all');
     let policy = jp.query(lambdaRole.Properties, `Policies[?(@.PolicyName=='${policyName}')]`);    
     
@@ -386,7 +383,7 @@ class AWSCFTemplate {
       throw new Error(`Missing Trigger Parameter: SQS url`);
     }
     return {
-      PolicyName: 'KumologicaLambdaSQSPolicy',
+      PolicyName: 'KLSQSPolicy'+process.hrtime(),
       PolicyDocument: {
         Version: '2012-10-17',
         Statement: [

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

@@ -241,7 +241,7 @@ class AWSDeployer {
       );
 
       flowListeners = this.processFlow(nodes);
-
+  
       const stackDetails = await this.executeStack(
         settings,
         params,
@@ -278,7 +278,7 @@ class AWSDeployer {
         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);
+          this.printSignature(url, flowListeners, params);
         }
       } catch (error) {
         this.log(`${this.chalk('redBright', 'Trigger creation failed.')}`);
@@ -288,8 +288,9 @@ class AWSDeployer {
     return response;
   }
 
-  printSignature(url, s) {
+  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);
@@ -326,10 +327,13 @@ class AWSDeployer {
       this.log('');
     }
 
-    if (s.sqs && s.sqs.length > 0) {
-      this.log('SQS URL:');
-      s.sqs.forEach(a => this.log(` ${a.queueUrl}`), 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) {
@@ -588,6 +592,7 @@ class AWSDeployer {
         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
         );

package/src/app/main.js

@@ -314,7 +314,7 @@ ipcMain.on('restart-requested', async (event, msg) => {
   // reload the nodes available in the palette
   try {
     await requestAsync({
-      uri: `http://127.0.0.1:${PORT}/nodes-reload`,
+      uri: `http://127.0.0.1:${RUNTIME_PORT}/nodes-reload`,
       method: 'POST',
       json: true,
     });
@@ -330,7 +330,7 @@ ipcMain.on('modal-node-library:restart-requested', async (event, msg) => {
   // reload the nodes available in the palette
   try {
     await requestAsync({
-      uri: `http://127.0.0.1:${PORT}/nodes-reload`,
+      uri: `http://127.0.0.1:${RUNTIME_PORT}/nodes-reload`,
       method: 'POST',
       json: true,
     });