@kumologica/sdk 3.5.0-beta8 → 3.5.0

package/cli/commands/open.js

@@ -41,20 +41,29 @@ async function updater(projectDir) {
 
     const updater = new Updater(projectDir);
     const updates = updater.updatesAvailable();
+
     if (updates.v3) {
         console.log("");
-        console.log("This project uses deprecated version of aws sdk. Upgrade to aws js sdk v3 is available.");
+        console.log("This project uses the deprecated aws-sdk v2. Migration to aws-sdk v3 is available.");
         console.log("");
 
-        if (updater.checkFunctionAWS()) {
-            console.warn("WARNING !!!");
-            console.warn("This project has function nodes that use \"aws-sdk\" package. Those functions can not be automatically converted by this command. Manual conversion is required.");
-            console.warn("");    
-        }
-        const answer = await confirm({ message: 'Do you wish to upgrade project to aws js sdk v3?' });
+        const answer = await confirm({ message: 'Do you wish to migrate the project to aws-sdk v3?' });
         if (!answer) {
             return;
         }
+
+        if (updater.checkFunctionAWS()) {
+            console.log("");
+            console.warn("WARNING");
+            console.warn("This project contains function nodes that use aws-sdk v2. These functions can not be automatically migrated to aws-sdk v3.");
+            console.warn("Manual migration is required. For details, see: https://github.com/aws/aws-sdk-js-v3/blob/main/UPGRADING.md");
+            console.warn("");    
+            const res = await confirm({ message: 'Do you wish to continue with the project migration to aws-sdk v3?' });
+            if (!res) {
+                return;
+            }
+        }
+
         await updater.update();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumologica/sdk",
-  "version": "3.5.0-beta8",
+  "version": "3.5.0",
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
@@ -75,9 +75,9 @@
     "@aws-sdk/client-sqs": "^3.556.0",
     "@aws-sdk/credential-providers": "^3.556.0",
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.5.0-beta8",
-    "@kumologica/devkit": "3.5.0-beta8",
-    "@kumologica/runtime": "3.5.0-beta8",
+    "@kumologica/builder": "3.5.0",
+    "@kumologica/devkit": "3.5.0",
+    "@kumologica/runtime": "3.5.0",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

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

@@ -57,6 +57,8 @@ class GithubDeployer {
     args.region = awsSettings.region;
     args["bucket-name"] = awsSettings.bucket; 
     args["output-file-name"] = path.join(projectInfo.projectDir, '.github', 'workflows', 'workflow.yaml');
+    args["project-directory"] = projectInfo.projectDir;
+    args["flow-file-name"] = projectInfo.projectFlowName;
 
     const wfDir = exp("github", "aws", args, console.log);
 

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

@@ -1,6 +1,5 @@
 const fs = require('fs-extra');
 const path = require('path');
-//const AWS = require('aws-sdk');
 const yaml = require('js-yaml');
 const AWSProfile = require('../aws/aws-profile');
 const CASQS = require('../aws/ca-sqs-api');
@@ -18,18 +17,13 @@ class ServerlessDeployer {
   }
 
   async initAWS(profile) {
-    AWS.config.credentials = new AWS.SharedIniFileCredentials({profile: profile});
-    AWS.config.profile = profile;  // this is not AWS property
-    
-    AWS.config.apiVersions = {
-      cloudformation: '2010-05-15'
+    const { fromIni } = require("@aws-sdk/credential-providers"); 
+    const config = {
+      credentials: fromIni({profile: profile})
     };
-    
-    console.log('initAWS from aws...')
-    const region = await this.awsProfile.getRegion(profile);
-    
-    AWS.config.update({region: region});
-    this.sqs = new CASQS(this.log.bind(this));
+
+    this.region = await this.awsProfile.getRegion(profile);   
+    this.sqs = new CASQS(config, this.log.bind(this));
   }
 
   log(text, calog = true) {
@@ -90,17 +84,15 @@ class ServerlessDeployer {
 
     await this.initAWS(profile);
 
-    console.log(`AWS.config = ${JSON.stringify(AWS.config)}`);
-
     try {
       this.log('Generating serverless.yml file');
-      this.log(`  AWS profile:       ${AWS.config.profile}`, false); 
-      this.log(`  AWS region:        ${AWS.config.region}`, false);
+      this.log(`  AWS profile:       ${profile}`, false); 
+      this.log(`  AWS region:        ${this.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);
+      const serverlessTemplate = await this.createServerlessTemplate(params, settings, nodes, this.region);
       this.createFile(projectInfo.projectDir, `serverless.yml`, serverlessTemplate);
       
       const scriptFileName = path.join(projectInfo.projectDir, `serverless.yml`);
@@ -122,7 +114,7 @@ class ServerlessDeployer {
 
         provider: {
           name: "aws",
-          runtime: "nodejs16.x",
+          runtime: "nodejs18.x",
           deploymentPrefix: "kumologica-sls"
         },
         functions: {},

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

@@ -22541,7 +22541,7 @@ RED.view.tools = (function() {
  
         $(itemId).on('input', function() {
           let id = $(this).val(); // api id
-          alert("Make Ajax call here.2");
+         // alert("Make Ajax call here.2");
           
           $(`#${dataListId}`).find("option").each(function() {
             console.log($(this).val() + "<>" + id);
@@ -26856,6 +26856,8 @@ RED.sidebar.azure = (function () {
 
     const initRuntimeVerWidget = () => {
         let $runtimeVer = $('#footer-runtime-ver');
+        $('#footer-runtime-value').text(window.__kumologica.runtime.version);
+
         RED.popover.create({
             target: $runtimeVer,
             trigger: 'hover',