Merge pull request #55 from antstackio/ROV-59

fix: Add module/components to existing resources CLI

Author: DheerajGBhatt

bin/index.ts

@@ -6,41 +6,60 @@ import {
   addModuleCLI,
 } from "../src/roverCLI/roverGenerateCLI"
 import { deployCLI } from "../src/roverCLI/roverDeployCLI"
-
 import * as cliConfig from "../src/configs/cliConfig"
+import { version } from "../package.json"
 import * as util from "../src/utilities/cliUtil"
 
-import { version } from "../package.json"
+function handleInitCommand(): Promise<void> {
+  return new Promise( (resolve) => {
+    const editedSam = <string>(<unknown>util.confirmation())
+    if ( editedSam === "create new SAM project") {
+       createSAMCLI()
+    } else if (editedSam === "add components to existing SAM") {
+       addComponentCLI()
+    } else if (editedSam === "add modules to existing SAM") {
+       addModuleCLI()
+    }
+    resolve()
+  })
+}
+
+async function handleDeployCommand(): Promise<void> {
+  await deployCLI()
+}
+
+function handleVersionCommand(): void {
+  console.log(version)
+}
+
+function handleUnknownCommand(): void {
+  console.log(cliConfig.commandError(process.argv.slice(2)))
+}
 
 async function run(argv: Array<string>): Promise<void> {
   try {
     if (!roverHelpers.npmrootTest()) {
       throw new Error(cliConfig.globalError)
     }
-    const commandErrors = cliConfig.commandError(argv)
-    if (argv.length !== 1) {
-      throw new Error(commandErrors)
-    }
-    if (argv[0] === "init") {
-      const editedSam = await util.confirmation()
-      if (editedSam === "create new SAM project") {
-        await createSAMCLI()
-      } else if (editedSam === "add components to existing SAM") {
-        await addComponentCLI()
-      } else if (editedSam === "add modules to existing SAM") {
-        await addModuleCLI()
-      }
-    } else if (argv[0] === "deploy") {
-      await deployCLI()
-    } else if (argv[0] === "-v" || argv[0] === "--version") {
-      // show current package version in the console
-      console.log(version)
-    } else {
-      console.log(commandErrors)
+
+    switch (argv[0]) {
+      case "init":
+        await handleInitCommand()
+        break
+      case "deploy":
+        await handleDeployCommand()
+        break
+      case "-v":
+      case "--version":
+        handleVersionCommand()
+        break
+      default:
+        handleUnknownCommand()
     }
   } catch (error) {
     console.log("Error: ", error as Error)
     //.message)
   }
 }
+
 run(process.argv.slice(2))

src/utilities/cliUtil.ts

@@ -118,7 +118,7 @@ export const inputType = async function (
   return takeInput
 }
 
-export const confirmation = async function () {
+export const confirmation = async function ():Promise<string> {
   const r = await inquirer.prompt([
     {
       type: "rawlist",
@@ -195,7 +195,7 @@ export const password = async function (userName: string, message = "") {
   return r
 }
 
-export const samBuild = async function (lang: string) {
+export const samBuilds = async function (lang: string) {
   try {
     const obj = buildConfig.samConfig
     const choices = <Record<string, Array<string>>>buildConfig.samConfig.choices
@@ -206,7 +206,7 @@ export const samBuild = async function (lang: string) {
       ""
     )
     const temp: Record<string, Record<string, string>> = {}
-    Object.values(sam).map((ele) => {
+    Object.values(sam).forEach((ele) => {
       Object.assign(temp, ele)
     })
     sam = temp
@@ -308,6 +308,121 @@ export const samBuild = async function (lang: string) {
   }
 }
 
+export const samBuild = async (lang: string) => {
+  try {
+    const { samConfig } = buildConfig
+
+    const sam = await inputCli(
+      samConfig,
+      <Array<Record<string, string>>>samConfig.samBuild,
+      ""
+    )
+
+    const { choices } = samConfig
+
+    const language = { language: lang }
+
+    const no_of_env = await inputNumber("no_of_env", "environments")
+    const envs = []
+    const steps = {}
+    const stacknames = {}
+    const deploymentregion = <Record<string, string>>{}
+    const deploymentparameters = {}
+    const depBucketNames = {}
+
+    const branches = { branches: ["main"] }
+
+    for (let i = 1; i <= no_of_env; i++) {
+      const envName = <string>(
+        (await inputString(`env${i}`, "", false, `Environment ${i}:`))[
+          `env${i}`
+        ]
+      )
+      envs.push(envName)
+
+      const stepsChoice = (<Record<string, Array<string>>>choices).dev
+      const stepData = await multichoice(
+        `Steps required for ${envName} environment`,
+        stepsChoice,
+        ""
+      )
+      const step = Object.fromEntries(
+        Object.entries(stepData).map(([key, value]) => {
+          const name = key
+            .replace("steps required for ", "")
+            .replace(" environment ", "")
+          return [name, value]
+        })
+      )
+      Object.assign(steps, step)
+
+      const stackname = (
+        await inputString(
+          `${envName}`,
+          "",
+          true,
+          `Stack Name (optional) --> ${envName}:`
+        )
+      )[envName]
+      const deploymentbucket = (
+        await inputString(
+          `${envName}`,
+          "",
+          true,
+          `Deployment Bucket (optional) --> ${envName}:`
+        )
+      )[envName]
+
+      const regionChoice = (<Record<string, Array<string>>>choices)
+        .deploymentregion
+      const deployment_region = <string>(
+        (await inputType(`${envName}`, regionChoice, "Deployment Region"))[
+          `${envName}`
+        ]
+      )
+      deploymentregion[`${envName}`] = deployment_region
+
+      const deployment_parameter = (
+        await inputString(
+          `${envName}`,
+          "",
+          true,
+          `Deployment Parameter (optional) --> ${envName}:`
+        )
+      )[envName]
+
+      Object.assign(stacknames, { [envName]: stackname })
+      Object.assign(depBucketNames, { [envName]: deploymentbucket })
+      Object.assign(deploymentparameters, { [envName]: deployment_parameter })
+    }
+
+    const deployment_choice = (<Record<string, Array<string>>>choices)
+      .deployment
+    const deploymentEvent = await multichoice(
+      `Deployment Events`,
+      deployment_choice,
+      ""
+    )
+
+    return {
+      ...sam,
+      ...language,
+      no_of_env,
+      envs,
+      ...branches,
+      framework: "sam",
+      steps,
+      stackname: { ...stacknames },
+      deploymentbucket: { ...depBucketNames },
+      deploymentregion,
+      deploymentparameters,
+      ...deploymentEvent,
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
 export const appType = async function (message = "") {
   const r = await inquirer.prompt([
     {

tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "target": "es2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */