From 5cf58457bbd6c8e58b7c400de13726c057a1605a Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Thu, 5 Aug 2021 14:41:08 -0700 Subject: [PATCH 1/6] 3.79.0 changelogs --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 629a5445ee7..ecd888b933f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,19 @@ ## 3.79.0 (Unreleased) +UNKNOWN CHANGELOG TYPE: +* Fix format for import in google_service_networking_connection ([#9681](https://github.com/hashicorp/terraform-provider-google/pull/9681)) +* Update DCL to fix worker pool issues ([#9710](https://github.com/hashicorp/terraform-provider-google/pull/9710)) +* resource_storage_bucket_object: added support for Customer Supplied E… ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) +NOTES: +* spanner: `num_nodes` will become a required field in the next major release and a value has to be set on `google_spanner_instance`. It will also conflict with the new field `processing_units`. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) + +FEATURES: +* **New Resource:** `google_dialogflow_cx_entity_type` ([#9717](https://github.com/hashicorp/terraform-provider-google/pull/9717)) +* **New Resource:** `google_dialogflow_cx_page` ([#9683](https://github.com/hashicorp/terraform-provider-google/pull/9683)) + +IMPROVEMENTS: +* all (DCL resources only): ignore diff after apply errors coming from the DCL ([#9701](https://github.com/hashicorp/terraform-provider-google/pull/9701)) +* container: added `network_config` block to `google_container_node_pool` resource (beta) ([#9707](https://github.com/hashicorp/terraform-provider-google/pull/9707)) +* spanner: added `processing_units` to `google_spanner_instance`. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) ## 3.78.0 (August 2, 2021) FEATURES: From 7955315b14fd55edb5600da892ab649e1d595f98 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Thu, 5 Aug 2021 17:57:49 -0700 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd888b933f..c586f182921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,4 @@ ## 3.79.0 (Unreleased) -UNKNOWN CHANGELOG TYPE: -* Fix format for import in google_service_networking_connection ([#9681](https://github.com/hashicorp/terraform-provider-google/pull/9681)) -* Update DCL to fix worker pool issues ([#9710](https://github.com/hashicorp/terraform-provider-google/pull/9710)) -* resource_storage_bucket_object: added support for Customer Supplied E… ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) NOTES: * spanner: `num_nodes` will become a required field in the next major release and a value has to be set on `google_spanner_instance`. It will also conflict with the new field `processing_units`. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) @@ -13,7 +9,8 @@ FEATURES: IMPROVEMENTS: * all (DCL resources only): ignore diff after apply errors coming from the DCL ([#9701](https://github.com/hashicorp/terraform-provider-google/pull/9701)) * container: added `network_config` block to `google_container_node_pool` resource (beta) ([#9707](https://github.com/hashicorp/terraform-provider-google/pull/9707)) -* spanner: added `processing_units` to `google_spanner_instance`. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) +* spanner: added `processing_units` to `google_spanner_instance` ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) +* storage: added support for Customer Supplied Encryption on `resource_storage_bucket_object` ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) ## 3.78.0 (August 2, 2021) FEATURES: From f290f3a3c7172e358e11d8025754e1c3b675eccd Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Thu, 5 Aug 2021 17:59:36 -0700 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c586f182921..a358c5ff779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ IMPROVEMENTS: * all (DCL resources only): ignore diff after apply errors coming from the DCL ([#9701](https://github.com/hashicorp/terraform-provider-google/pull/9701)) * container: added `network_config` block to `google_container_node_pool` resource (beta) ([#9707](https://github.com/hashicorp/terraform-provider-google/pull/9707)) * spanner: added `processing_units` to `google_spanner_instance` ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) -* storage: added support for Customer Supplied Encryption on `resource_storage_bucket_object` ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) +* storage: added support for `customer_encryption` on `resource_storage_bucket_object` ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) ## 3.78.0 (August 2, 2021) FEATURES: From b1c7e70d942b676a73671d1f92c0000dbe4f72bb Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Fri, 6 Aug 2021 12:01:52 -0700 Subject: [PATCH 4/6] Update CHANGELOG.md remove dcl and beta only field --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a358c5ff779..6ff071b34ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,6 @@ FEATURES: * **New Resource:** `google_dialogflow_cx_page` ([#9683](https://github.com/hashicorp/terraform-provider-google/pull/9683)) IMPROVEMENTS: -* all (DCL resources only): ignore diff after apply errors coming from the DCL ([#9701](https://github.com/hashicorp/terraform-provider-google/pull/9701)) -* container: added `network_config` block to `google_container_node_pool` resource (beta) ([#9707](https://github.com/hashicorp/terraform-provider-google/pull/9707)) * spanner: added `processing_units` to `google_spanner_instance` ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) * storage: added support for `customer_encryption` on `resource_storage_bucket_object` ([#9704](https://github.com/hashicorp/terraform-provider-google/pull/9704)) From b22228a59dce1e40776a85efbb0eefc69d957228 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Mon, 9 Aug 2021 10:08:11 -0700 Subject: [PATCH 5/6] Update CHANGELOG.md Co-authored-by: Riley Karson --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff071b34ce..a65199f2076 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 3.79.0 (Unreleased) NOTES: -* spanner: `num_nodes` will become a required field in the next major release and a value has to be set on `google_spanner_instance`. It will also conflict with the new field `processing_units`. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) +* spanner: The `num_nodes` field on `google_spanner_instance` will have its default removed in a future major release, and either `num_nodes or `processing_units` will be required. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) FEATURES: * **New Resource:** `google_dialogflow_cx_entity_type` ([#9717](https://github.com/hashicorp/terraform-provider-google/pull/9717)) From 8ade4c0e8263c42f4023fcccf04d8efe05740067 Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Mon, 9 Aug 2021 12:29:57 -0500 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a65199f2076..ef6ab672eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 3.79.0 (Unreleased) NOTES: -* spanner: The `num_nodes` field on `google_spanner_instance` will have its default removed in a future major release, and either `num_nodes or `processing_units` will be required. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) +* spanner: The `num_nodes` field on `google_spanner_instance` will have its default removed in a future major release, and either `num_nodes` or `processing_units` will be required. ([#9716](https://github.com/hashicorp/terraform-provider-google/pull/9716)) FEATURES: * **New Resource:** `google_dialogflow_cx_entity_type` ([#9717](https://github.com/hashicorp/terraform-provider-google/pull/9717))