@kumologica/sdk 3.0.27-beta3 → 3.0.27-beta5

package/cli/commands/test-utils/TestSuiteController.js

@@ -309,27 +309,12 @@ class TestSuiteController {
     return flowFileJson.filter((node) => node.type === 'TestCase' || node.type === 'HTTPTestCase');
   }
 
-  async runTestSuite(testcase) {
-    const flowFileAbsPath = path.join(
-      this._appServer.settings.userDir,
-      this._appServer.settings.flowFile
-    );
-    let testCases = this.findTestCasesFromFlow(flowFileAbsPath);
-    if (!testCases || (testCases && testCases.length === 0)) {
-      logError(`No testcases found on flow file: ${flowFileAbsPath}`);
-      process.exit(1);
-    }
-
-    // If defined, filter the testcase that you want to test
-    if (testcase) {
-      testCases = testCases.filter(tc => tc.name.toLowerCase() === testcase.toLowerCase());
-      if (testCases && testCases.length === 0){
-        logError(`TestCase: "${testcase}" cannot be found`);
-        process.exit(1);
-      }
-      
-    }
-
+  /**
+   * 
+   * @param {*} testcasesSelected - array of {id: nodeId, name: nodeName}
+   * @returns 
+   */
+  async runTestSuite(testcasesSelected) {
     // === Starting the testSuite ===
     this._appServer.events.emit('runtime-event', {
       id: runtimeEvents.TEST_TESTSUITE_START,
@@ -337,7 +322,7 @@ class TestSuiteController {
     });
 
     // === Iterate over all the testCases ===
-    await this.runTestCases(testCases);
+    await this.runTestCases(testcasesSelected);
     await this.waitForResults();
     const errorsNum = this._testReporter.getFailedTestCases().length;
 

package/cli/commands/test.js

@@ -3,6 +3,7 @@ const { Select } = require('enquirer');
 const fs = require('fs');
 const { logError } = require('./utils');
 const path = require('path');
+const wcmatch = require('wildcard-match');
 
 const { AppServer } = require('@kumologica/runtime');
 const { TestSuiteController } = require('./test-utils/TestSuiteController');
@@ -11,7 +12,7 @@ const { codegen } = require('@kumologica/builder');
 const log = console.log;
 const APP_SERVER_PORT = 1990;
 		
-async function runTest(flowFilePath, testcase, iterative) {
+async function runTest(flowFilePath, testcaseSelected, iterative) {
     log(`\n> Starting runtime on port ${APP_SERVER_PORT}...`);
   
     let appServer = new AppServer({
@@ -28,24 +29,31 @@ async function runTest(flowFilePath, testcase, iterative) {
       await appServer.start();
       log(`> FlowFile to be tested: ${chalk.bold(path.resolve(flowFilePath))} \n`);
       let testSuiteController = new TestSuiteController(appServer);
-      let testcasesAvailable = testSuiteController.findTestCasesFromFlow(flowFilePath).map(tc => {
-        return tc.name;
-      })
-      testcasesAvailable.push('Run all TestCases...');
-      // Iterative ?
-        // Check if iterative testing has been selected
+      
+      // If testcase is null, default to universal wildcard
+      testcaseSelected  = testcaseSelected || "**";
+
+      // Find out all testcases available on the flow
+      let testcasesAvailable = testSuiteController.findTestCasesFromFlow(flowFilePath);
+      if (!testcasesAvailable || (testcasesAvailable && testcasesAvailable.length === 0)) {
+        logError(`No testcases found on flow file: ${flowFileAbsPath}`);
+        process.exit(1);
+      };
+      let testcaseAvailableNames = testcasesAvailable.map(tc=>tc.name);
+
+      // Capture the testcase from user on iterative mode
       if (iterative) {
         const prompt = new Select({
           name: 'testcase',
           message: 'What testcase do you want to run?',
-          choices: testcasesAvailable
+          choices: [...testcaseAvailableNames, 'Run all TestCases...']
         });
         await prompt.run()
           .then(tc => {
             if (tc === 'Run all TestCases...'){
-              testcase = null;
+              testcaseSelected = "**";
             }else {
-              testcase = tc;
+              testcaseSelected = tc;
             }
           })
           .catch(err => {
@@ -54,15 +62,31 @@ async function runTest(flowFilePath, testcase, iterative) {
           });
       }
 
+      // Filter all testcases to be part of the test suite
+      const isMatch = wcmatch(testcaseSelected);
+      let testCasesSelected = [];
+      testcasesAvailable.forEach(async tc => {
+        if (isMatch(tc.name)){
+          testCasesSelected.push({ name: tc.name, id: tc.id });
+        }
+      });
+
+      // Execute the testcasesIds if any, otherwise throw an error
+      if (testCasesSelected.length === 0){
+        logError(`No matched testcases found`);
+        process.exit(1);
+      } else {
+        const errors = await testSuiteController.runTestSuite(testCasesSelected); 
+        process.exit(errors > 0);
+      }
       
-      const errors = await testSuiteController.runTestSuite(testcase); // no need to wait for response
-      process.exit(errors > 0);
     } catch (err) {
       log(
         chalk.red(
           `Unexpected error occurred while starting server due to <${err.message}>`
         )
       );
+      console.log(err);
       process.exit(1);
     }
   }

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-beta3",
+  "version": "3.0.27-beta5",
   "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-beta3",
-    "@kumologica/devkit": "3.0.27-beta3",
-    "@kumologica/runtime": "3.0.27-beta3",
+    "@kumologica/builder": "3.0.27-beta5",
+    "@kumologica/devkit": "3.0.27-beta5",
+    "@kumologica/runtime": "3.0.27-beta5",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "aws-sdk": "2.513.0",
@@ -117,6 +117,7 @@
     "tcp-port-used": "1.0.2",
     "util": "0.12.1",
     "when": "3.7.8",
+    "wildcard-match": "^5.1.2",
     "ws": "7.1.1",
     "xterm": "4.1.0",
     "xterm-addon-fit": "0.2.1",

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 = '*';
               
@@ -220,10 +219,23 @@ class AWSCFTemplate {
             this.handlePolicy(lambdaRole, `KLSES`, `ses:${nodes[i].operation}`, '*');
 
           } else if (nodes[i].type === 'SSM') {
-            const key = this.handleValue(lambda, nodes[i].Key);
-            const ssmArn =  { "Fn::Sub": `arn:aws:ssm:\${AWS::Region}:\${AWS::AccountId}:parameter/${key}` };
-            this.handlePolicy(lambdaRole, `KLSSM${key}`, `ssm:${nodes[i].operation}`, ssmArn);
+            let key;
+            if (nodes[i].operation === "GetParametersByPath") {
+              key = this.handleValue(lambda, nodes[i].Path);
+            } else {  
+              key = this.handleValue(lambda, nodes[i].Key);
+            }
+
+            if (key.startsWith('/')) {
+              key = key.substring(1);
+            }
+            const ssmArn = {'Fn::Sub': 'arn:aws:ssm:${AWS::Region}:${AWS::AccountId}:parameter/' + key};  
+            this.handlePolicy(lambdaRole, `KLSSM${new Date().valueOf()}`, `ssm:${nodes[i].operation}`, ssmArn);
 
+            if (nodes[i].operation === "GetParameter" && nodes[i].Key.startsWith("/aws/reference/secretsmanager/")) {
+              const smArn = {'Fn::Sub': 'arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:*'};  
+              this.handlePolicy(lambdaRole, `KLSM${new Date().valueOf()}`, "secretsmanager:GetSecretValue", smArn);
+            }
           } else if (nodes[i].type === 'S3') {
             let bucketName = this.handleValue(lambda, nodes[i].Bucket);
             const bucketArn = `arn:aws:s3:::${bucketName}/*`;
@@ -260,6 +272,7 @@ class AWSCFTemplate {
     if (!params.role) {
       template.Resources['LambdaRole'] = lambdaRole;
     }
+
     return template;
   }
 
@@ -279,7 +292,6 @@ class AWSCFTemplate {
   // to determine the value 
   handleValue(lambda, key) {
     let value;
-    console.log(`key= ${key}`);
 
     if (!key) {
       return key;
@@ -287,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) {
@@ -316,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}')]`);    
     
@@ -373,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,
     });