From 5981cd2bf7af70b9206bed9410f27bad1c240188 Mon Sep 17 00:00:00 2001 From: Sarah French <15078782+SarahFrench@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:16:30 +0100 Subject: [PATCH] Prepare main branch for post-v1.14 development (#37621) * Prepare main branch for post-v1.14 development * Update pull_request_template.md to reflect how main == v1.15 now --- .changes/{1.14.0.md => 1.15.0.md} | 0 .changes/previous-releases.md | 1 + .changes/v1.13/BUG FIXES-20250804-162137.yaml | 5 ---- .changes/v1.13/BUG FIXES-20250821-091753.yaml | 5 ---- .changes/v1.13/BUG FIXES-20250825-125018.yaml | 5 ---- .changes/v1.13/BUG FIXES-20250905-083104.yaml | 5 ---- .changes/v1.13/BUG FIXES-20250910-095424.yaml | 5 ---- .changes/v1.13/BUG FIXES-20250911-142038.yaml | 5 ---- .changes/v1.14/BUG FIXES-20250714-135938.yaml | 5 ---- .changes/v1.14/BUG FIXES-20250828-182746.yaml | 5 ---- .../v1.14/ENHANCEMENTS-20250723-122922.yaml | 5 ---- .../v1.14/ENHANCEMENTS-20250723-141420.yaml | 5 ---- .../v1.14/NEW FEATURES-20250829-151946.yaml | 5 ---- .../v1.14/NEW FEATURES-20250903-131921.yaml | 5 ---- .../v1.14/UPGRADE NOTES-20250814-162650.yaml | 5 ---- .../v1.14/UPGRADE NOTES-20250814-162752.yaml | 5 ---- .changes/v1.15/.gitkeep | 0 .changie.yaml | 2 +- .github/pull_request_template.md | 2 +- CHANGELOG.md | 29 ++----------------- internal/command/query_test.go | 6 ++-- version/VERSION | 2 +- 22 files changed, 10 insertions(+), 102 deletions(-) rename .changes/{1.14.0.md => 1.15.0.md} (100%) delete mode 100644 .changes/v1.13/BUG FIXES-20250804-162137.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250821-091753.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250825-125018.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250905-083104.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250910-095424.yaml delete mode 100644 .changes/v1.13/BUG FIXES-20250911-142038.yaml delete mode 100644 .changes/v1.14/BUG FIXES-20250714-135938.yaml delete mode 100644 .changes/v1.14/BUG FIXES-20250828-182746.yaml delete mode 100644 .changes/v1.14/ENHANCEMENTS-20250723-122922.yaml delete mode 100644 .changes/v1.14/ENHANCEMENTS-20250723-141420.yaml delete mode 100644 .changes/v1.14/NEW FEATURES-20250829-151946.yaml delete mode 100644 .changes/v1.14/NEW FEATURES-20250903-131921.yaml delete mode 100644 .changes/v1.14/UPGRADE NOTES-20250814-162650.yaml delete mode 100644 .changes/v1.14/UPGRADE NOTES-20250814-162752.yaml create mode 100644 .changes/v1.15/.gitkeep diff --git a/.changes/1.14.0.md b/.changes/1.15.0.md similarity index 100% rename from .changes/1.14.0.md rename to .changes/1.15.0.md diff --git a/.changes/previous-releases.md b/.changes/previous-releases.md index 9dbc3d6022..d3f9501009 100644 --- a/.changes/previous-releases.md +++ b/.changes/previous-releases.md @@ -1,3 +1,4 @@ +- [v1.14](https://github.com/hashicorp/terraform/blob/v1.14/CHANGELOG.md) - [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) diff --git a/.changes/v1.13/BUG FIXES-20250804-162137.yaml b/.changes/v1.13/BUG FIXES-20250804-162137.yaml deleted file mode 100644 index 2a9dbd238f..0000000000 --- a/.changes/v1.13/BUG FIXES-20250804-162137.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Fixes resource identity being dropped from state in certain cases -time: 2025-08-04T16:21:37.590435+02:00 -custom: - Issue: "37396" diff --git a/.changes/v1.13/BUG FIXES-20250821-091753.yaml b/.changes/v1.13/BUG FIXES-20250821-091753.yaml deleted file mode 100644 index d39012ed0c..0000000000 --- a/.changes/v1.13/BUG FIXES-20250821-091753.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Fix regression that caused `terraform test` with zero tests to return a non-zero exit code. -time: 2025-08-21T09:17:53.534792+02:00 -custom: - Issue: "37477" diff --git a/.changes/v1.13/BUG FIXES-20250825-125018.yaml b/.changes/v1.13/BUG FIXES-20250825-125018.yaml deleted file mode 100644 index 1d915d7d5a..0000000000 --- a/.changes/v1.13/BUG FIXES-20250825-125018.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'terraform test: prevent panic when resolving incomplete references' -time: 2025-08-25T12:50:18.511449+02:00 -custom: - Issue: "37484" diff --git a/.changes/v1.13/BUG FIXES-20250905-083104.yaml b/.changes/v1.13/BUG FIXES-20250905-083104.yaml deleted file mode 100644 index 0cbd970f74..0000000000 --- a/.changes/v1.13/BUG FIXES-20250905-083104.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: "test: Fix the order of execution of cleanup nodes" -time: 2025-09-05T08:31:04.56877+02:00 -custom: - Issue: "37546" diff --git a/.changes/v1.13/BUG FIXES-20250910-095424.yaml b/.changes/v1.13/BUG FIXES-20250910-095424.yaml deleted file mode 100644 index d34da5672b..0000000000 --- a/.changes/v1.13/BUG FIXES-20250910-095424.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'apply: hide sensitive inputs when values have changed between plan and apply' -time: 2025-09-10T09:54:24.889605+02:00 -custom: - Issue: "37582" diff --git a/.changes/v1.13/BUG FIXES-20250911-142038.yaml b/.changes/v1.13/BUG FIXES-20250911-142038.yaml deleted file mode 100644 index 4355a4c017..0000000000 --- a/.changes/v1.13/BUG FIXES-20250911-142038.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: 'variable validation: keep sensitive and ephemeral metadata when evaluating variable conditions.' -time: 2025-09-11T14:20:38.411183+02:00 -custom: - Issue: "37595" diff --git a/.changes/v1.14/BUG FIXES-20250714-135938.yaml b/.changes/v1.14/BUG FIXES-20250714-135938.yaml deleted file mode 100644 index 69b483e11a..0000000000 --- a/.changes/v1.14/BUG FIXES-20250714-135938.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Retrieve all workspace variables while doing a `terraform import`, include variables inherited from variable sets but not overwritten by the workspace. -time: 2025-07-14T13:59:38.867411+05:30 -custom: - Issue: "37241" diff --git a/.changes/v1.14/BUG FIXES-20250828-182746.yaml b/.changes/v1.14/BUG FIXES-20250828-182746.yaml deleted file mode 100644 index a7f07b433a..0000000000 --- a/.changes/v1.14/BUG FIXES-20250828-182746.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: BUG FIXES -body: Fix OSS backend proxy support by adding a proxy layer for OSS backend operations. Resolves hashicorp/terraform#36897. -time: 2025-08-28T18:27:46.867411+05:30 -custom: - Issue: "36897" \ No newline at end of file diff --git a/.changes/v1.14/ENHANCEMENTS-20250723-122922.yaml b/.changes/v1.14/ENHANCEMENTS-20250723-122922.yaml deleted file mode 100644 index 2738fafb61..0000000000 --- a/.changes/v1.14/ENHANCEMENTS-20250723-122922.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: 'terraform test: expected diagnostics will be included in test output when running in verbose mode"' -time: 2025-07-23T12:29:22.244611+02:00 -custom: - Issue: "37362" diff --git a/.changes/v1.14/ENHANCEMENTS-20250723-141420.yaml b/.changes/v1.14/ENHANCEMENTS-20250723-141420.yaml deleted file mode 100644 index 7edfaa2280..0000000000 --- a/.changes/v1.14/ENHANCEMENTS-20250723-141420.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: ENHANCEMENTS -body: 'terraform test: ignore prevent_destroy attribute during when cleaning up tests"' -time: 2025-07-23T14:14:20.602923+02:00 -custom: - Issue: "37364" diff --git a/.changes/v1.14/NEW FEATURES-20250829-151946.yaml b/.changes/v1.14/NEW FEATURES-20250829-151946.yaml deleted file mode 100644 index d59ca48e43..0000000000 --- a/.changes/v1.14/NEW FEATURES-20250829-151946.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: NEW FEATURES -body: A new GenerateResourceConfiguration RPC allows providers to create more precise configuration values during import. -time: 2025-08-29T15:19:46.781245-04:00 -custom: - Issue: "37515" diff --git a/.changes/v1.14/NEW FEATURES-20250903-131921.yaml b/.changes/v1.14/NEW FEATURES-20250903-131921.yaml deleted file mode 100644 index 6087d99b97..0000000000 --- a/.changes/v1.14/NEW FEATURES-20250903-131921.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: NEW FEATURES -body: "New top-level Actions block: Actions are provider defined and meant to codify use cases outside the normal CRUD model in your Terraform configuration. Providers can define Actions like `aws_lambda_invoke` or `aws_cloudfront_create_invalidation` that do something imparative outside of Terraforms normal CRUD model. You can configure such a side-effect with an action block and have actions triggered through the lifecycle of a resource or through passing the `-invoke` CLI flag." -time: 2025-09-03T13:19:21.097051+02:00 -custom: - Issue: "37553" diff --git a/.changes/v1.14/UPGRADE NOTES-20250814-162650.yaml b/.changes/v1.14/UPGRADE NOTES-20250814-162650.yaml deleted file mode 100644 index 17baa54cca..0000000000 --- a/.changes/v1.14/UPGRADE NOTES-20250814-162650.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: UPGRADE NOTES -body: 'The parallelism of Terraform operations within container runtimes may be reduced depending on the CPU bandwidth limit setting.' -time: 2025-08-14T16:26:50.569878+02:00 -custom: - Issue: "37436" diff --git a/.changes/v1.14/UPGRADE NOTES-20250814-162752.yaml b/.changes/v1.14/UPGRADE NOTES-20250814-162752.yaml deleted file mode 100644 index c42a78470c..0000000000 --- a/.changes/v1.14/UPGRADE NOTES-20250814-162752.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: UPGRADE NOTES -body: 'Building Terraform 1.14 requires macOS Monterey or later (due to being built on Go 1.25 which imposes these requirements)' -time: 2025-08-14T16:27:52.659896+02:00 -custom: - Issue: "37436" diff --git a/.changes/v1.15/.gitkeep b/.changes/v1.15/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.changie.yaml b/.changie.yaml index 063ce48dd3..831fe6fb5b 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BUSL-1.1 changesDir: .changes -unreleasedDir: v1.14 +unreleasedDir: v1.15 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 00f9ad48bb..0194cc47c3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -31,7 +31,7 @@ label to enable the backport bot. --> -1.14.x +1.15.x ## Rollback Plan diff --git a/CHANGELOG.md b/CHANGELOG.md index 002c7e0fc3..0b436edc33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,30 +1,4 @@ -## 1.14.0 (Unreleased) - - -NEW FEATURES: - -* A new GenerateResourceConfiguration RPC allows providers to create more precise configuration values during import. ([#37515](https://github.com/hashicorp/terraform/issues/37515)) - - -ENHANCEMENTS: - -* terraform test: expected diagnostics will be included in test output when running in verbose mode" ([#37362](https://github.com/hashicorp/terraform/issues/37362)) - -* terraform test: ignore prevent_destroy attribute during when cleaning up tests" ([#37364](https://github.com/hashicorp/terraform/issues/37364)) - - -BUG FIXES: - -* Retrieve all workspace variables while doing a `terraform import`, include variables inherited from variable sets but not overwritten by the workspace. ([#37241](https://github.com/hashicorp/terraform/issues/37241)) - -* Fix OSS backend proxy support by adding a proxy layer for OSS backend operations. Resolves hashicorp/terraform#36897. ([#36897](https://github.com/hashicorp/terraform/issues/36897)) - - -UPGRADE NOTES: - -* The parallelism of Terraform operations within container runtimes may be reduced depending on the CPU bandwidth limit setting. ([#37436](https://github.com/hashicorp/terraform/issues/37436)) - -* Building Terraform 1.14 requires macOS Monterey or later (due to being built on Go 1.25 which imposes these requirements) ([#37436](https://github.com/hashicorp/terraform/issues/37436)) +## 1.15.0 (Unreleased) EXPERIMENTS: @@ -41,6 +15,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.14](https://github.com/hashicorp/terraform/blob/v1.14/CHANGELOG.md) - [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) diff --git a/internal/command/query_test.go b/internal/command/query_test.go index c95b91c5c4..864194988f 100644 --- a/internal/command/query_test.go +++ b/internal/command/query_test.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" testing_provider "github.com/hashicorp/terraform/internal/providers/testing" + tfversion "github.com/hashicorp/terraform/version" "github.com/zclconf/go-cty/cty" ) @@ -782,6 +783,7 @@ func TestQuery_JSON(t *testing.T) { func TestQuery_JSON_Raw(t *testing.T) { + tfVer := tfversion.String() tests := []struct { name string directory string @@ -793,7 +795,7 @@ func TestQuery_JSON_Raw(t *testing.T) { { name: "basic query", directory: "basic", - expectedOut: `{"@level":"info","@message":"Terraform 1.14.0-dev","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.596469+02:00","terraform":"1.14.0-dev","type":"version","ui":"1.2"} + expectedOut: `{"@level":"info","@message":"Terraform ` + tfVer + `","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.596469+02:00","terraform":"1.14.0-dev","type":"version","ui":"1.2"} {"@level":"info","@message":"list.test_instance.example: Starting query...","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600609+02:00","list_start":{"address":"list.test_instance.example","resource_type":"test_instance","input_config":{"ami":"ami-12345","foo":null}},"type":"list_start"} {"@level":"info","@message":"list.test_instance.example: Result found","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600729+02:00","list_resource_found":{"address":"list.test_instance.example","display_name":"Test Instance 1","identity":{"id":"test-instance-1"},"identity_version":1,"resource_type":"test_instance","resource_object":{"ami":"ami-12345","id":"test-instance-1"}},"type":"list_resource_found"} {"@level":"info","@message":"list.test_instance.example: Result found","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600759+02:00","list_resource_found":{"address":"list.test_instance.example","display_name":"Test Instance 2","identity":{"id":"test-instance-2"},"identity_version":1,"resource_type":"test_instance","resource_object":{"ami":"ami-67890","id":"test-instance-2"}},"type":"list_resource_found"} @@ -803,7 +805,7 @@ func TestQuery_JSON_Raw(t *testing.T) { { name: "empty result", directory: "empty-result", - expectedOut: `{"@level":"info","@message":"Terraform 1.14.0-dev","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.596469+02:00","terraform":"1.14.0-dev","type":"version","ui":"1.2"} + expectedOut: `{"@level":"info","@message":"Terraform ` + tfVer + `","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.596469+02:00","terraform":"1.14.0-dev","type":"version","ui":"1.2"} {"@level":"info","@message":"list.test_instance.example: Starting query...","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600609+02:00","list_start":{"address":"list.test_instance.example","resource_type":"test_instance","input_config":{"ami":"ami-12345","foo":null}},"type":"list_start"} {"@level":"info","@message":"list.test_instance.example: Result found","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600729+02:00","list_resource_found":{"address":"list.test_instance.example","display_name":"Test Instance 1","identity":{"id":"test-instance-1"},"identity_version":1,"resource_type":"test_instance","resource_object":{"ami":"ami-12345","id":"test-instance-1"}},"type":"list_resource_found"} {"@level":"info","@message":"list.test_instance.example: Result found","@module":"terraform.ui","@timestamp":"2025-09-12T16:52:57.600759+02:00","list_resource_found":{"address":"list.test_instance.example","display_name":"Test Instance 2","identity":{"id":"test-instance-2"},"identity_version":1,"resource_type":"test_instance","resource_object":{"ami":"ami-67890","id":"test-instance-2"}},"type":"list_resource_found"} diff --git a/version/VERSION b/version/VERSION index 2f2e08cfa3..9a4866bbce 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -1.14.0-dev +1.15.0-dev