Merge pull request #26 from antstackio/dev

Dev

Author: DheerajGBhatt

bin/index.ts

@@ -25,7 +25,7 @@ async function run(argv:AnyObject) {
       let stack_names: any = {};
       let customStacks: any = {};
       let paramModule:AnyObject={};
-      var basecrud:AnyObject={} ;
+      let basecrud:AnyObject={} ;
       let StackParams: any = {};
       let moreStack: any; 
       let stackname:object= {};
@@ -40,12 +40,6 @@ async function run(argv:AnyObject) {
         if (AppType !== "Customizable") {
           stackname[`stackName${i}`]=util.makeid(2)
           let stack_name = stackname
-          // let stack_name = await util.inputString(
-          //   `stackName${i}`,
-          //   `Stack ${i} Name: `,
-          //   ""
-          // );
-          //console.log(stack_name)
           let stackName:string = stack_name[`stackName${i}`];
           if (AppType === "CRUD") {
             let crud:AnyObject={} ;
@@ -63,7 +57,6 @@ async function run(argv:AnyObject) {
               );
             } while (moreStack !== "No");
 
-           //console.log("obj",obj)
             StackParams = { ...obj };
           } else {
             paramModule = await util.params(AppType);
@@ -91,15 +84,15 @@ async function run(argv:AnyObject) {
         if (stack_names !== null ) template = { ...template, Stacks: stack_names ,StackParams};
         if (customStacks !== null)
           template = { ...template, CustomStacks: customStacks };
-         // console.log(JSON.stringify(template))
+        
           await rover_utilities.generationSAM(({template})["template"]);
       };
-      //await rover_utilities.generationSAM(input);
+      
     } else if (editedSam === "add components to existing SAM") {
 
       let app_name = await util.inputString("app_name", "App Name","");
       await rover_utilities.checkFile(app_name["app_name"],"yes")
-      //console.log(app_name)
+     
       let language = await util.languageChoice();
       let file_name = await exec("ls " + app_name["app_name"] + "/" + "*.yaml ").toString();
       let CompStacks = await rover_utilities.checkNested(file_name);
@@ -144,7 +137,7 @@ async function run(argv:AnyObject) {
         }
 
       } while (moreStack !== "No"|| choiceLength===0)
-      //console.log(JSON.stringify(template, null, 2));
+      
       await rover_utilities.addComponents(template)
     }else if (editedSam === "add modules to existing SAM") {
       console.log("Work in progress...");
@@ -162,7 +155,7 @@ async function run(argv:AnyObject) {
         template = { ...template, repoConfig };
         let repoconfig = await Promise.resolve(util.jsonCreation(template));
         if (repoconfig !== undefined) {
-          //await rover_utilities.checkFile(JSON.parse(repoconfig)["repoConfig"]["app_name"],"yes")
+          
           await deployment.setupRepo(JSON.parse(repoconfig)["repoConfig"]);
         }
       }
@@ -181,7 +174,7 @@ async function run(argv:AnyObject) {
         }
         if (stack_name["stack_name"]=="") {stack_name=file_name+"roverTest"}else{stack_name=stack_name["stack_name"]}
         let region=deploymentregion["Deployment region"]
-        // console.log(typeof stack_name,stack_name)
+       
         exec("sh " + rover_utilities.npmroot +"/@rover-tools/cli/cli-main/exec.sh "+file_name+" "+stack_name+" "+region+" "+bucketName);
 
       }
@@ -200,7 +193,7 @@ async function run(argv:AnyObject) {
 
 }
 }
-//export let resource_type = ({} = res);
+
 export let stackNames: any = stack_resource_Name;
 let moreStack;
 let customStacks:AnyObject;

cli-main/buildConfig.ts

@@ -36,12 +36,10 @@ export let samConfig = {
     samBuild: [
 
 
-   // { key: "name", value: "string" ,message:"Name:"},
-  //{ key: "app_name", value: "string",message:"App Name:" },
+
     { key: "repoType", value: "choice",message:"Repo Type:" },
     { key: "tool", value: "choice",message:"Tools:" },
-    //{ key: "language", value: "choice",message:"Language:" },
-    //{ key: "framework", value: "choice",message:"Framework:" },
+
 
     ]
   }

cli-main/util.ts

@@ -3,17 +3,15 @@ import * as init from "../bin/index";
 import * as inquirer from "inquirer";
 import * as cliConfig from "./cliConfig";
 import * as buildConfig from "./buildConfig";
-var fs = require("fs");
+let fs = require("fs");
 let Yaml = require("js-yaml");
 const exec = require("child_process").execSync;
-var path = require('path');
 const moduleParams = require("@rover-tools/engine").rover_modules;
 const Stack = require("@rover-tools/engine").rover_modules;
 import * as awsConfig from "./configaws";
 import { AnyArray, AnyObject } from "immer/dist/internal";
 const rover_utilities=  require("@rover-tools/engine").rover_utilities;
 const TOML = require('@iarna/toml')
-let config = {};
 let pythonpattern=new RegExp(/python[1-9]*\.[1-9]*/g)
 let jspattern=new RegExp(/nodejs[1-9]*\.[a-zA-Z]*/g)
 let yamlpattern=new RegExp(/(\.yaml$)/g)
@@ -59,7 +57,7 @@ export let inputString = async function (userName: string, message = "",defaults
       message: message,
       validate: function (value) {
         if (userName=="path"){
-        var pass = apipathpattern.test(value)
+        let pass = apipathpattern.test(value)
         if (pass) {
           return true
         }
@@ -133,21 +131,16 @@ export let inputNumber = async function (userName: string,message:string) {
       message: `Please enter the required number of ${displayname} you want ?`,
       name: `${userName}`,
       validate: function (value) {
-        var pass = !isNaN(value)
+        let pass = !isNaN(value)
         if (pass) {
           return true
         }
         return 'Please enter a valid number'
-        // if (isNaN(value)) {
-        //   return "Please enter valid number"
-        //   // return inputNumber(userName,message)
-        // } else {
-        //   return true;
-        // }
+       
       },
     },
   ])
- // console.log(takeInput)
+ 
   return parseInt(takeInput[`${userName}`],10);
 };
 
@@ -304,7 +297,7 @@ export let inputCli = async function (
           let FnGetAtt: any = [];
           FnGetAtt.push(r["Fn::GetAtt"]);
           FnGetAtt.push("Arn");
-          temp = { FnGetAtt }; //"Fn::GetAtt": ["PostSignup","Arn"]
+          temp = { FnGetAtt }; 
         } else if (p === "Ref") {
           temp = { ...r };
         } else {
@@ -432,7 +425,7 @@ Object.assign(temp,ele)
     deploymentparameters,
     ...deploymentEvent,
   };
-  //console.log(JSON.stringify(result, null, 2));
+  
   return result;
 };
 
@@ -561,5 +554,5 @@ export let samValidate=function(){
 }
 export let makeid =function (length) {
   const crypto = require('crypto');
-  return (crypto.randomBytes(1).toString("base64url").replace(/[0-9]/g, 'd')).toLowerCase();
+  return (crypto.randomBytes(1).toString("base64url").replace(/\d/g, 'd')).toLowerCase();
 }