call the buildDirectory function if the init flag is true

README.md

@@ -91,7 +91,8 @@ ARGUMENTS
 OPTIONS
   -h, --help     show CLI help
   -v, --version  show CLI version
-  --multi-app
+  --init         create the cdk directory before building the app and stack files
+  --multi-app    create the stack files within sub directories as the project defines multiple apps
 ```
 
 _See code: [src/commands/migrate.ts](https://github.com/guardian/cdk-cli/blob/v0.0.0/src/commands/migrate.ts)_
@@ -112,7 +113,8 @@ ARGUMENTS
 OPTIONS
   -h, --help     show CLI help
   -v, --version  show CLI version
-  --multi-app
+  --init         create the cdk directory before building the app and stack files
+  --multi-app    create the stack files within sub directories as the project defines multiple apps
 ```
 
 _See code: [src/commands/new.ts](https://github.com/guardian/cdk-cli/blob/v0.0.0/src/commands/new.ts)_

src/commands/migrate.test.ts

@@ -19,6 +19,7 @@ describe("The MigrateCommand class", () => {
       },
       flags: {
         "multi-app": false,
+        init: false,
       },
     };
 
@@ -43,7 +44,10 @@ describe("The MigrateCommand class", () => {
 
     test("pulls outs computed values correctly if multiApp is true", () => {
       expect(
-        MigrateCommand.getConfig({ ...args, flags: { "multi-app": true } })
+        MigrateCommand.getConfig({
+          ...args,
+          flags: { "multi-app": true, init: false },
+        })
       ).toMatchObject({
         cfnFile: "template.ts",
         appPath: `/path/to/output/bin/app.ts`,
@@ -61,6 +65,7 @@ describe("The MigrateCommand class", () => {
         },
         flags: {
           "multi-app": false,
+          init: false,
         },
       };
 

src/commands/migrate.ts

@@ -9,6 +9,7 @@ import {
 } from "../utils/args";
 import { parse } from "../utils/cfn";
 import { newAppImports, newTestImports } from "../utils/imports";
+import { buildDirectory } from "../utils/init";
 import { constructTest } from "../utils/snapshot";
 import { constructStack } from "../utils/stack";
 
@@ -22,6 +23,7 @@ interface MigrateCommandConfig {
   stackPath: string;
   stackName: string;
   testPath: string;
+  init: boolean;
 }
 
 interface MigrateCommandArgs {
@@ -33,6 +35,7 @@ interface MigrateCommandArgs {
 
 interface MigrateCommandFlags {
   "multi-app": boolean;
+  init: boolean;
 }
 
 export class MigrateCommand extends Command {
@@ -42,7 +45,16 @@ export class MigrateCommand extends Command {
   static flags = {
     version: flags.version({ char: "v" }),
     help: flags.help({ char: "h" }),
-    "multi-app": flags.boolean(),
+    "multi-app": flags.boolean({
+      default: false,
+      description:
+        "create the stack files within sub directories as the project defines multiple apps",
+    }),
+    init: flags.boolean({
+      default: false,
+      description:
+        "create the cdk directory before building the app and stack files",
+    }),
   };
 
   static args = [
@@ -96,6 +108,7 @@ export class MigrateCommand extends Command {
       testPath: `${cdkDir}/lib/${
         flags["multi-app"] ? `${kebabAppName}/` : ""
       }${kebabStackName}.test.ts`,
+      init: flags["init"],
     };
 
     MigrateCommand.validateConfig(config);
@@ -106,7 +119,9 @@ export class MigrateCommand extends Command {
   static validateConfig = (config: MigrateCommandConfig): void => {
     // TODO: Do some better validation here to make sure that files and directories are what we expect them to be.
     checkPathExists(config.cfnPath);
-    checkPathExists(config.cdkDir); // TODO: Add an option to init the CDK dir at the same time?
+    if (!config.init) {
+      checkPathExists(config.cdkDir);
+    }
     checkPathDoesNotExist(config.appPath); // TODO: Update the app file if it already exists
     checkPathDoesNotExist(config.stackPath);
   };
@@ -116,6 +131,11 @@ export class MigrateCommand extends Command {
 
     const config = MigrateCommand.getConfig(this.parse(MigrateCommand));
 
+    if (config.init) {
+      this.log("Creating CDK directory");
+      buildDirectory({ outputDir: config.cdkDir }, this);
+    }
+
     this.log(`Converting template found at ${config.cfnPath}`);
     this.log(`New app ${config.appName} will be written to ${config.appPath}`);
     this.log(

src/commands/new.test.ts

@@ -18,6 +18,7 @@ describe("The NewCommand class", () => {
       },
       flags: {
         "multi-app": false,
+        init: false,
       },
     };
 
@@ -40,7 +41,10 @@ describe("The NewCommand class", () => {
 
     test("pulls outs computed values correctly if multiApp is true", () => {
       expect(
-        NewCommand.getConfig({ ...args, flags: { "multi-app": true } })
+        NewCommand.getConfig({
+          ...args,
+          flags: { "multi-app": true, init: false },
+        })
       ).toMatchObject({
         appPath: `/path/to/output/bin/app.ts`,
         stackPath: `/path/to/output/lib/app/stack-name.ts`,

src/commands/new.ts

@@ -12,6 +12,7 @@ import {
   newStackImports,
   newTestImports,
 } from "../utils/imports";
+import { buildDirectory } from "../utils/init";
 import { cancellablePrompts } from "../utils/prompts";
 import { constructTest } from "../utils/snapshot";
 import type { StackTemplate } from "../utils/stack";
@@ -25,6 +26,7 @@ interface NewCommandConfig {
   stackPath: string;
   stackName: string;
   testPath: string;
+  init: boolean;
 }
 
 interface NewCommandArgs {
@@ -35,6 +37,7 @@ interface NewCommandArgs {
 
 interface NewCommandFlags {
   "multi-app": boolean;
+  init: boolean;
 }
 
 export class NewCommand extends Command {
@@ -43,7 +46,16 @@ export class NewCommand extends Command {
   static flags = {
     version: flags.version({ char: "v" }),
     help: flags.help({ char: "h" }),
-    "multi-app": flags.boolean(),
+    "multi-app": flags.boolean({
+      default: false,
+      description:
+        "create the stack files within sub directories as the project defines multiple apps",
+    }),
+    init: flags.boolean({
+      default: false,
+      description:
+        "create the cdk directory before building the app and stack files",
+    }),
   };
 
   static args = [
@@ -94,6 +106,7 @@ export class NewCommand extends Command {
       testPath: `${cdkDir}/lib/${
         flags["multi-app"] ? `${kebabAppName}/` : ""
       }${kebabStackName}.test.ts`,
+      init: flags["init"],
     };
 
     NewCommand.validateConfig(config);
@@ -102,7 +115,9 @@ export class NewCommand extends Command {
   };
 
   static validateConfig = (config: NewCommandConfig): void => {
-    checkPathExists(config.cdkDir); // TODO: Add an option to init the CDK dir at the same time?
+    if (!config.init) {
+      checkPathExists(config.cdkDir);
+    }
     checkPathDoesNotExist(config.appPath); // TODO: Update the app file if it already exists
     checkPathDoesNotExist(config.stackPath);
   };
@@ -112,6 +127,10 @@ export class NewCommand extends Command {
 
     const config = NewCommand.getConfig(this.parse(NewCommand));
 
+    if (config.init) {
+      buildDirectory({ outputDir: config.cdkDir }, this);
+    }
+
     this.log(`New app ${config.appName} will be written to ${config.appPath}`);
     this.log(
       `New stack ${config.stackName} will be written to ${config.stackPath}`