fix(cli): dont upload .terraform folders

packages/cdktf-cli/bin/cmds/ui/models/terraform-cloud.ts

@@ -60,9 +60,12 @@ function BeautifyErrors(name: string) {
       } catch (e) {
         if (e.response && e.response.status >= 400 && e.response.status <= 599){
           const errors = e.response.data?.errors as (object[] | undefined);
+          logger.error(`Error in ${name}: ${JSON.stringify(e)}`);
           if (errors) {
             throw new Error(`${name}: Request to Terraform Cloud failed with status ${e.response.status}: ${errors.map(e => JSON.stringify(e)).join(', ')}`);
           }
+        } else {
+          logger.warn(`Error in ${name}: ${JSON.stringify(e)}`);
         }
         throw e;
       }
@@ -113,7 +116,7 @@ export class TerraformCloud implements Terraform {
 
   @BeautifyErrors("Init")
   public async init(): Promise<void> {
-    if (fs.existsSync(path.join(process.cwd(), 'terraform.tfstate'))) throw new Error('Found a "terraform.tfstate" file in your current working directory. Please migrate the state manually to Terraform Cloud and delete the file afterwards. https://cdk.tf/migrate-state')
+    if (fs.existsSync(path.join(process.cwd(), `terraform.${this.stack.name}.tfstate`))) throw new Error('Found a "terraform.tfstate" file in your current working directory. Please migrate the state manually to Terraform Cloud and delete the file afterwards. https://cdk.tf/migrate-state')
     const workspace = await this.workspace()
     const version = await this.client.ConfigurationVersion.create(workspace.id, {
       data: {
@@ -127,6 +130,8 @@ export class TerraformCloud implements Terraform {
 
     this.configurationVersionId = version.id
 
+    this.removeLocalTerraformDirectory()
+
     const zipBuffer = await zipDirectory(this.workDir)
     if (!zipBuffer) throw new Error("Couldn't upload directory to Terraform Cloud");
 
@@ -320,4 +325,12 @@ export class TerraformCloud implements Terraform {
     await Promise.race([ready(), timeout()]);
     logger.debug('Configuration Version is ready in Terraform Cloud');
   }
+
+  private removeLocalTerraformDirectory() {
+    try {
+      fs.rmdirSync(path.resolve(this.stack.synthesizedStackPath, ".terraform"), {recursive: true});
+    } catch (error) {
+      logger.debug(`Could not remove .terraform folder`, error);
+    }
+  }
 }

test/typescript/terraform-cloud/main.ts

@@ -5,6 +5,7 @@ import * as path from 'path';
 const token = process.env.TERRAFORM_CLOUD_TOKEN;
 const name = process.env.TERRAFORM_CLOUD_WORKSPACE_NAME;
 const organization = process.env.TERRAFORM_CLOUD_ORGANIZATION;
+const localExecution = process.env.TF_EXECUTE_LOCAL === "true";
 
 export class HelloTerra extends TerraformStack {
   constructor(scope: Construct, id: string) {
@@ -18,15 +19,17 @@ export class HelloTerra extends TerraformStack {
       }
     }]);
 
-    this.addOverride('terraform.backend', {
-      remote: {
-        organization,
-        workspaces: {
-          name
-        },
-        token
-      }
-    });
+    if (!localExecution) {
+      this.addOverride('terraform.backend', {
+        remote: {
+          organization,
+          workspaces: {
+            name
+          },
+          token
+        }
+      });
+    }
 
     new TerraformOutput(this, "output", {
       value: "constant value"

test/typescript/terraform-cloud/test.ts

@@ -48,4 +48,26 @@ describe("full integration test", () => {
     expect(driver.deploy()).toMatchSnapshot()
     await client.Workspaces.deleteByName(orgName, workspaceName)
   })
+
+  withAuth("deploy locally and then in Terraform Cloud", async () => {
+    const client = new TerraformCloud(TERRAFORM_CLOUD_TOKEN)
+
+    await client.Workspaces.create(orgName, {
+      data: {
+        attributes: {
+          name: workspaceName,
+          executionMode: 'remote',
+          terraformVersion: TERRAFORM_VERSION
+        },
+        type: 'workspaces'
+      }
+    })
+
+    process.env.TF_EXECUTE_LOCAL = "true";
+    driver.deploy();
+    process.env.TF_EXECUTE_LOCAL = undefined;
+    driver.deploy();
+
+    await client.Workspaces.deleteByName(orgName, workspaceName)
+  })
 })