Merge pull request #1732 from hashicorp/fix-templates

fix(cli): fix templates to properly indent cdktf.json and add RemoteBackend in TS template
hashicorp · Apr 20, 2022 · cbd5215 · cbd5215
2 parents 8768077 + cdc54c0
commit cbd5215
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/packages/cdktf-cli/lib/init.ts b/packages/cdktf-cli/lib/init.ts
@@ -40,7 +40,7 @@ export async function init({
   const deps: any = await determineDeps(cdktfVersion, dist);
 
   const futureFlags = Object.entries(FUTURE_FLAGS)
-    .map(([key, value]) => `"${key}": "${value}"`)
+    .map(([key, value]) => `    "${key}": "${value}"`)
     .join(`,\n`);
 
   await sscaff(templatePath, destination, {

diff --git a/packages/cdktf-cli/templates/csharp/cdktf.json b/packages/cdktf-cli/templates/csharp/cdktf.json
@@ -1,10 +1,10 @@
 {
-    "language": "csharp",
-    "app": "dotnet run -p MyTerraformStack.csproj",
-    "projectId": "{{projectId}}",
-    "terraformProviders": [],
-    "terraformModules": [],
-    "context": {
-        {{futureFlags}}
-    }
-}
+  "language": "csharp",
+  "app": "dotnet run -p MyTerraformStack.csproj",
+  "projectId": "{{projectId}}",
+  "terraformProviders": [],
+  "terraformModules": [],
+  "context": {
+{{futureFlags}}
+  }
+}
diff --git a/packages/cdktf-cli/templates/go/cdktf.json b/packages/cdktf-cli/templates/go/cdktf.json
@@ -1,11 +1,11 @@
 {
-    "language": "go",
-    "app": "go run main.go",
-    "codeMakerOutput": "generated",
-    "projectId": "{{projectId}}",
-    "terraformProviders": [],
-    "terraformModules": [],
-    "context": {
-        {{futureFlags}}
-    }
-}
+  "language": "go",
+  "app": "go run main.go",
+  "codeMakerOutput": "generated",
+  "projectId": "{{projectId}}",
+  "terraformProviders": [],
+  "terraformModules": [],
+  "context": {
+{{futureFlags}}
+  }
+}
diff --git a/packages/cdktf-cli/templates/java/cdktf.json b/packages/cdktf-cli/templates/java/cdktf.json
@@ -5,6 +5,6 @@
   "terraformProviders": [],
   "terraformModules": [],
   "context": {
-    {{futureFlags}}
+{{futureFlags}}
   }
-}
+}
diff --git a/packages/cdktf-cli/templates/python-pip/cdktf.json b/packages/cdktf-cli/templates/python-pip/cdktf.json
@@ -6,6 +6,6 @@
   "terraformModules": [],
   "codeMakerOutput": "imports",
   "context": {
-    {{futureFlags}}
+{{futureFlags}}
   }
 }
diff --git a/packages/cdktf-cli/templates/python/cdktf.json b/packages/cdktf-cli/templates/python/cdktf.json
@@ -6,6 +6,6 @@
   "terraformModules": [],
   "codeMakerOutput": "imports",
   "context": {
-    {{futureFlags}}
+{{futureFlags}}
   }
-}
+}
diff --git a/packages/cdktf-cli/templates/typescript/.hooks.sscaff.js b/packages/cdktf-cli/templates/typescript/.hooks.sscaff.js
@@ -30,13 +30,13 @@ function installDeps(deps, isDev) {
 function terraformCloudConfig(baseName, organizationName, workspaceName) {
   template = readFileSync('./main.ts', 'utf-8');
 
-  result = template.replace(`import { App, TerraformStack } from 'cdktf';`, `import { App, TerraformStack, RemoteBackend } from 'cdktf';`);
-  result = result.replace(`new MyStack(app, '${baseName}');`, `const stack = new MyStack(app, '${baseName}');
+  result = template.replace(`import { App, TerraformStack } from "cdktf";`, `import { App, TerraformStack, RemoteBackend } from "cdktf";`);
+  result = result.replace(`new MyStack(app, "${baseName}");`, `const stack = new MyStack(app, "${baseName}");
 new RemoteBackend(stack, {
-  hostname: 'app.terraform.io',
-  organization: '${organizationName}',
+  hostname: "app.terraform.io",
+  organization: "${organizationName}",
   workspaces: {
-    name: '${workspaceName}'
+    name: "${workspaceName}"
   }
 });`);
 

diff --git a/packages/cdktf-cli/templates/typescript/cdktf.json b/packages/cdktf-cli/templates/typescript/cdktf.json
@@ -5,6 +5,6 @@
   "terraformProviders": [],
   "terraformModules": [],
   "context": {
-    {{futureFlags}}
+{{futureFlags}}
   }
-}
+}