@kumologica/sdk 3.2.1 → 3.2.2

package/cli/commands/export-commands/github-commands/aws.js

@@ -1,10 +1,21 @@
 const { exp } = require('@kumologica/builder');
 
 exports.command = 'aws';
-exports.desc = `Export github workflow file to automate deployment of kumologica flow into AWS using github action workflow.`;
+exports.desc = `Export github action workflow file to automate deployment of kumologica flow into AWS.`;
 
 exports.builder = {		
 		
+	"lang": {
+		describe: "\nScripting language, either cloudformation or terraform.",
+		default: 'cloudformation',
+		type: 'string',
+		nargs: 1
+	},
+	"output-file-name": {
+		describe: "\nFull path and name of the github action workflow file to create. workflow.yaml file in current working directory if not provided.",
+		type: 'string',
+		nargs: 1
+	},
 	"project-directory": {
 		describe: "\nThe location of kumologica project.\n Current working directory if not provided.",
 		type: 'string',
@@ -97,9 +108,9 @@ exports.builder = {
 		nargs: 1
 	},
 	runtime: {
-		describe: "\nThe runtime, only nodejs runtimes allowed: nodejs12.x | nodejs14.x | nodejs16.x | ...",
+		describe: "\nThe runtime, only nodejs runtimes allowed: nodejs14.x | nodejs16.x | ...",
 		type: 'string',
-		default: 'nodejs14.x',
+		default: 'nodejs16.x',
 		alias: 'r',
 		nargs: 1
 	},
@@ -264,6 +275,8 @@ Examples:
 		
 function display(argv) {
 	console.log('Parameters:');
+	console.log('  lang:                %s', argv["lang"]||'');
+	console.log('  output-file-name:    %s', argv["output-file-name"]||'');
 	console.log('  flow-file-name:      %s', argv["flow-file-name"]||'');
 	console.log('  zip-file-name:       %s', argv["zip-file-name"]||'');
 	console.log('  lambda-name:         %s', argv["lambda-name"]||'');
@@ -362,8 +375,9 @@ exports.handler = function (argv) {
 
 		const { exp } = require('@kumologica/builder');
 		
-		exp('github', 'aws', argv);
+		const workflowFile = exp('github', 'aws', argv);
 		console.log(chalk.greenBright('Github action workflow created successfully.'));
+		console.log(`File: ${workflowFile}`);
 	
 		process.exit(0);
 	} catch (e) {

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.1",
+  "version": "3.2.2",
   "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.1",
-    "@kumologica/devkit": "3.2.1",
-    "@kumologica/runtime": "3.2.1",
+    "@kumologica/builder": "3.2.2",
+    "@kumologica/devkit": "3.2.2",
+    "@kumologica/runtime": "3.2.2",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

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

@@ -536,6 +536,7 @@ if (s.cwevents && s.cwevents.length > 0) {
       console.log(`args: ${JSON.stringify(args)}`);
       const scriptFileName = exp("cloudformation", "aws", args);
       this.log(`Cloudformation script has been created: ${scriptFileName}`);
+      console.log(`Cloudformation script has been created: ${scriptFileName}`);
 
       openFileOnEditor(scriptFileName);
     } catch (Error) {

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

@@ -1,14 +1,9 @@
-const fs = require('fs-extra');
 const path = require('path');
 const AWS = require('aws-sdk');
 const { exp } = require('@kumologica/builder');
 const AWSProfile = require('../aws/aws-profile');
 const { openFileOnEditor } = require('../utils/editor');
 
-/**
- * sample events:
- * https://docs.aws.amazon.com/lambda/latest/dg/lambda-services.html
- */
 class GithubDeployer {
   constructor(terminal) {
     this.term = terminal;
@@ -65,39 +60,8 @@ class GithubDeployer {
     }
   }
 
-  logCloud(text) {
-    if (this.term) {
-      this.term.emit('terminal-cloud', `${text}`);
-    }
-  }
-
-  prepare(projectDir, flowFileName, originaLambdaName) {
-    const deployDir = projectDir + '/deploy';
-    
-    const flowName = flowFileName.replace('.json', '');
-
-    // setup deployment directory
-    fs.ensureDirSync(deployDir);
-    fs.emptyDirSync(deployDir);
-    fs.ensureDirSync(deployDir + '/node_modules');
-
-    this.processPackageJson(projectDir, deployDir);
-
-    const zipFileName = `${flowName}/lambda${Date.now()}.zip`;
-    const lambdaName = this.sanitizeLambdaName(originaLambdaName);
-
-    const functionName = `kumologica-${lambdaName}-lambda`;
-  }
-
   async generateScript(projectInfo, params, profile) {
-   
-    /*
-
- projectInfo: {"projectName":"sockets",
- "projectDir":"/Users/wojtek/Development/projects/sockets",
- "projectFlowName":"sockets-flow.json"}
- profile: kl
-*/
+  
     try {
       this.log('Generating github action workflow');
 
@@ -109,26 +73,15 @@ class GithubDeployer {
     const args = this.mapParams(params); 
     args.region = awsSettings.region;
     args["bucket-name"] = awsSettings.bucket; 
+    args["output-file-name"] = path.join(projectInfo.projectDir, '.github', 'workflows', 'workflow.yaml');
 
-    let wf = exp("github", "aws", args, console.log);
-
-    const wfDir = path.join(projectInfo.projectDir, '.github', 'workspaces');
-
-    this.createFile (
-        wfDir, 'workflow.yaml',
-        wf
-      );
-
-      this.log(`Github action workflow created: ${path.join(wfDir, 'workflow.yaml')}`);
+    const wfDir = exp("github", "aws", args, console.log);
 
-      openFileOnEditor(path.join(wfDir, 'workflow.yaml'));
+    this.log(`Github action workflow created: ${wfDir}`);
 
-      return;
+    openFileOnEditor(wfDir);
       
       
-      this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', AWS.config.region)}`, false);
-    
-      
     } catch (Error) {
       this.log(`${this.chalk('redBright', 'Github action workflow creation failed.')}`);
       this.log(`  ${this.chalk('redBright', Error)}`);
@@ -179,7 +132,6 @@ class GithubDeployer {
   // {"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 = [];
@@ -197,7 +149,7 @@ class GithubDeployer {
                             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}});
+                case "cwevents": triggers.push({"event": {"expression": e.expression, "reference": e.reference, "name": e.name, "state": e.state}});
                             break;
             }
         })
@@ -218,7 +170,7 @@ class GithubDeployer {
         "role-arn": params.role,
         "tracing-config": tracing,
         "reserved-concurrency": params.reservedConcurrency
-    //   not present 
+    //   not present in designer
         // "role-name": params.roleName,
         // "layers": params.layers,
         // "policy": params.policy,
@@ -232,11 +184,6 @@ class GithubDeployer {
     }
     return args;
   }
-
-  createFile(baseDir, fileName, content) {
-    fs.outputFileSync(path.join(baseDir, fileName), content, 'utf-8');
-  }
-
 }
 
 module.exports = GithubDeployer;

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

@@ -1,7 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
 const AWS = require('aws-sdk');
-const chalk = require('chalk');
 const yaml = require('js-yaml');
 const AWSProfile = require('../aws/aws-profile');
 const CASQS = require('../aws/ca-sqs-api');
@@ -39,7 +38,7 @@ class ServerlessDeployer {
     var t = text;
 
     if (calog) {
-      t = `Kumologica: ${chalk.hex('#F5DEB3')(text)}`;
+      t = `Kumologica: ${text}`;
     }
 
     if (this.term) {
@@ -95,34 +94,35 @@ class ServerlessDeployer {
 
     try {
       this.log('Generating serverless.yml file');
-      this.log(`  ${chalk.hex('#F5DEB3')('AWS profile:')}       ${chalk.whiteBright(AWS.config.profile)}`, false); 
-      this.log(`  ${chalk.hex('#F5DEB3')('AWS region:')}        ${chalk.whiteBright(AWS.config.region)}`, false);
+      this.log(`  AWS profile:       ${AWS.config.profile}`, false); 
+      this.log(`  AWS region:        ${AWS.config.region}`, false);
       
       const settings = this.prepare(projectInfo.projectDir, projectInfo.projectFlowName, params.functionName, params.description);
       const nodes = this.loadFlow(path.join(projectInfo.projectDir, projectInfo.projectFlowName));
       
       const serverlessTemplate = await this.createServerlessTemplate(params, settings, nodes, AWS.config.region);
       this.createFile(projectInfo.projectDir, `serverless.yml`, serverlessTemplate);
-
+      
       const scriptFileName = path.join(projectInfo.projectDir, `serverless.yml`);
       this.log(`serverless.yml has been created.`);
 
       openFileOnEditor(scriptFileName);
 
     } catch (Error) {
-      this.log(`${chalk.redBright('Script creation failed.')}`);
-      this.log(`  ${chalk.redBright(Error)}`);
+      this.log(`${'Script creation failed.'}`);
+      this.log(`  ${Error}`);
       throw Error;
     }
   }
 
   async createServerlessTemplate(params, settings, nodes, region){
+    try {
     let serverlessJson = {
         service: settings.functionName,
 
         provider: {
           name: "aws",
-          runtime: "nodejs12.x",
+          runtime: "nodejs16.x",
           deploymentPrefix: "kumologica-sls"
         },
         functions: {},
@@ -165,7 +165,9 @@ class ServerlessDeployer {
       });
     }
 
+    console.log(`tags: ${JSON.stringify(params.tags)}`);
     if (params.tags) {
+      serverlessJson.functions[ `${settings.functionName}`].tags = {};
       params.tags.forEach(function(tag, index) {
         serverlessJson.functions[ `${settings.functionName}`].tags[tag.key] = tag.value;
       });
@@ -296,6 +298,9 @@ class ServerlessDeployer {
       }
 
       return yaml.dump(serverlessJson);    
+    } catch(e) {
+console.log(e);
+      }
   }