Skip to content

Commit 901e8cb

Browse files
committed
fix: changing variable names to camelCase
1 parent 9f09a3e commit 901e8cb

File tree

6 files changed

+44
-69
lines changed

6 files changed

+44
-69
lines changed

bin/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as rover from "@rover-tools/engine/dist/bin/index"
2-
const rover_helpers = rover.helpers
2+
const roverHelpers = rover.helpers
33
import {
44
createSAMCLI,
55
addComponentCLI,
@@ -14,7 +14,7 @@ import { version } from "../package.json"
1414

1515
async function run(argv: Array<string>): Promise<void> {
1616
try {
17-
if (!rover_helpers.npmrootTest()) {
17+
if (!roverHelpers.npmrootTest()) {
1818
throw new Error(cliConfig.globalError)
1919
}
2020
const commandErrors = cliConfig.commandError(argv)

src/configs/cliConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Iroverdescription } from "../rover.types"
22
import * as rover from "@rover-tools/engine/dist/bin/index"
3-
const rovercomponents = rover.components
3+
const roverComponents = rover.components
44
const Stack = rover.modules
55
export const globalError =
66
"Note: install @rover-tools/cli globally (install @rover-tools/cli -g)"
@@ -47,7 +47,7 @@ export const app: Record<
4747
},
4848
}
4949
export const customizable = {
50-
components: Object.keys(rovercomponents.Components),
50+
components: Object.keys(roverComponents.Components),
5151
modules: {
5252
keys: keys,
5353
values: values,

src/roverCLI/roverDeployCLI.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as rover from "@rover-tools/engine/dist/bin/index"
2-
const rover_helpers = rover.helpers
2+
const roverHelpers = rover.helpers
33
import * as util from "../utilities/cliUtil"
44
const deployment = rover.deployment
55
import * as fs from "fs"
@@ -14,23 +14,23 @@ export async function deployCLI() {
1414
if (r === "repository and pipeline") {
1515
console.log("Work in progress...")
1616
} else if (r === "generate pipeline") {
17-
await rover_helpers.samValidate("")
18-
const lang: string = await rover_helpers.langValue()
17+
await roverHelpers.samValidate("")
18+
const lang: string = await roverHelpers.langValue()
1919
const pipeline = await util.samBuild(lang)
2020
const template = { repoConfig: pipeline }
2121
const repoconfig = await Promise.resolve(
2222
util.jsonCreation(<Record<string, IroverDeploymentObject>>template)
2323
)
2424
if (repoconfig !== undefined) {
2525
await deployment.setupRepo(JSON.parse(repoconfig)["repoConfig"])
26-
rover_helpers.generateRoverConfig(
26+
roverHelpers.generateRoverConfig(
2727
"",
2828
JSON.parse(repoconfig)["repoConfig"],
2929
"rover_generate_pipeline"
3030
)
3131
}
3232
} else {
33-
await rover_helpers.samValidate("")
33+
await roverHelpers.samValidate("")
3434
if (fs.existsSync("samconfig.toml")) {
3535
exec("rm -rf samconfig.toml")
3636
}
@@ -70,14 +70,14 @@ export async function deployCLI() {
7070
const region = deploymentregion["Deployment region"]
7171

7272
exec(
73-
`sh ${rover_helpers.npmroot}/@rover-tools/cli/scripts/exec.sh ${file_name} ${stack_name} ${region} ${bucketName} ${profile} `
73+
`sh ${roverHelpers.npmroot}/@rover-tools/cli/scripts/exec.sh ${file_name} ${stack_name} ${region} ${bucketName} ${profile} `
7474
)
7575

7676
const configdata: IroverDeploymentConfig = <IroverDeploymentConfig>{}
7777
configdata["bucket"] = bucketName
7878
configdata["stack_name"] = stack_name
7979
configdata["region"] = region
8080
configdata["profile"] = profile
81-
rover_helpers.generateRoverConfig("", configdata, "rover_deploy_cli")
81+
roverHelpers.generateRoverConfig("", configdata, "rover_deploy_cli")
8282
}
8383
}

src/roverCLI/roverGenerateCLI.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as rover from "@rover-tools/engine/dist/bin/index"
2-
const rover_helpers = rover.helpers
2+
const roverHelpers = rover.helpers
33
const rover_addComponent = rover.addComponents
44
const rover_addModules = rover.addModules
55
const rover_generateSAM = rover.generateSAM
@@ -25,7 +25,7 @@ export async function createSAMCLI(): Promise<void> {
2525
false,
2626
"App Name:"
2727
)
28-
await rover_helpers.checkFile(app_name["app_name"], "no")
28+
await roverHelpers.checkFile(app_name["app_name"], "no")
2929
const language = await util.languageChoice()
3030

3131
const template: IroverInput = await createModules(app_name, language)
@@ -34,10 +34,10 @@ export async function createSAMCLI(): Promise<void> {
3434
export async function addComponentCLI() {
3535
const app_name = await util.inputString("app_name", "", false, "App Name")
3636
let template: IroveraddComponentInput
37-
await rover_helpers.checkFile(app_name["app_name"], "yes")
37+
await roverHelpers.checkFile(app_name["app_name"], "yes")
3838
const language = await util.languageChoice()
3939
const file_name = await exec(`ls ${app_name["app_name"]}/*.yaml `).toString()
40-
const CompStacks = await rover_helpers.checkNested(file_name)
40+
const CompStacks = await roverHelpers.checkNested(file_name)
4141
const nestedComponents: TnestedComponentsObject = <TnestedComponentsObject>{}
4242
const choice = Object.keys(CompStacks["compStacks"])
4343
let i = 0
@@ -102,7 +102,7 @@ export async function addModuleCLI(): Promise<void> {
102102
"Do you want to Add a module to existing Module :"
103103
)
104104
if (addToExisting.addToExisting[0] == "Yes") {
105-
const CompStacks = await rover_helpers.checkNested(file_name)
105+
const CompStacks = await roverHelpers.checkNested(file_name)
106106
const choice = Object.keys(CompStacks["compStacks"])
107107
let i = 0
108108
do {
@@ -115,7 +115,7 @@ export async function addModuleCLI(): Promise<void> {
115115
const selectedChoice = choice.filter((ele) =>
116116
Object.values(chooseStack).includes(ele)
117117
)
118-
// const samResources = rover_helpers.listSAMResources(
118+
// const samResources = roverHelpers.listSAMResources(
119119
// file_name,
120120
// selectedChoice[0]
121121
// )

src/utilities/cliUtil.ts

Lines changed: 20 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -56,65 +56,39 @@ export const jsonCreation = async function (
5656
}
5757
}
5858

59-
export const inputStrings = async function (
60-
userName: string,
59+
export async function inputString(
60+
name: string,
6161
defaults: string,
6262
optional: boolean,
63-
messages = ""
63+
message = ""
6464
) {
6565
const takeInput = await inquirer.prompt([
6666
{
6767
type: "input",
68-
name: userName,
69-
message: messages,
70-
validate: function (value) {
71-
let message = ""
72-
if (userName == "path") {
73-
if (apipathpattern.test(value)) return true
74-
else message = "Please enter a valid path"
75-
} else if (envpattern.test(userName)) {
76-
if (value !== "" && value !== undefined) return true
77-
else message = "environment values cannot be empty"
68+
name,
69+
message,
70+
validate: (value) => {
71+
if (name === "path") {
72+
return apipathpattern.test(value) || "Please enter a valid path"
73+
} else if (envpattern.test(name)) {
74+
return (
75+
(value !== "" && value !== undefined) ||
76+
"Environment values cannot be empty"
77+
)
7878
} else {
79-
if (!optional) {
80-
if (stringpattern.test(value)) return true
81-
else message = `${messages} should have only alphanumeric values`
82-
}
79+
return (
80+
optional ||
81+
stringpattern.test(value) ||
82+
`${message} should have only alphanumeric values`
83+
)
8384
}
84-
if (message !== "") return message
85-
else return true
8685
},
8786
},
8887
])
89-
return { ...takeInput }
90-
}
9188

92-
export async function inputString(
93-
name: string,
94-
defaults: string,
95-
optional: boolean,
96-
message = ""
97-
) {
98-
const takeInput = await inquirer.prompt([{
99-
type: "input",
100-
name,
101-
message,
102-
validate: (value) => {
103-
if (name === "path") {
104-
return apipathpattern.test(value) || "Please enter a valid path";
105-
} else if (envpattern.test(name)) {
106-
return (value !== "" && value !== undefined) || "Environment values cannot be empty";
107-
} else {
108-
return optional || stringpattern.test(value) || `${message} should have only alphanumeric values`;
109-
}
110-
},
111-
}
112-
]);
113-
114-
return { ...takeInput };
89+
return { ...takeInput }
11590
}
11691

117-
11892
export const languageChoice = async function () {
11993
const lang = await inquirer.prompt([
12094
{
@@ -424,7 +398,7 @@ export const paramss = async function (module: string) {
424398
}
425399
}
426400

427-
export const params=async function(module: string) {
401+
export const params = async function (module: string) {
428402
const { choices } = cliConfig.app
429403
const name: Record<string, string> = {}
430404
const res: IroverCLIparamModule = <IroverCLIparamModule>{}

src/utilities/helper.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import {
1111
import * as child from "child_process"
1212
import * as cliConfig from "../configs/cliConfig"
1313
const exec = child.execSync
14-
const rover_helpers = rover.helpers
14+
const roverHelpers = rover.helpers
1515
import * as util from "./cliUtil"
1616
let moreStack
1717
export async function roverADD() {
1818
const app_name = await util.inputString("app_name", "", false, "App Name:")
19-
await rover_helpers.samValidate(<string>app_name["app_name"])
20-
await rover_helpers.checkFile(<string>app_name["app_name"], "yes")
19+
await roverHelpers.samValidate(<string>app_name["app_name"])
20+
await roverHelpers.checkFile(<string>app_name["app_name"], "yes")
2121
const language = await util.languageChoice()
2222
const file_name = await exec(`ls ${app_name["app_name"]}/*.yaml `).toString()
23-
const CompStacks = await rover_helpers.checkNested(file_name)
23+
const CompStacks = await roverHelpers.checkNested(file_name)
2424
return {
2525
appname: app_name,
2626
language: language,
@@ -58,7 +58,8 @@ async function CustomObject(i: number) {
5858
`Stack ${i} Name: `
5959
)
6060
const CustomStacks = await util.multichoice("app_type", choice, "")
61-
customStacks[<string>customstack_name[`customStackName${i}`]] = CustomStacks.app_type
61+
customStacks[<string>customstack_name[`customStackName${i}`]] =
62+
CustomStacks.app_type
6263
return customStacks
6364
}
6465
export async function createModules(
@@ -77,7 +78,7 @@ export async function createModules(
7778
do {
7879
const AppType: string = <string>await util.appType("Module Type :")
7980
if (AppType !== "CustomizableModule") {
80-
stackname[`stackName${i}`] = `${AppType}${rover_helpers.makeId(5)}`
81+
stackname[`stackName${i}`] = `${AppType}${roverHelpers.makeId(5)}`
8182
const stack_name = stackname
8283
const stackName: string = stack_name[`stackName${i}`]
8384
if (AppType === "CRUDModule") {

0 commit comments

Comments
 (0)