@kumologica/sdk 3.4.0 → 3.5.0-beta10

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

@@ -1,18 +1,19 @@
 const fs = require('fs-extra');
 const path = require('path');
-const AWS = require('aws-sdk');
 const CAAWSCloudWatch = require('./ca-cloudwatch-api');
 const CAS3 = require('./ca-s3-api');
 const CASNS = require('./ca-sns-api');
 const CASQS = require('./ca-sqs-api');
-const CAAWSApiGateway = require('./ca-apigw-api');
+const KLAWSApiGateway = require('./kl-apigw-api');
+const KLIAM = require('./kl-iam-api');
 const CADynamoDb = require('./ca-dynamodb-api');
 const CAEvents = require('./ca-events-api');
 const AWSProfile = require('./aws-profile');
 const { openFileOnEditor } = require('../utils/editor');
 const { exp } = require('@kumologica/builder');
 const { build } = require('@kumologica/builder');
-
+const { CloudFormationClient } = require("@aws-sdk/client-cloudformation"); 
+//const { IoTJobsDataPlane } = require('aws-sdk');
 /** 
  * sample events:
  * https://docs.aws.amazon.com/lambda/latest/dg/lambda-services.html
@@ -21,32 +22,29 @@ class AWSDeployer {
   constructor(terminal) {
     this.term = terminal;
     this.awsProfile = new AWSProfile();
-
-    AWS.config.apiVersions = {
-      cloudformation: '2010-05-15',
-    };
   }
 
   async initAWS(profile) {
-    AWS.config.credentials = new AWS.SharedIniFileCredentials({profile: profile});
-    AWS.config.profile = profile;  // this is not AWS property
+    const { fromIni } = require("@aws-sdk/credential-providers"); 
+    const config = {
+      credentials: fromIni({profile: profile})
+    };
 
-    const region = await this.awsProfile.getRegion(profile);
-    AWS.config.update({region: region});
- 
+    this.region = await this.awsProfile.getRegion(profile);
+    
     this.cw = false;
 
-    this.apiGateway = new CAAWSApiGateway(this.log.bind(this));
-    this.dynamoDb = new CADynamoDb(this.log.bind(this));
-    this.cf = new AWS.CloudFormation();
-    this.s3 = new CAS3(this.log.bind(this));
-    this.sns = new CASNS(this.log.bind(this));
-    this.sqs = new CASQS(this.log.bind(this));
-    this.lambdaApi = new AWS.Lambda();
-    this.cwLogs = new CAAWSCloudWatch(this.logCloud.bind(this));
-    this.cwevents = new AWS.CloudWatchEvents();
-    this.cognito = new AWS.CognitoIdentityServiceProvider();
-    this.events = new CAEvents(this.log.bind(this));
+    this.apiGateway = new KLAWSApiGateway(config, this.log.bind(this));
+    this.iam = new KLIAM(config, this.log.bind(this));
+    this.dynamoDb = new CADynamoDb(config, this.log.bind(this));
+
+    this.cf = new CloudFormationClient(config);
+
+    this.s3 = new CAS3(config, this.log.bind(this));
+    this.sns = new CASNS(config, this.log.bind(this));
+    this.sqs = new CASQS(config, this.log.bind(this));
+    this.cwLogs = new CAAWSCloudWatch(config, this.logCloud.bind(this));
+    this.events = new CAEvents(config, this.log.bind(this));
   }
 
   chalk(c, t) {
@@ -158,10 +156,10 @@ class AWSDeployer {
     this.log(`  ${this.chalk('#F5DEB3', 'flow:')}              ${this.chalk('whiteBright', projectInfo.projectFlowName)}`, false);
     this.log(`  ${this.chalk('#F5DEB3', 'working directory:')} ${this.chalk('whiteBright', projectInfo.projectDir + "/deploy")}`, false);
     this.log(`  ${this.chalk('#F5DEB3', 'lambda parameters:')} ${this.chalk('whiteBright', JSON.stringify(params))}`, false);
-    this.log(`  ${this.chalk('#F5DEB3', 'AWS profile:')}       ${this.chalk('whiteBright', AWS.config.profile)}`, false);
+    this.log(`  ${this.chalk('#F5DEB3', 'AWS profile:')}       ${this.chalk('whiteBright', profile)}`, false);
     
     await this.initAWS(profile);
-    this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', AWS.config.region)}`, false);
+    this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', this.region)}`, false);
     this.log('', false);
 
     const settings = this.prepare(
@@ -177,6 +175,7 @@ class AWSDeployer {
         settings.flowName
       );
 
+      // calls builder
       await this.buildLambda(settings, projectInfo);
 
       const nodes = this.loadJsonFile(
@@ -185,6 +184,7 @@ class AWSDeployer {
 
       flowListeners = this.processFlow(nodes);
   
+      // calls exp cf
       const stackDetails = await this.executeStack(
         settings,
         params,
@@ -263,7 +263,7 @@ if (s.api && s.api.length > 0) {
       apiId = output.RestApiId || "unknown api gateway";
     }
 
-    let url = `https://${apiId}.execute-api.${AWS.config.region}.amazonaws.com/${stage}`;
+    let url = `https://${apiId}.execute-api.${this.region}.amazonaws.com/${stage}`;
     s.api.forEach(a => this.log(`  ${('    ' + a.verb.toUpperCase()).slice(-6)}  ${url}${a.url}`), this);
     this.log('');
   }
@@ -356,17 +356,6 @@ if (s.cwevents && s.cwevents.length > 0) {
     // api
     const apis = listener.filter(i => i.eventSource == 'api' && i.provider == 'aws')
                           .map(a => {return {url: a.apiUrl, verb: a.apiMethod}});
-  
-    // validate if aws nodes got explicit credentials only
-    /*const awsNodes = flow.filter(i => ['Rekognition', 'S3', 'SQS', 'Cloudwatch', 'Dynamo DB', 'SNS', 'SES', 'SSM'].includes(i.type));
-    if (awsNodes && awsNodes.length > 0) {
-      awsNodes.forEach(n => {
-        if (!n.securitytype || n.securitytype != 'Credentials') {
-          throw new Error (`AWS Node ${n.name} must have explicit credentials set. Open this node and choose Credentials option.`);
-        }
-      });
-    }*/
-  
     const dynamodb = listener.filter(i => i.eventSource == 'dynamodb')
                              .map(a => {return {stream: a.stream, startingPosition: a.startingPosition}});
     const s3 = listener.filter(i => i.eventSource == 's3')
@@ -510,14 +499,11 @@ if (s.cwevents && s.cwevents.length > 0) {
 
     try {
       this.log('Generating cloud formation script');
-      this.log(
-        `  ${this.chalk('#F5DEB3', 'AWS profile:')}       ${this.chalk('whiteBright', AWS.config.profile)}`,
-        false
-      );
+      this.log(`  ${this.chalk('#F5DEB3', 'AWS profile:')}       ${this.chalk('whiteBright', profile)}`, false);
 
       await this.initAWS(profile);
       
-      this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', AWS.config.region)}`, false);
+      this.log(`  ${this.chalk('#F5DEB3', 'AWS region:')}        ${this.chalk('whiteBright', this.region)}`, false);
       
       const settings = this.prepare(projectInfo.projectDir, projectInfo.projectFlowName, params.functionName, params.description);
       
@@ -527,7 +513,7 @@ if (s.cwevents && s.cwevents.length > 0) {
       
       // NEW 
       const args = this.mapParams(params); 
-      args.region =  AWS.config.region;
+      args.region =  this.region;
       args["bucket-name"] = settings.deploymentBucketName; 
       args["project-directory"] = projectInfo.projectDir;
 		  args["flow-file-name"] = projectInfo.projectFlowName;
@@ -535,6 +521,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}`);
 
@@ -565,7 +552,7 @@ if (s.cwevents && s.cwevents.length > 0) {
    */
   async executeStack(settings, params, deploymentStartTimestamp, nodes, projectInfo) {
     this.log(`Uploading zip file to bucket...`);
-    var body = fs.createReadStream(
+    const body = fs.createReadStream(
       path.join(settings.deployDir, settings.zipFileName)
     );
 
@@ -576,7 +563,7 @@ if (s.cwevents && s.cwevents.length > 0) {
     });
 
     const args = this.mapParams(params); 
-    args.region =  AWS.config.region;
+    args.region = this.region;
     args["bucket-name"] = settings.deploymentBucketName; 
     args["project-directory"] = projectInfo.projectDir;
     args["flow-file-name"] = projectInfo.projectFlowName;
@@ -596,34 +583,30 @@ if (s.cwevents && s.cwevents.length > 0) {
     this.log('Starting cloudformation stack...');
 
     let stack = {};
+    const client = this.cf;
     try {
-      stack = await this.cf.createStack(stackParams).promise();
+      const { CreateStackCommand, waitUntilStackCreateComplete, AlreadyExistsException } = require("@aws-sdk/client-cloudformation");
+      stack = await this.cf.send(new CreateStackCommand(stackParams));
+
       this.log('Waiting for stack create complete...');
-      await this.cf
-        .waitFor('stackCreateComplete', { StackName: stackParams.StackName })
-        .promise();
-      
-    } catch (error) {
-      
-      if (error.code == 'AlreadyExistsException') {
-        stack = await this.cf.updateStack(stackParams).promise();
-        this.log('Waiting for stack update complete...');
-
-        try {
-          await this.cf
-            .waitFor('stackUpdateComplete', {
-              StackName: stackParams.StackName,
-            })
-            .promise();
-        } catch (error) {
+
+      await waitUntilStackCreateComplete(
+        { client, maxWaitTime: 600 }, 
+        { StackName: stackParams.StackName })
       
-          await this.describeStackEvents(
-            stackParams.StackName,
-            deploymentStartTimestamp
-          );
-          throw Error(error);
-        }
-      } else {
+    } catch (AlreadyExistsException) {
+      const { UpdateStackCommand, waitUntilStackUpdateComplete } = require("@aws-sdk/client-cloudformation"); 
+      stack = await this.cf.send(new UpdateStackCommand(stackParams));
+
+      this.log('Waiting for stack update complete...');
+
+      try {
+        await waitUntilStackUpdateComplete(
+          { client, maxWaitTime: 600 }, 
+          { StackName: stackParams.StackName })
+        
+      } catch (error) {
+    
         await this.describeStackEvents(
           stackParams.StackName,
           deploymentStartTimestamp
@@ -636,7 +619,8 @@ if (s.cwevents && s.cwevents.length > 0) {
   }
 
   async describeStack(stackName) {
-    return this.cf.describeStacks({ StackName: stackName }).promise();
+    const { DescribeStacksCommand } = require("@aws-sdk/client-cloudformation"); 
+    return await this.cf.send(new DescribeStacksCommand({ StackName: stackName }));
   }
 
   /*
@@ -647,9 +631,9 @@ if (s.cwevents && s.cwevents.length > 0) {
     let events;
 
     try {
-      events = await this.cf
-      .describeStackEvents({ StackName: stackName })
-      .promise();
+      const { DescribeStackEventsCommand } = require("@aws-sdk/client-cloudformation"); 
+
+      events = await this.cf.send(new DescribeStackEventsCommand({ StackName: stackName }));
     } catch (error) {
       //this.log(`de: ${error}`);
       // may throw stack does not exists for the first ever call
@@ -659,9 +643,11 @@ if (s.cwevents && s.cwevents.length > 0) {
       return;
     }
 
-    var deploymentEvents = events.StackEvents.filter(
-      (event) => event.Timestamp > deploymentStartTimestamp
-    ).sort((a, b) => a.Timestamp - b.Timestamp);
+    var deploymentEvents = 
+      events.StackEvents
+        .filter((event) => event.Timestamp > deploymentStartTimestamp)
+        .sort((a, b) => a.Timestamp - b.Timestamp);
+    
     if (deploymentEvents == undefined || deploymentEvents.length == 0) {
       return;
     }
@@ -694,24 +680,26 @@ if (s.cwevents && s.cwevents.length > 0) {
     return JSON.parse(fs.readFileSync(flowFileName));
   }
 
-  createFile(baseDir, fileName, content) {
-    fs.outputFileSync(path.join(baseDir, fileName), content, 'utf-8');
-  }
-
-  async listServices(type, profile) {
+  async listServices(type, profile, id) {
     if (!profile) {
       throw new Error(
         `AWS profile has not been provided, unable to return list of ${type}. Select correct profile from list.`
       );
     }
 
-    await this.initAWS(profile);
+   await this.initAWS(profile);
     
     let res = null;
     switch (type) {
       case 'api':
         res = await this.apiGateway.getApiGateways();
         break;
+      case 'api-resources':
+        res = await this.apiGateway.getResources(id);
+        break;
+      case 'api-stages':
+        res = await this.apiGateway.getStages(id);
+        break;
       case 's3':
         res = await this.s3.getBuckets();
         break;
@@ -724,9 +712,6 @@ if (s.cwevents && s.cwevents.length > 0) {
       case 'dynamodb':
         res = await this.dynamoDb.listStreams();
         break;
-      case 'cwlogs':
-        res = await this.cwLogs.listLogGroups();
-        break;
       case 'alb':
         res = await this.elb.listElbs();
         break;

package/src/app/lib/aws/kl-apigw-api.js

@@ -0,0 +1,40 @@
+const jp = require('jsonpath');
+
+class KLAWSApiGateway {
+
+  constructor(config, log) {
+    this.log = log; 
+    this.triggerStage = "";
+
+    const { APIGatewayClient } = require("@aws-sdk/client-api-gateway"); 
+    this.apigateway = new APIGatewayClient(config);
+  }
+  
+  async getResources(apiId) {
+    const { GetResourcesCommand } = require("@aws-sdk/client-api-gateway"); 
+    const res = this.apigateway.send(new GetResourcesCommand({ restApiId: apiId }));
+
+    return res.items.map(v => {
+      return {id: v.id, path: v.path, parentId: v.parentId}
+    });
+  }
+
+  async getStages(apiId) {
+    const { GetStagesCommand } = require("@aws-sdk/client-api-gateway"); 
+    const st = this.apigateway.send(new GetStagesCommand({ restApiId: apiId }));
+    return st.items.map(v => {
+      return {id: v.deploymentId, name: v.stageName}
+    });
+  }
+
+  async getApiGateways() {
+    const { GetRestApisCommand } = require("@aws-sdk/client-api-gateway"); 
+    const api = await this.apigateway.send(new GetRestApisCommand({}));
+    
+    return api.items.map(v => {
+      return {id: v.id, name: v.name, arn: `arn-ccc`}
+    });
+  }
+}
+
+module.exports = KLAWSApiGateway;

package/src/app/lib/aws/kl-iam-api.js

@@ -1,14 +1,13 @@
-const AWS = require('aws-sdk');
-
 /*
  * AWS JS API:
  * https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/SNS.html
  */
 class KLIAM {
   
-  constructor(log) {
+  constructor(config, log) {
     this.log = log; 
-    this.iam = new AWS.IAM();
+    const { IAMClient } = require("@aws-sdk/client-iam"); 
+    this.iam = new IAMClient(config);
   }
   
   /**
@@ -16,7 +15,8 @@ class KLIAM {
    */
   async listRoles() {
    
-    const response = await this.iam.listRoles({}).promise();
+    const { ListRolesCommand } = require("@aws-sdk/client-iam"); 
+    const response = await this.iam.send(new ListRolesCommand({}));
     
     return response.Roles.map(function(r) {
       return {id: r.Arn, name: r.RoleName, arn: r.Arn};

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

@@ -1,5 +1,4 @@
 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');
@@ -9,28 +8,12 @@ class GithubDeployer {
     this.term = terminal;
     this.awsProfile = new AWSProfile();
 
-    AWS.config.apiVersions = {
-      cloudformation: '2010-05-15',
-    };
   }
 
   async initAWS(profile) {
-    AWS.config.credentials = new AWS.SharedIniFileCredentials({profile: profile});
     
     const r = await this.awsProfile.getRegion(profile);
-    let s3 = new AWS.S3();
     let bucketName = "CHANGE_IT_TO_REAL_BUCKET_NAME";
-
-    // find bucket
-    const buckets = await s3.listBuckets({}).promise();
-    
-    if (buckets && buckets.Buckets) {
-      const bucket = buckets.Buckets.find(b => b.Name.startsWith('kumologica-designer-deploy'));
-      if (bucket) {
-        bucketName = bucket.Name;
-      }
-    }
-
     return {region: r, bucket: bucketName};
   }
 
@@ -74,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/lib/stores/settings-cloud-store.js

@@ -52,7 +52,6 @@ class CloudConfigStore {
             fsx.ensureDirSync(path.join(homedir, credsDir));
             fs.writeFileSync(this.cloudConfigFileFullPath, defaultContent);
         } 
-        
     }
 
     parseCloudConfigFile() {
@@ -81,6 +80,10 @@ class CloudConfigStore {
         return this.getAliases('kumohub') || [];
     }
 
+    getKumologicaDevAliases() {
+        return this.getAliases('kumologica.dev') || [];
+    }
+
     getAWSAliases() {
         return this.getAliases('aws') || [];
      }
@@ -89,13 +92,18 @@ class CloudConfigStore {
         return this.getAliases('azure') || [];
      }
   
-    getKumohubAliasInfo(alias){
+     getKumohubAliasInfo(alias){
         return this.getAliasInfo('kumohub', alias);
     }
 
+    getKumologicaDevAliasInfo(alias){
+        return this.getAliasInfo('kumologica.dev', alias);
+    }
+
     getAWSAliasInfo(alias){
         return this.getAliasInfo('aws', alias);
     }
+
     getAzureAliasInfo(alias){
         return this.getAliasInfo('azure', alias);
     }
@@ -104,9 +112,34 @@ class CloudConfigStore {
         return this.cloudConfigFileFullPath;
     }
 
+    saveKumologicaDevAlias(tokens) {
+        let lines = this.readCloudConfigFile().split(/\n/).map(l=> l.trim());
+       
+        // find [kumologica.dev]
+        const d = lines.indexOf("[kumologica.dev]");
+       
+        if (d != -1) {
+            // if found then delete lines until next [ or the end
+            //ignore first [ it belongs to kumologica.dev
+            for (let i = d; i<lines.length; ) { // splice works like i++
+                if (lines[i].trim().startsWith("[") && i > d) { 
+                    break;
+                }
+                lines.splice(i, 1);
+            }
+        }
+
+        // add [kumologica.dev]
+        lines.push("[kumologica.dev]");
+        tokens.forEach(t => lines.push(t));
+
+        this.writeCloudConfigFile(lines.join('\n')); 
+    }
+
     writeCloudConfigFile(content){
         fs.writeFileSync(this.cloudConfigFileFullPath, content);
     }
+
     readCloudConfigFile(){
         const data = fs.readFileSync(this.cloudConfigFileFullPath, "utf-8");
         const lines = data.split(/\r\n|\n/);