fix(cli): fix the behaviour for the --generate-only flag (#5253)

aws · Nov 29, 2019 · ecbe0b6 · ecbe0b6
1 parent d1f0dd5
commit ecbe0b6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/packages/aws-cdk/bin/cdk.ts b/packages/aws-cdk/bin/cdk.ts
@@ -238,11 +238,10 @@ async function initCommandLine() {
 
       case 'init':
         const language = configuration.settings.get(['language']);
-        const generateOnly = configuration.settings.get(['generate-only']);
         if (args.list) {
           return await printAvailableTemplates(language);
         } else {
-          return await cliInit(args.TEMPLATE, language, undefined, generateOnly);
+          return await cliInit(args.TEMPLATE, language, undefined, args.generateOnly);
         }
       case 'version':
         return data(version.DISPLAY_VERSION);

diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts
@@ -233,7 +233,6 @@ export class Settings {
       versionReporting: argv.versionReporting,
       staging: argv.staging,
       output: argv.output,
-      generateOnly: argv.generateOnly,
     });
   }
 

diff --git a/packages/aws-cdk/test/integ/init/test-generate-only.sh b/packages/aws-cdk/test/integ/init/test-generate-only.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#------------------------------------------------------------------
+# setup
+#------------------------------------------------------------------
+set -e
+scriptdir=$(cd $(dirname $0) && pwd)
+source ${scriptdir}/common.bash
+
+header "--generate-only"
+
+#------------------------------------------------------------------
+
+echo "Trying --generate-only"
+
+setup
+
+cdk init -l javascript --generate-only
+
+if [ -d .git ]
+then
+  fail "git shouldn't have been initialized"
+fi
diff --git a/packages/aws-cdk/test/test.init.ts b/packages/aws-cdk/test/test.init.ts
@@ -54,6 +54,18 @@ export = {
     // Check that package.json and bin/ got created in the current directory
     test.equal(true, await fs.pathExists('package.json'));
     test.equal(true, await fs.pathExists('bin'));
+    test.equal(true, await fs.pathExists('.git'));
+
+    test.done();
+  },
+
+  async '--generate-only should skip git init'(test: Test) {
+    await cliInit('app', 'javascript', false, true);
+
+    // Check that package.json and bin/ got created in the current directory
+    test.equal(true, await fs.pathExists('package.json'));
+    test.equal(true, await fs.pathExists('bin'));
+    test.equal(false, await fs.pathExists('.git'));
 
     test.done();
   },