Skip to content

Commit c9e240b

Browse files
committed
moved the parameter with default value to last in inputstring function
1 parent 3caaac2 commit c9e240b

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

bin/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async function run(argv:AnyObject) {
1919
if (argv[0] === "init") {
2020
let editedSam = await util.confirmation();
2121
if (editedSam === "create new SAM project") {
22-
let app_name:object = await util.inputString("app_name", "App Name:","");
22+
let app_name:object = await util.inputString("app_name","", "App Name:");
2323
await rover_utilities.checkFile(app_name["app_name"],"no")
2424
let language = await util.languageChoice();
2525
let stack_names: any = {};
@@ -70,8 +70,8 @@ async function run(argv:AnyObject) {
7070
let choice = cliConfig.customizable.choice;
7171
let customstack_name = await util.inputString(
7272
`customStackName${i}`,
73-
`Stack ${i} Name: `,
74-
""
73+
"",
74+
`Stack ${i} Name: `
7575
);
7676
let CustomStacks = await util.multichoice("app_type", choice);
7777
customStacks[customstack_name[`customStackName${i}`]] =
@@ -86,11 +86,11 @@ async function run(argv:AnyObject) {
8686
template = { ...template, CustomStacks: customStacks };
8787

8888
await rover_utilities.generationSAM(({template})["template"]);
89-
};
89+
}
9090

9191
} else if (editedSam === "add components to existing SAM") {
9292

93-
let app_name = await util.inputString("app_name", "App Name","");
93+
let app_name = await util.inputString("app_name","", "App Name");
9494
await rover_utilities.checkFile(app_name["app_name"],"yes")
9595

9696
let language = await util.languageChoice();
@@ -163,8 +163,8 @@ async function run(argv:AnyObject) {
163163
await util.samValidate()
164164
let filenamearray=(exec("pwd").toString()).split("/")
165165
let file_name = filenamearray[filenamearray.length-1].replace("\n","");
166-
let stack_name = await util.inputString("stack_name","Stack Name(optional) :","")
167-
let bucketName = await util.inputString("name","Bucket Name(optional) :","");
166+
let stack_name = await util.inputString("stack_name","","Stack Name(optional) :")
167+
let bucketName = await util.inputString("name","","Bucket Name(optional) :");
168168
let choice = buildConfig.samConfig.choices.deploymentregion;
169169
let deploymentregion = await util.inputType("Deployment region",choice);
170170
if (bucketName["name"]=="") {

cli-main/configaws.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

cli-main/util.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let Yaml = require("js-yaml");
88
const exec = require("child_process").execSync;
99
const moduleParams = require("@rover-tools/engine").rover_modules;
1010
const Stack = require("@rover-tools/engine").rover_modules;
11-
import * as awsConfig from "./configaws";
1211
import { AnyArray, AnyObject } from "immer/dist/internal";
1312
const rover_utilities= require("@rover-tools/engine").rover_utilities;
1413
const TOML = require('@iarna/toml')
@@ -49,7 +48,7 @@ export let jsonCreation = async function (obj:any) {
4948
}
5049
};
5150

52-
export let inputString = async function (userName: string, message = "",defaults:string) {
51+
export let inputString = async function (userName: string,defaults:string, message = "") {
5352
let takeInput = await inquirer.prompt([
5453
{
5554
type: "input",
@@ -272,7 +271,7 @@ export let inputCli = async function (
272271
.map(({ key, value }) => key);
273272
res[subObj[i].key] = choiceNames[0];
274273
} else {
275-
let name = await inputString("name", `${subObj[i].message}-->Name`,"");
274+
let name = await inputString("name","", `${subObj[i].message}-->Name`);
276275
let stack_names = await inputType("stack_resource", "resource",subObj[i].message);
277276

278277
let temp = name;
@@ -368,7 +367,7 @@ Object.assign(temp,ele)
368367
let deployementbuckets: any = {};
369368
let depBucketNames: any = {};
370369
for (let i = 1; i <= no_of_env; i++) {
371-
let env = await inputString(`env${i}`,`Envrionment ${i} :`,"");
370+
let env = await inputString(`env${i}`,"",`Envrionment ${i} :`);
372371
let envName = env[`env${i}`];
373372
envs.push(envName);
374373
let stepsChoice = buildConfig.samConfig.choices.dev;
@@ -382,17 +381,20 @@ Object.assign(temp,ele)
382381

383382
let stackname = await inputString(
384383
`${envName}`,
385-
`Stack Name(optional) --> ${envName} :`,""
384+
"",
385+
`Stack Name(optional) --> ${envName} :`
386386
);
387387
let deploymentbucket = await inputString(
388388
`${envName}`,
389-
`Deployment Bucket(optional) --> ${envName} :`,""
389+
"",
390+
`Deployment Bucket(optional) --> ${envName} :`
390391
);
391392
let regionChoice = buildConfig.samConfig.choices.deploymentregion;
392393
let deployment_region = await inputType(`${envName}`, regionChoice,"Deployment Region");
393394
let deployment_parameter = await inputString(
394395
`${envName}`,
395-
`Deployment Parameter(optional) --> ${envName} :`,""
396+
"",
397+
`Deployment Parameter(optional) --> ${envName} :`
396398
);
397399
steps = { ...steps,...steps1 };
398400
stacknames = { ...stacknames, ...stackname };
@@ -476,11 +478,11 @@ if(module==="CRUD"){
476478
}else{
477479

478480
if(modulesParams[i].key==="name"){
479-
let r = await inputString("name",modulesParams[i].message,"");
481+
let r = await inputString("name","",modulesParams[i].message);
480482
name = r;
481483

482484
}else{
483-
let r = await inputString(modulesParams[i].key,modulesParams[i].message,"")
485+
let r = await inputString(modulesParams[i].key,"",modulesParams[i].message)
484486
res = { ...res, ...r };
485487
}
486488

0 commit comments

Comments
 (0)