From 5437cd7c8a5947b5132997d8cf6cd2d7a0756818 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 9 Jul 2025 17:42:04 +0100 Subject: [PATCH] Prepare main branch for 1.14 development (cleanup) (#37312) * Prepare main branch for 1.14 development (cleanup) * fix version-dependent tests * update PR template --- .changes/{1.13.0.md => 1.14.0.md} | 0 .changes/previous-releases.md | 1 + .changes/v1.11/BUG FIXES-20250402-143931.yaml | 5 -- .changes/v1.12/BUG FIXES-20250514-112152.yaml | 5 -- .changes/v1.12/BUG FIXES-20250514-184357.yaml | 5 -- .changes/v1.12/BUG FIXES-20250516-114251.yaml | 5 -- .changes/v1.12/BUG FIXES-20250604-131240.yaml | 5 -- .../v1.12/ENHANCEMENTS-20250303-171838.yaml | 5 -- .../v1.12/ENHANCEMENTS-20250417-182036.yaml | 5 -- .../v1.12/NEW FEATURES-20250410-154805.yaml | 5 -- .changes/v1.13/BUG FIXES-20250529-163449.yaml | 5 -- .changes/v1.13/BUG FIXES-20250604-144021.yaml | 5 -- .changes/v1.13/BUG FIXES-20250623-125514.yaml | 5 -- .changes/v1.13/BUG FIXES-20250626-140248.yaml | 5 -- .changes/v1.13/BUG FIXES-20250704-170221.yaml | 5 -- .changes/v1.13/BUG FIXES-20250704-182248.yaml | 5 -- .changes/v1.13/BUG FIXES-20250707-161450.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250508-130135.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250520-155148.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250522-093102.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250527-095755.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250602-152211.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250604-102932.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250627-094638.yaml | 5 -- .../v1.13/ENHANCEMENTS-20250707-161113.yaml | 5 -- .../v1.13/NEW FEATURES-20250513-132953.yaml | 5 -- .changes/v1.13/NOTES-20250515-151922.yaml | 5 -- .../v1.13/UPGRADE NOTES-20250602-152009.yaml | 5 -- .changes/v1.14/.gitkeep | 0 .changie.yaml | 2 +- .github/pull_request_template.md | 2 +- CHANGELOG.md | 48 +------------------ .../command/workdir/backend_state_test.go | 7 +-- version/VERSION | 2 +- 34 files changed, 10 insertions(+), 182 deletions(-) rename .changes/{1.13.0.md => 1.14.0.md} (100%) delete mode 100644 .changes/v1.11/BUG FIXES-20250402-143931.yaml delete mode 100644 .changes/v1.12/BUG FIXES-20250514-112152.yaml delete mode 100644 .changes/v1.12/BUG FIXES-20250514-184357.yaml delete mode 100644 .changes/v1.12/BUG FIXES-20250516-114251.yaml delete mode 100644 .changes/v1.12/BUG FIXES-20250604-131240.yaml delete mode 100644 .changes/v1.12/ENHANCEMENTS-20250303-171838.yaml delete mode 100644 .changes/v1.12/ENHANCEMENTS-20250417-182036.yaml delete mode 100644 .changes/v1.12/NEW FEATURES-20250410-154805.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250529-163449.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250604-144021.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250623-125514.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250626-140248.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250704-170221.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250704-182248.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250707-161450.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250508-130135.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250520-155148.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250522-093102.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250527-095755.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250602-152211.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250604-102932.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250627-094638.yaml delete mode 100644 .changes/v1.13/ENHANCEMENTS-20250707-161113.yaml delete mode 100644 .changes/v1.13/NEW FEATURES-20250513-132953.yaml delete mode 100644 .changes/v1.13/NOTES-20250515-151922.yaml delete mode 100644 .changes/v1.13/UPGRADE NOTES-20250602-152009.yaml create mode 100644 .changes/v1.14/.gitkeep diff --git a/.changes/1.13.0.md b/.changes/1.14.0.md similarity index 100% rename from .changes/1.13.0.md rename to .changes/1.14.0.md diff --git a/.changes/previous-releases.md b/.changes/previous-releases.md index e0843cb107..9dbc3d6022 100644 --- a/.changes/previous-releases.md +++ b/.changes/previous-releases.md @@ -1,3 +1,4 @@ +- [v1.13](https://github.com/hashicorp/terraform/blob/v1.13/CHANGELOG.md) - [v1.12](https://github.com/hashicorp/terraform/blob/v1.12/CHANGELOG.md) - [v1.11](https://github.com/hashicorp/terraform/blob/v1.11/CHANGELOG.md) - [v1.10](https://github.com/hashicorp/terraform/blob/v1.10/CHANGELOG.md) diff --git a/.changes/v1.11/BUG FIXES-20250402-143931.yaml b/.changes/v1.11/BUG FIXES-20250402-143931.yaml deleted file mode 100644 index 4971dd6277..0000000000 --- a/.changes/v1.11/BUG FIXES-20250402-143931.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'write-only attributes: internal providers should set write-only attributes to null' -time: 2025-04-02T14:39:31.672249+02:00 -custom: - Issue: "36824" diff --git a/.changes/v1.12/BUG FIXES-20250514-112152.yaml b/.changes/v1.12/BUG FIXES-20250514-112152.yaml deleted file mode 100644 index 0eeaa3f67c..0000000000 --- a/.changes/v1.12/BUG FIXES-20250514-112152.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Include resource identity in import apply UI output -time: 2025-05-14T11:21:52.75746+02:00 -custom: - Issue: "37044" diff --git a/.changes/v1.12/BUG FIXES-20250514-184357.yaml b/.changes/v1.12/BUG FIXES-20250514-184357.yaml deleted file mode 100644 index c002bf8d6e..0000000000 --- a/.changes/v1.12/BUG FIXES-20250514-184357.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Fix regression during provider installation by reverting back to not sending HEAD requests. -time: 2025-05-14T18:43:57.332193-04:00 -custom: - Issue: "36998" diff --git a/.changes/v1.12/BUG FIXES-20250516-114251.yaml b/.changes/v1.12/BUG FIXES-20250516-114251.yaml deleted file mode 100644 index 2a1252eaf4..0000000000 --- a/.changes/v1.12/BUG FIXES-20250516-114251.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Avoid crash on test failure in comparison in function call -time: 2025-05-16T11:42:51.289379+01:00 -custom: - Issue: "37071" diff --git a/.changes/v1.12/BUG FIXES-20250604-131240.yaml b/.changes/v1.12/BUG FIXES-20250604-131240.yaml deleted file mode 100644 index 8c8cf6b428..0000000000 --- a/.changes/v1.12/BUG FIXES-20250604-131240.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: partial ephemeral values were rejected in ephemeral outputs -time: 2025-06-04T13:12:40.440242-04:00 -custom: - Issue: "37210" diff --git a/.changes/v1.12/ENHANCEMENTS-20250303-171838.yaml b/.changes/v1.12/ENHANCEMENTS-20250303-171838.yaml deleted file mode 100644 index 2669acf1d5..0000000000 --- a/.changes/v1.12/ENHANCEMENTS-20250303-171838.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: 'backend/oss: Supports more standard environment variables to keep same with provider setting' -time: 2025-03-03T17:18:38.679213+08:00 -custom: - Issue: "36581" diff --git a/.changes/v1.12/ENHANCEMENTS-20250417-182036.yaml b/.changes/v1.12/ENHANCEMENTS-20250417-182036.yaml deleted file mode 100644 index 5237a73160..0000000000 --- a/.changes/v1.12/ENHANCEMENTS-20250417-182036.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: '`import` blocks: Now support importing a resource via a new identity attribute. This is mutually exclusive with the `id` attribute' -time: 2025-04-17T18:20:36.814657+02:00 -custom: - Issue: "36703" diff --git a/.changes/v1.12/NEW FEATURES-20250410-154805.yaml b/.changes/v1.12/NEW FEATURES-20250410-154805.yaml deleted file mode 100644 index f4fa50a042..0000000000 --- a/.changes/v1.12/NEW FEATURES-20250410-154805.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: NEW FEATURES -body: Added Terraform backend implementation for OCI Object Storage -time: 2025-04-10T15:48:05.919664+05:30 -custom: - Issue: "34465" diff --git a/.changes/v1.13/BUG FIXES-20250529-163449.yaml b/.changes/v1.13/BUG FIXES-20250529-163449.yaml deleted file mode 100644 index f5b2592ae8..0000000000 --- a/.changes/v1.13/BUG FIXES-20250529-163449.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'Added a missing warning diagnostic that alerts users when child module contains an ignored `cloud` block.' -time: 2025-05-29T16:34:49.041168+01:00 -custom: - Issue: "37180" diff --git a/.changes/v1.13/BUG FIXES-20250604-144021.yaml b/.changes/v1.13/BUG FIXES-20250604-144021.yaml deleted file mode 100644 index 21bd5249b7..0000000000 --- a/.changes/v1.13/BUG FIXES-20250604-144021.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Nested module outputs could lose sensitivity, even when marked as such in the configuration -time: 2025-06-04T14:40:21.12567-04:00 -custom: - Issue: "37212" diff --git a/.changes/v1.13/BUG FIXES-20250623-125514.yaml b/.changes/v1.13/BUG FIXES-20250623-125514.yaml deleted file mode 100644 index 22ee097380..0000000000 --- a/.changes/v1.13/BUG FIXES-20250623-125514.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'workspace: Updated validation to reject workspaces named ""' -time: 2025-06-23T12:55:14.226554+01:00 -custom: - Issue: "37267" diff --git a/.changes/v1.13/BUG FIXES-20250626-140248.yaml b/.changes/v1.13/BUG FIXES-20250626-140248.yaml deleted file mode 100644 index 80affc05b4..0000000000 --- a/.changes/v1.13/BUG FIXES-20250626-140248.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'workspace: Updated the `workspace delete` command to reject `""` as an invalid workspace name' -time: 2025-06-26T14:02:48.899952+01:00 -custom: - Issue: "37275" diff --git a/.changes/v1.13/BUG FIXES-20250704-170221.yaml b/.changes/v1.13/BUG FIXES-20250704-170221.yaml deleted file mode 100644 index 10cb6aec90..0000000000 --- a/.changes/v1.13/BUG FIXES-20250704-170221.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'plan: truncate invalid or dynamic references in the relevant attributes' -time: 2025-07-04T17:02:21.289541+02:00 -custom: - Issue: "37290" diff --git a/.changes/v1.13/BUG FIXES-20250704-182248.yaml b/.changes/v1.13/BUG FIXES-20250704-182248.yaml deleted file mode 100644 index bf922073f2..0000000000 --- a/.changes/v1.13/BUG FIXES-20250704-182248.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Test run Parallelism of 1 should not result in deadlock -time: 2025-07-04T18:22:48.934287+02:00 -custom: - Issue: "37292" diff --git a/.changes/v1.13/BUG FIXES-20250707-161450.yaml b/.changes/v1.13/BUG FIXES-20250707-161450.yaml deleted file mode 100644 index d4d74425ef..0000000000 --- a/.changes/v1.13/BUG FIXES-20250707-161450.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'static validation: detect invalid static references via indexes on objects.' -time: 2025-07-07T16:14:50.162197+02:00 -custom: - Issue: "37298" diff --git a/.changes/v1.13/ENHANCEMENTS-20250508-130135.yaml b/.changes/v1.13/ENHANCEMENTS-20250508-130135.yaml deleted file mode 100644 index 60eb0e653c..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250508-130135.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: Filesystem functions are now checked for consistent results to catch invalid data during apply -time: 2025-05-08T13:01:35.450576-04:00 -custom: - Issue: "37001" diff --git a/.changes/v1.13/ENHANCEMENTS-20250520-155148.yaml b/.changes/v1.13/ENHANCEMENTS-20250520-155148.yaml deleted file mode 100644 index d2debad34e..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250520-155148.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: Allow successful init when provider constraint matches at least one valid version -time: 2025-05-20T15:51:48.961362+02:00 -custom: - Issue: "37137" diff --git a/.changes/v1.13/ENHANCEMENTS-20250522-093102.yaml b/.changes/v1.13/ENHANCEMENTS-20250522-093102.yaml deleted file mode 100644 index 5363103a43..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250522-093102.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: Performance fix for evaluating high cardinality resources -time: 2025-05-22T09:31:02.761383-04:00 -custom: - Issue: "26355" diff --git a/.changes/v1.13/ENHANCEMENTS-20250527-095755.yaml b/.changes/v1.13/ENHANCEMENTS-20250527-095755.yaml deleted file mode 100644 index 7426da9da3..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250527-095755.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: ' TF Test: Allow parallel execution of teardown operations' -time: 2025-05-27T09:57:55.267277+02:00 -custom: - Issue: "37169" diff --git a/.changes/v1.13/ENHANCEMENTS-20250602-152211.yaml b/.changes/v1.13/ENHANCEMENTS-20250602-152211.yaml deleted file mode 100644 index 4bc92af913..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250602-152211.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: '`terraform test`: Test authors can now specify definitions for external variables that are referenced within test files directly within the test file itself.' -time: 2025-06-02T15:22:11.453413+02:00 -custom: - Issue: "37195" diff --git a/.changes/v1.13/ENHANCEMENTS-20250604-102932.yaml b/.changes/v1.13/ENHANCEMENTS-20250604-102932.yaml deleted file mode 100644 index b08231bcb4..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250604-102932.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: '`terraform test`: File-level variable blocks can now reference run outputs and other variables."' -time: 2025-06-04T10:29:32.311469+02:00 -custom: - Issue: "37205" diff --git a/.changes/v1.13/ENHANCEMENTS-20250627-094638.yaml b/.changes/v1.13/ENHANCEMENTS-20250627-094638.yaml deleted file mode 100644 index d76e1bfb64..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250627-094638.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: skip redundant comparisons when comparing planned set changes -time: 2025-06-27T09:46:38.899237-04:00 -custom: - Issue: "37280" diff --git a/.changes/v1.13/ENHANCEMENTS-20250707-161113.yaml b/.changes/v1.13/ENHANCEMENTS-20250707-161113.yaml deleted file mode 100644 index 5d388448bc..0000000000 --- a/.changes/v1.13/ENHANCEMENTS-20250707-161113.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: 'type checking: improve error message on type mismatches.' -time: 2025-07-07T16:11:13.755853+02:00 -custom: - Issue: "37298" diff --git a/.changes/v1.13/NEW FEATURES-20250513-132953.yaml b/.changes/v1.13/NEW FEATURES-20250513-132953.yaml deleted file mode 100644 index 6c81eabd0d..0000000000 --- a/.changes/v1.13/NEW FEATURES-20250513-132953.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: NEW FEATURES -body: 'The new command `terraform stacks` exposes some stack operations through the cli. The available subcommands depend on the stacks plugin implementation. Use `terraform stacks -help` to see available commands.' -time: 2025-05-13T13:29:53.189733-04:00 -custom: - Issue: "36931" diff --git a/.changes/v1.13/NOTES-20250515-151922.yaml b/.changes/v1.13/NOTES-20250515-151922.yaml deleted file mode 100644 index 87ef6f8852..0000000000 --- a/.changes/v1.13/NOTES-20250515-151922.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: NOTES -body: The command `terraform rpcapi` is now generally available. It is not intended for public consumption, but exposes certain Terraform operations through an RPC interface compatible with [go-plugin](https://github.com/hashicorp/go-plugin). -time: 2025-05-15T15:19:22.219798+02:00 -custom: - Issue: "37067" diff --git a/.changes/v1.13/UPGRADE NOTES-20250602-152009.yaml b/.changes/v1.13/UPGRADE NOTES-20250602-152009.yaml deleted file mode 100644 index f159eb77cc..0000000000 --- a/.changes/v1.13/UPGRADE NOTES-20250602-152009.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: UPGRADE NOTES -body: '`terraform test`: External variables referenced within test files should now be accompanied by a `variable` definition block within the test file. This is optional, but users with complex external variables may see error diagnostics without the additional variable definition.' -time: 2025-06-02T15:20:09.188388+02:00 -custom: - Issue: "37195" diff --git a/.changes/v1.14/.gitkeep b/.changes/v1.14/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.changie.yaml b/.changie.yaml index ea6357b52b..063ce48dd3 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BUSL-1.1 changesDir: .changes -unreleasedDir: v1.13 +unreleasedDir: v1.14 versionFooterPath: version_footer.tpl.md changelogPath: CHANGELOG.md versionExt: md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b13d37dbae..00f9ad48bb 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -31,7 +31,7 @@ label to enable the backport bot. --> -1.13.x +1.14.x ## Rollback Plan diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dd2003601..4561358712 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,49 +1,4 @@ -## 1.13.0 (Unreleased) - - -NEW FEATURES: - -* The new command `terraform stacks` exposes some stack operations through the cli. The available subcommands depend on the stacks plugin implementation. Use `terraform stacks -help` to see available commands. ([#36931](https://github.com/hashicorp/terraform/issues/36931)) - - -ENHANCEMENTS: - -* Filesystem functions are now checked for consistent results to catch invalid data during apply ([#37001](https://github.com/hashicorp/terraform/issues/37001)) - -* Allow successful init when provider constraint matches at least one valid version ([#37137](https://github.com/hashicorp/terraform/issues/37137)) - -* Performance fix for evaluating high cardinality resources ([#26355](https://github.com/hashicorp/terraform/issues/26355)) - -* TF Test: Allow parallel execution of teardown operations ([#37169](https://github.com/hashicorp/terraform/issues/37169)) - -* `terraform test`: Test authors can now specify definitions for external variables that are referenced within test files directly within the test file itself. ([#37195](https://github.com/hashicorp/terraform/issues/37195)) - -* `terraform test`: File-level variable blocks can now reference run outputs and other variables." ([#37205](https://github.com/hashicorp/terraform/issues/37205)) - -* skip redundant comparisons when comparing planned set changes ([#37280](https://github.com/hashicorp/terraform/issues/37280)) - - -BUG FIXES: - -* Added a missing warning diagnostic that alerts users when child module contains an ignored `cloud` block. ([#37180](https://github.com/hashicorp/terraform/issues/37180)) - -* Nested module outputs could lose sensitivity, even when marked as such in the configuration ([#37212](https://github.com/hashicorp/terraform/issues/37212)) - -* workspace: Updated validation to reject workspaces named "" ([#37267](https://github.com/hashicorp/terraform/issues/37267)) - -* workspace: Updated the `workspace delete` command to reject `""` as an invalid workspace name ([#37275](https://github.com/hashicorp/terraform/issues/37275)) - -* Test run Parallelism of 1 should not result in deadlock ([#37292](https://github.com/hashicorp/terraform/issues/37292)) - - -NOTES: - -* The command `terraform rpcapi` is now generally available. It is not intended for public consumption, but exposes certain Terraform operations through an RPC interface compatible with [go-plugin](https://github.com/hashicorp/go-plugin). ([#37067](https://github.com/hashicorp/terraform/issues/37067)) - - -UPGRADE NOTES: - -* `terraform test`: External variables referenced within test files should now be accompanied by a `variable` definition block within the test file. This is optional, but users with complex external variables may see error diagnostics without the additional variable definition. ([#37195](https://github.com/hashicorp/terraform/issues/37195)) +## 1.14.0 (Unreleased) EXPERIMENTS: @@ -56,6 +11,7 @@ Experiments are only enabled in alpha releases of Terraform CLI. The following f For information on prior major and minor releases, refer to their changelogs: +- [v1.13](https://github.com/hashicorp/terraform/blob/v1.13/CHANGELOG.md) - [v1.12](https://github.com/hashicorp/terraform/blob/v1.12/CHANGELOG.md) - [v1.11](https://github.com/hashicorp/terraform/blob/v1.11/CHANGELOG.md) - [v1.10](https://github.com/hashicorp/terraform/blob/v1.10/CHANGELOG.md) diff --git a/internal/command/workdir/backend_state_test.go b/internal/command/workdir/backend_state_test.go index 4efb5c0ead..e752729de3 100644 --- a/internal/command/workdir/backend_state_test.go +++ b/internal/command/workdir/backend_state_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/terraform/version" ) func TestParseBackendStateFile(t *testing.T) { @@ -152,7 +153,7 @@ func TestParseBackendStateFile(t *testing.T) { } func TestEncodeBackendStateFile(t *testing.T) { - + tfVersion := version.Version tests := map[string]struct { Input *BackendStateFile Want []byte @@ -167,11 +168,11 @@ func TestEncodeBackendStateFile(t *testing.T) { Hash: 123, }, }, - Want: []byte("{\n \"version\": 3,\n \"terraform_version\": \"1.13.0\",\n \"state_store\": {\n \"type\": \"foobar_baz\",\n \"provider\": {\n \"version\": \"1.2.3\",\n \"source\": \"registry.terraform.io/my-org/foobar\",\n \"config\": {\n \"foo\": \"bar\"\n }\n },\n \"config\": {\n \"foo\": \"bar\"\n },\n \"hash\": 123\n }\n}"), + Want: []byte("{\n \"version\": 3,\n \"terraform_version\": \"" + tfVersion + "\",\n \"state_store\": {\n \"type\": \"foobar_baz\",\n \"provider\": {\n \"version\": \"1.2.3\",\n \"source\": \"registry.terraform.io/my-org/foobar\",\n \"config\": {\n \"foo\": \"bar\"\n }\n },\n \"config\": {\n \"foo\": \"bar\"\n },\n \"hash\": 123\n }\n}"), }, "it returns an error when neither backend nor state_store config state are present": { Input: &BackendStateFile{}, - Want: []byte("{\n \"version\": 3,\n \"terraform_version\": \"1.13.0\"\n}"), + Want: []byte("{\n \"version\": 3,\n \"terraform_version\": \"" + tfVersion + "\"\n}"), }, "it returns an error when the provider source's hostname is missing": { Input: &BackendStateFile{ diff --git a/version/VERSION b/version/VERSION index a4ab692a5f..2f2e08cfa3 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -1.13.0-dev +1.14.0-dev