Merge pull request #56 from antstackio/ROVGPT

Added ChatGPT support.

Author: DheerajGBhatt

bin/index.ts

@@ -4,35 +4,38 @@ import {
   createSAMCLI,
   addComponentCLI,
   addModuleCLI,
+  createCustomSAMCLI,
 } 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"
 
-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 handleInitCommand() {
+  const editedSam = <string>(<unknown>await util.confirmation())
+  if (editedSam === "create new SAM project") {
+    await createSAMCLI()
+  } else if (editedSam === "create custom SAM project") {
+    await createCustomSAMCLI()
+  } else if (editedSam === "add components to existing SAM") {
+    await addComponentCLI()
+  } else if (editedSam === "add modules to existing SAM") {
+    await addModuleCLI()
+  } else {
+    console.log(editedSam)
+    throw new Error(`Unknown option ${editedSam}`)
+  }
 }
 
 async function handleDeployCommand(): Promise<void> {
   await deployCLI()
 }
 
-function handleVersionCommand(): void {
+async function handleVersionCommand(): Promise<void> {
   console.log(version)
 }
 
-function handleUnknownCommand(): void {
+async function handleUnknownCommand(): Promise<void> {
   console.log(cliConfig.commandError(process.argv.slice(2)))
 }
 
@@ -51,14 +54,13 @@ async function run(argv: Array<string>): Promise<void> {
         break
       case "-v":
       case "--version":
-        handleVersionCommand()
+        await handleVersionCommand()
         break
       default:
-        handleUnknownCommand()
+        await handleUnknownCommand()
     }
   } catch (error) {
-    console.log("Error: ", error as Error)
-    //.message)
+    console.log("Error: ", (error as Error).message)
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@types/node": "^12.12.7",
+    "@types/node": "^12.20.55",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "eslint": "^8.28.0",
     "eslint-config-standard-with-typescript": "^23.0.0",
@@ -12,7 +12,6 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.5",
     "@rover-tools/engine": "file:../rover-engine",
     "@types/inquirer": "^8.2.1",
     "dotenv": "^16.0.3",

src/roverCLI/roverGenerateCLI.ts

@@ -4,6 +4,7 @@ const rover_addComponent = rover.addComponents
 const rover_addModules = rover.addModules
 const rover_generateSAM = rover.generateSAM
 const rover_addModulesToexisting = rover.addModulesToExisting
+const rover_generateCustomSAM = rover.generateCustomSAM
 import * as util from "../utilities/cliUtil"
 import * as cliConfig from "../configs/cliConfig"
 import { createModules, roverADD } from "../utilities/helper"
@@ -157,3 +158,22 @@ async function addModuleToStack(
   }
   return template
 }
+export async function createCustomSAMCLI() {
+  const appName: Record<string, string> = await util.inputString(
+    "appName",
+    "",
+    false,
+    "App Name:"
+  )
+  const Description: Record<string, string> = await util.inputDescription(
+    "description",
+    "",
+    false,
+    "You want a SAM project to ?"
+  )
+  await roverHelpers.checkFile(appName["appName"], "no")
+  await rover_generateCustomSAM.generateCustomSAM(
+    appName["appName"],
+    Description["description"]
+  )
+}

src/utilities/cliUtil.ts

@@ -84,6 +84,22 @@ export async function inputString(
 
   return { ...takeInput }
 }
+export async function inputDescription(
+  name: string,
+  defaults: string,
+  optional: boolean,
+  message = ""
+) {
+  const takeInput = await inquirer.prompt([
+    {
+      type: "input",
+      name,
+      message,
+    },
+  ])
+
+  return { ...takeInput }
+}
 
 export const languageChoice = async function () {
   const lang = await inquirer.prompt([
@@ -101,14 +117,14 @@ export const languageChoice = async function () {
 }
 
 export const inputType = async function (
-  userName: string,
+  name: string,
   choices: Array<string> | string,
   message = ""
 ) {
   const takeInput = await inquirer.prompt([
     {
       type: "rawlist",
-      name: `${userName}`,
+      name: `${name}`,
       message: message,
       choices:
         typeof choices === "string" ? cliConfig.app.choices[choices] : choices,
@@ -118,14 +134,15 @@ export const inputType = async function (
   return takeInput
 }
 
-export const confirmation = async function ():Promise<string> {
+export const confirmation = async function () {
   const r = await inquirer.prompt([
     {
       type: "rawlist",
       name: "choice",
       message: `Hey, what do you want ?`,
       choices: [
         "create new SAM project",
+        "create custom SAM project",
         "add components to existing SAM",
         "add modules to existing SAM",
       ],
@@ -135,16 +152,16 @@ export const confirmation = async function ():Promise<string> {
   return r.choice
 }
 
-export const inputNumber = async function (userName: string, message: string) {
-  let displayname = userName
+export const inputNumber = async function (name: string, message: string) {
+  let displayname = name
   if (message !== undefined) {
     displayname = message
   }
   const takeInput = await inquirer.prompt([
     {
       type: "input",
       message: `Please enter the required number of ${displayname} you want ?`,
-      name: `${userName}`,
+      name: `${name}`,
       validate: function (value) {
         const pass = !isNaN(value) && value > 0
         if (pass) {
@@ -155,7 +172,7 @@ export const inputNumber = async function (userName: string, message: string) {
     },
   ])
 
-  return parseInt(takeInput[`${userName}`], 10)
+  return parseInt(takeInput[`${name}`], 10)
 }
 
 export const inputCli = async function (
@@ -184,130 +201,17 @@ export const inputCli = async function (
   }
   return res
 }
-export const password = async function (userName: string, message = "") {
+export const password = async function (name: string, message = "") {
   const r = await inquirer.prompt([
     {
       type: "password",
       message: message,
-      name: userName,
+      name: name,
     },
   ])
   return r
 }
 
-export const samBuilds = async function (lang: string) {
-  try {
-    const obj = buildConfig.samConfig
-    const choices = <Record<string, Array<string>>>buildConfig.samConfig.choices
-    const subObj = <Array<Record<string, string>>>buildConfig.samConfig.samBuild
-    let sam: Record<string, Record<string, string>> = await inputCli(
-      obj,
-      subObj,
-      ""
-    )
-    const temp: Record<string, Record<string, string>> = {}
-    Object.values(sam).forEach((ele) => {
-      Object.assign(temp, ele)
-    })
-    sam = temp
-    const langs = { language: lang }
-    const no_of_env = await inputNumber("no_of_env", "environments")
-    const envs: string[] = []
-    let steps: Record<string, Array<string>> = {}
-    let stacknames: Record<string, string> = {}
-    const deploymentregion: Record<string, string> = {}
-    let deploymentparameters: Record<string, string> = {}
-    let depBucketNames: Record<string, string> = {}
-
-    const branches = { branches: ["main"] }
-    for (let i = 1; i <= no_of_env; i++) {
-      const env = await inputString(`env${i}`, "", false, `Envrionment ${i} :`)
-      const envName = env[`env${i}`]
-      envs.push(envName)
-
-      const stepsChoice = choices.dev
-      let step = await multichoice(
-        `steps required for ${envName} environment `,
-        stepsChoice,
-        ""
-      )
-      const steps1: Record<string, Array<string>> = {}
-      step = Object.keys(step).map((ele) => {
-        let name: string = ele.replace("steps required for ", "")
-        name = name.replace(" environment ", "")
-        steps1[name] = step[ele]
-      })
-
-      const stackname = await inputString(
-        `${envName}`,
-        "",
-        true,
-
-        `Stack Name(optional) --> ${envName} :`
-      )
-      const deploymentbucket = await inputString(
-        `${envName}`,
-        "",
-        true,
-        `Deployment Bucket(optional) --> ${envName} :`
-      )
-      const regionChoice = choices.deploymentregion
-      const deployment_region = await inputType(
-        `${envName}`,
-        regionChoice,
-        "Deployment Region"
-      )
-      const deployment_parameter = await inputString(
-        `${envName}`,
-        "",
-        true,
-        `Deployment Parameter(optional) --> ${envName} :`
-      )
-      steps = { ...steps, ...steps1 }
-
-      stacknames = { ...stacknames, ...stackname }
-
-      depBucketNames = {
-        ...depBucketNames,
-        ...deploymentbucket,
-      }
-      deploymentregion[`${envName}`] = deployment_region[`${envName}`]
-      deploymentparameters = {
-        ...deploymentparameters,
-        ...deployment_parameter,
-      }
-    }
-
-    const deployment_choice = choices.deployment
-    const deploymentEvent = await multichoice(
-      `deploymentevents`,
-      deployment_choice,
-      ""
-    )
-    const framework = { framework: "sam" }
-
-    const result: IroverDeploymentObject = {
-      ...sam,
-      ...langs,
-      no_of_env,
-      envs,
-      ...branches,
-      ...framework,
-      steps,
-      stackname: { ...stacknames },
-      deploymentbucket: {
-        ...depBucketNames,
-      },
-      deploymentregion,
-      deploymentparameters,
-      ...deploymentEvent,
-    }
-    return result
-  } catch (error) {
-    console.log(error)
-  }
-}
-
 export const samBuild = async (lang: string) => {
   try {
     const { samConfig } = buildConfig