feature: seperate the init and add command

Author: DheerajGBhatt

bin/index.ts

@@ -12,12 +12,19 @@ import { version } from "../package.json"
 import * as util from "../src/utilities/cliUtil"
 
 async function handleInitCommand() {
-  const editedSam = <string>(<unknown>await util.confirmation())
+  const editedSam = <string>(<unknown>await util.initConfirmation())
   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") {
+  } else {
+    console.log(editedSam)
+    throw new Error(`Unknown option ${editedSam}`)
+  }
+}
+async function handleAddCommand() {
+  const editedSam = <string>(<unknown>await util.addConfirmation())
+  if (editedSam === "add components to existing SAM") {
     await addComponentCLI()
   } else if (editedSam === "add modules to existing SAM") {
     await addModuleCLI()
@@ -49,6 +56,9 @@ async function run(argv: Array<string>): Promise<void> {
       case "init":
         await handleInitCommand()
         break
+      case "add":
+        await handleAddCommand()
+        break
       case "deploy":
         await handleDeployCommand()
         break

scripts/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 --profile $5  $4
+sam deploy --no-confirm-changeset --capabilities CAPABILITY_NAMED_IAM CAPABILITY_IAM CAPABILITY_AUTO_EXPAND --stack-name $2 --profile $3  --region $4  $5

src/roverCLI/roverDeployCLI.ts

@@ -70,7 +70,7 @@ export async function deployCLI() {
     const region = deploymentregion["Deployment region"]
 
     exec(
-      `sh ${roverHelpers.npmroot}/@rover-tools/cli/scripts/exec.sh ${fileName} ${stack_name} ${region} ${bucketName} ${profile} `
+      `sh ${roverHelpers.npmroot}/@rover-tools/cli/scripts/exec.sh ${fileName} ${stack_name} ${profile} ${region}  ${bucketName}`
     )
 
     const configdata: IroverDeploymentConfig = <IroverDeploymentConfig>{}

src/roverCLI/roverGenerateCLI.ts

@@ -1,6 +1,7 @@
 import * as rover from "@rover-tools/engine/dist/bin/index"
 const roverHelpers = rover.helpers
-const rover_addComponent = rover.addComponents
+//const rover_addComponent = rover.addComponents
+const rover_addComponent = rover.addComponent
 const rover_addModules = rover.addModules
 const rover_generateSAM = rover.generateSAM
 const rover_addModulesToexisting = rover.addModulesToExisting

src/utilities/cliUtil.ts

@@ -71,13 +71,20 @@ export async function inputString(
             (value !== "" && value !== undefined) ||
             "Environment values cannot be empty"
           )
-        } else {
-          return (
-            optional ||
-            stringpattern.test(value) ||
-            `${message} should have only alphanumeric values`
-          )
         }
+        // return (
+        //   optional ||
+        //   stringpattern.test(value) ||
+        //   `${typeof message} ${typeof value} ${typeof optional} ${typeof stringpattern.test(
+        //     value
+        //   )} should have only alphanumeric values `
+        // )
+        return (
+          optional ||
+          (!stringpattern.test(value)
+            ? `should have only alphanumeric values`
+            : true)
+        )
       },
     },
   ])
@@ -134,15 +141,25 @@ export const inputType = async function (
   return takeInput
 }
 
-export const confirmation = async function () {
+export const initConfirmation = 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"],
+    },
+  ])
+
+  return r.choice
+}
+export const addConfirmation = 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",
       ],