From f9d071ce089b1a66607f002185424ab0b4691792 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:21:56 -0500 Subject: [PATCH] revert: regression: remote ops detection TF v1.1 (#4169) (#4325) Reverts linter change from #3690 which breaks TF v1.1 detection Co-authored-by: Hans Arnholm --- server/core/runtime/plan_step_runner.go | 3 ++- server/core/runtime/plan_step_runner_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/core/runtime/plan_step_runner.go b/server/core/runtime/plan_step_runner.go index 64414ae324..b1cb66c1e4 100644 --- a/server/core/runtime/plan_step_runner.go +++ b/server/core/runtime/plan_step_runner.go @@ -294,9 +294,10 @@ locally at this time. // remoteOpsErr110 is the error terraform plan will return if this project is // using Terraform Cloud remote operations in TF 1.1.0 and above +// note: the trailing whitespace is intentional var remoteOpsErr110 = `╷ │ Error: Saving a generated plan is currently not supported -│ +│ │ Terraform Cloud does not support saving the generated execution plan │ locally at this time. ╵ diff --git a/server/core/runtime/plan_step_runner_test.go b/server/core/runtime/plan_step_runner_test.go index 6ec16ef0ca..f05336637c 100644 --- a/server/core/runtime/plan_step_runner_test.go +++ b/server/core/runtime/plan_step_runner_test.go @@ -357,7 +357,7 @@ locally at this time. tfVersion: "1.1.0", remoteOpsErr: `╷ │ Error: Saving a generated plan is currently not supported -│ +│ │ Terraform Cloud does not support saving the generated execution plan │ locally at this time. ╵