From 4fe2eae3987a0704c77e83955c764d1c5703b119 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 8 Aug 2024 10:36:56 -0700 Subject: [PATCH 1/2] Update deprecation message for skip_delete --- .../services/resourcemanager/resource_google_project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go index 071704708070..5d6b3b1ec90d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go @@ -69,7 +69,7 @@ func ResourceGoogleProject() *schema.Resource { }, "skip_delete": { Type: schema.TypeBool, - Deprecated: `skip_delete is deprecated and will be removed in a future major release. The new release adds support for deletion_policy instead.`, + Deprecated: `skip_delete is deprecated and will be removed in 6.0.0. Please use deletion_policy instead. A skip_delete value of false can be changed to a deletion_policy value of DELETE and a skip_delete value of true to a deletion_policy value of ABANDON for equivalent behavior.`, Optional: true, Computed: true, Description: `If true, the Terraform resource can be deleted without deleting the Project via the Google API.`, From 743189409ff1c2eb331210b96f5b6b06bc6954b0 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 8 Aug 2024 10:38:38 -0700 Subject: [PATCH 2/2] Update google_project.html.markdown --- .../terraform/website/docs/r/google_project.html.markdown | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/website/docs/r/google_project.html.markdown b/mmv1/third_party/terraform/website/docs/r/google_project.html.markdown index a629c01e5a4d..fff53a4a8874 100644 --- a/mmv1/third_party/terraform/website/docs/r/google_project.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/google_project.html.markdown @@ -78,8 +78,11 @@ The following arguments are supported: See [Google Cloud Billing API Access Control](https://cloud.google.com/billing/docs/how-to/billing-access) for more details. -* `skip_delete` - (Optional) If true, the Terraform resource can be deleted - without deleting the Project via the Google API. `skip_delete` is deprecated and will be removed in a future major release. The new release adds support for `deletion_policy` instead. +* `skip_delete` - (Optional) If true, the Terraform resource can be deleted without + deleting the Project via the Google API. `skip_delete` is deprecated and will be + removed in 6.0.0. Please use deletion_policy instead. A `skip_delete` value of `false` + can be changed to a `deletion_policy` value of `DELETE` and a `skip_delete` value of `true` + to a `deletion_policy` value of `ABANDON` for equivalent behavior. * `labels` - (Optional) A set of key/value label pairs to assign to the project. **Note**: This field is non-authoritative, and will only manage the labels present in your configuration.