Merge pull request #43 from antstackio/dev

feature : add profile in cli deployment

Author: DheerajGBhatt

bin/index.ts

@@ -14,8 +14,94 @@ let res: any = [];
 let resources: any = [];
 let stack_resource_Name: any = [];
 let AppType;
-let template = {};
+let template:AnyObject = {};
 let config;
+let testdata={
+  "app_name": "teststruct",
+  "language": "node",
+  "Stacks": {
+    "BaseModuleRlbao": "BaseModule",
+    "BaseModuleKogle": "BaseModule",
+    "EmailAuthModulePsaih": "EmailAuthModule",
+    "EmailAuthModuleWjzvl": "EmailAuthModule",
+    "RDSModuleLzxxx": "RDSModule",
+    "RDSModuleCnxwn": "RDSModule",
+    "CRUDModuleVuayw": "CRUDModule",
+    "CRUDModuleWwaex": "CRUDModule"
+  },
+  "StackParams": {
+    "BaseModuleRlbao": {},
+    "BaseModuleKogle": {},
+    "EmailAuthModulePsaih": {},
+    "EmailAuthModuleWjzvl": {},
+    "RDSModuleLzxxx": {},
+    "RDSModuleCnxwn": {},
+    "CRUDModuleVuayw": {
+      "Book": {
+        "path": "/book",
+        "methods": [
+          "put",
+          "get",
+          "post",
+          "delete",
+          "options"
+        ],
+        "resourcetype": "lambda"
+      },
+      "Author": {
+        "path": "/author",
+        "methods": [
+          "put",
+          "get",
+          "post",
+          "delete",
+          "options"
+        ],
+        "resourcetype": "lambda"
+      }
+    },
+    "CRUDModuleWwaex": {
+      "Book": {
+        "path": "/Book",
+        "methods": [
+          "put",
+          "get",
+          "post",
+          "delete",
+          "options"
+        ],
+        "resourcetype": "lambda"
+      },
+      "Author": {
+        "path": "/author",
+        "methods": [
+          "put",
+          "get",
+          "post",
+          "delete",
+          "options"
+        ],
+        "resourcetype": "lambda"
+      }
+    }
+  },
+  "CustomStacks": {
+    "custom": [
+      "S3 Lambda",
+      "CRUD API",
+      "S3 Bucket",
+      "Lambda",
+      "DynamoDB"
+    ],
+    "custo": [
+      "S3 Lambda",
+      "CRUD API",
+      "S3 Bucket",
+      "Lambda",
+      "DynamoDB"
+    ]
+  }
+}
 async function roverADD() { 
         let app_name = await util.inputString("app_name", "", false, "App Name");
         await rover_utilities.samValidate(app_name["app_name"]);
@@ -25,7 +111,7 @@ async function roverADD() {
         let CompStacks = await rover_utilities.checkNested(file_name);
         return { "appname": app_name, "language": language, "filename": file_name,"compstack":CompStacks }
 }
-async function CRUDObject(stackName,AppType) {
+async function CRUDObject(stackName:string,AppType:string) {
     let crud: AnyObject = {};
     let StackParams: AnyObject = {};
     let paramModule: AnyObject = {};
@@ -46,37 +132,37 @@ async function CRUDObject(stackName,AppType) {
 
     return StackParams
 } 
-async function CustomObject(i) { 
+async function CustomObject(i:number) { 
   let customStacks: any = {};
   let choice = cliConfig.customizable.components;
   let customstack_name = await util.inputString(`customStackName${i}`,"",false,`Stack ${i} Name: `);
   let CustomStacks = await util.multichoice("app_type", choice);
   customStacks[customstack_name[`customStackName${i}`]] = CustomStacks.app_type;
   return customStacks
 } 
-async function createModules(app_name,language) {
+async function createModules(app_name:AnyObject,language:string) {
             let stack_names: any = {};
             let customStacks: any = {};
             let paramModule: AnyObject = {};
             let basecrud: AnyObject = {};
             let StackParams: any = {};
             let moreStack: any;
-            let stackname: object = {};
+            let stackname: AnyObject = {};
             let i = 1;
             let obj: AnyObject = {};
             do {
               let app_Types: any = [];
               let AppType: string = await util.appType("Module Type :");
-              if (AppType !== "Customizable") {
-                  stackname[`stackName${i}`] ="rover" + rover_utilities.makeid(5);
+              if (AppType !== "CustomizableModule") {
+                  stackname[`stackName${i}`] =AppType+rover_utilities.makeid(5);
                   let stack_name = stackname;
                   let stackName: string = stack_name[`stackName${i}`];
-                  if (AppType === "CRUD") {
+                  if (AppType === "CRUDModule") {
                     StackParams = { ...StackParams,... await CRUDObject(stackName,AppType)}; 
                   } else {
 
                     obj[stackName] = basecrud;
-                    StackParams = { ...obj };
+                    StackParams = { ...obj ,...StackParams};
                   }
                   stack_names[stack_name[`stackName${i}`]] = AppType;
               } else {
@@ -96,7 +182,13 @@ async function createModules(app_name,language) {
               return template
 
 }
+async function listProfiles() {
+  let profiles = (exec("aws configure list-profiles").toString()).split("\n")
+  if (profiles[profiles.length - 1] == "") profiles.splice(profiles.length - 1, 1)
+  return profiles
+}
 async function run(argv: AnyObject) {
+ //rover_utilities.generateSAM(testdata);
   try {
     if (rover_utilities.npmrootTest()) {
       const commandError = `rover ${argv.join(
@@ -106,7 +198,7 @@ async function run(argv: AnyObject) {
         if (argv.length === 1 && argv[0] === "init") {
           let editedSam = await util.confirmation();
           if (editedSam === "create new SAM project") {
-            let app_name: object = await util.inputString(
+            let app_name: AnyObject = await util.inputString(
               "app_name",
               "",
               false,
@@ -115,8 +207,9 @@ async function run(argv: AnyObject) {
             await rover_utilities.checkFile(app_name["app_name"], "no");
             let language = await util.languageChoice();
 
-            template= await createModules(app_name,language)
-             await rover_utilities.generateSAM({ template }["template"]);
+            template = await createModules(app_name, language)
+            console.log(JSON.stringify(template))
+             //await rover_utilities.generateSAM({ template }["template"]);
 
           } else if (editedSam === "add components to existing SAM") {
 
@@ -184,20 +277,23 @@ async function run(argv: AnyObject) {
           if (r === "repository and pipeline") {
             console.log("Work in progress...");
           } else if (r === "generate pipeline") {
-            await rover_utilities.samValidate(undefined);
+            await rover_utilities.samValidate("");
             let lang: string = await rover_utilities.langValue();
             let pipeline = await util.samBuild(lang);
             let repoConfig = { ...pipeline };
             template = { ...template, repoConfig };
             let repoconfig = await Promise.resolve(util.jsonCreation(template));
             if (repoconfig !== undefined) {
+              
               await deployment.setupRepo(JSON.parse(repoconfig)["repoConfig"]);
+              rover_utilities.generateRoverConfig("",JSON.parse(repoconfig)["repoConfig"],"rover_generate_pipeline")
             }
           } else {
-            await rover_utilities.samValidate(undefined);
+            await rover_utilities.samValidate("");
             if (fs.existsSync("samconfig.toml")) {
               exec("rm -rf samconfig.toml");
             }
+            let profiles=await listProfiles()
             let filenamearray = exec("pwd").toString().split("/");
             let file_name = filenamearray[filenamearray.length - 1].replace(
               "\n",
@@ -216,6 +312,8 @@ async function run(argv: AnyObject) {
               "Bucket Name(optional) :"
             );
             let choice = buildConfig.samConfig.choices.deploymentregion;
+            let profile = (await util.inputType("AWS profile", profiles))["AWS profile"]
+            console.log(profile)
             let deploymentregion = await util.inputType(
               "Deployment region",
               choice
@@ -232,18 +330,14 @@ async function run(argv: AnyObject) {
             }
             let region = deploymentregion["Deployment region"];
 
-            exec(
-              "sh " +
-                rover_config.npmroot +
-                "/@rover-tools/cli/cli-main/exec.sh " +
-                file_name +
-                " " +
-                stack_name +
-                " " +
-                region +
-                " " +
-                bucketName
-            );
+            exec("sh " + rover_config.npmroot + "/@rover-tools/cli/cli-main/exec.sh " + file_name + " " + stack_name + " " + region + " " + bucketName + " "+profile);
+            
+            let configdata:AnyObject = {}
+            configdata["bucket"] = bucketName
+            configdata["stack name"] = stack_name
+            configdata["region"] = region
+            configdata["profile"] = profile
+            rover_utilities.generateRoverConfig("",configdata,"rover_deploy_cli")
           }
         } else if (argv[0] === "-v" || argv[0] === "--version") {
           // show current package version in the console
@@ -260,7 +354,7 @@ async function run(argv: AnyObject) {
       );
     }
   } catch (error) {
-    console.log("Error: ", error.message);
+    console.log("Error: ", error);
   }
 }
 export let stackNames: any = stack_resource_Name;

cli-main/cliConfig.ts

@@ -1,3 +1,4 @@
+import { AnyArray, AnyObject } from "immer/dist/internal";
 
 const rovercomponents = require("@rover-tools/engine").rover_components;
 const Stack = require("@rover-tools/engine").rover_modules;
@@ -13,13 +14,13 @@ export let LanguageSupport = {
     extension: ".py",
   },
 };
-let keys = []
-let values=[]
-  Stack.ModuleDescription.filter(ele => {
+let keys:AnyArray = []
+let values:AnyArray=[]
+  Stack.ModuleDescription.filter(function(ele:AnyObject) {
     keys.push(ele["key"])
      values.push(ele["value"])
    })
-export let app =
+export let app:AnyObject =
 {
   choices:{
     methods:["put","get","post","delete"],

cli-main/exec.sh

@@ -1,2 +1,2 @@
 sam build
-sam deploy --no-confirm-changeset --capabilities CAPABILITY_NAMED_IAM CAPABILITY_IAM CAPABILITY_AUTO_EXPAND --stack-name $2 --region $3 $4
+sam deploy --no-confirm-changeset --capabilities CAPABILITY_NAMED_IAM CAPABILITY_IAM CAPABILITY_AUTO_EXPAND --stack-name $2 --region $3 --profile $5  $4

cli-main/util.ts

@@ -246,38 +246,38 @@ export let inputCli = async function (
       res[`${sobj.key}`] = objListArr;
     } else if (sobj.value === "multipleChoice") {
       if (sobj.key === "Action") {
-        let choice = init.stackNames.map(({ key, value }) => value);
-        choice = choice.filter((item, pos) => choice.indexOf(item) == pos);
+        let choice = init.stackNames.map(({ key, value }:AnyObject) => value);
+        choice = choice.filter((item:string, pos:number) => choice.indexOf(item) == pos);
         let p = await inputType(sobj.key, choice,sobj.message);
         choice = obj.choices[p];
 
         let r = await multichoice(p, choice);
 
-        let actionArr = r[p].map((ele) => `${p}:${ele}`);
+        let actionArr = r[p].map((ele:string) => `${p}:${ele}`);
         res = { Action: actionArr };
       } else {
         let choice = obj.choices[sobj.key];
         let r = await multichoice(sobj.key, choice,);
         res = { ...res, ...r };
       }
     } else if (sobj.value === "choiceReference") {
-      let choice = init.stackNames.map(({ key, value }) => value);
-      choice = choice.filter((item, pos) => choice.indexOf(item) == pos);
+      let choice = init.stackNames.map(({ key, value }:AnyObject) => value);
+      choice = choice.filter((item:AnyObject, pos:number) => choice.indexOf(item) == pos);
       if (
         (sobj.key === "resource" || sobj.key === "Ref") &&
         choice.length > 0
       ) {
         let p = await inputType(sobj.key, choice);
         let choiceNames = init.stackNames
-          .filter(({ key, value }) => value === p)
-          .map(({ key, value }) => key);
+          .filter(({ key, value }:AnyObject) => value === p)
+          .map(({ key, value }:AnyObject) => key);
         let r = await inputType(p, choiceNames);
 
         res[`${sobj.key}`] = r;
       } else if (sobj.key === "role" && choice.indexOf("iamrole") !== -1) {
         let choiceNames = init.stackNames
-          .filter(({ key, value }) => value === "iamrole")
-          .map(({ key, value }) => key);
+          .filter(({ key, value }:AnyObject) => value === "iamrole")
+          .map(({ key, value }:AnyObject) => key);
         res[sobj.key] = choiceNames[0];
       } else {
         let name = await inputString("name","",false, `${sobj.message}-->Name`);
@@ -346,11 +346,11 @@ export let password = async function(userName:string,message:string=""){
   return r;
 }
 
-export let samBuild = async function (lang) {
+export let samBuild = async function (lang:string) {
   let obj = buildConfig.samConfig;
   let subObj = buildConfig.samConfig.samBuild;
-  let sam:object = await inputCli(obj, subObj, "");
-  let temp:object={}
+  let sam:AnyObject = await inputCli(obj, subObj, "");
+  let temp:AnyObject={}
   Object.values(sam).map(ele=>{
 Object.assign(temp,ele)
   })
@@ -370,7 +370,7 @@ Object.assign(temp,ele)
     envs.push(envName);
     let stepsChoice = buildConfig.samConfig.choices.dev;
     let step = await multichoice("steps required for "+`${envName}`+" environment " , stepsChoice);
-    let steps1:object={}
+    let steps1:AnyObject={}
     step=Object.keys(step).map(ele=>{
       let name:string=ele.replace("steps required for ","")
       name=name.replace(" environment ","")
@@ -459,8 +459,8 @@ export let params = async function(module:string){
   let choice:AnyObject = cliConfig.app.choices;
   let name:AnyObject ={};
   let res:AnyObject ={};
-if(module==="CRUD"){
-  let modulesParams= moduleParams.ModuleParams.CRUD.params;
+if(module==="CRUDModule"){
+  let modulesParams= moduleParams.ModuleParams.CRUDModule.params;
   let paramslength = modulesParams.length;
 
   if(paramslength>0){