Update deprecation message for google_project.skip_delete (#11397) (#…

…19042) [upstream:d043ef49759bae18370f33335319914b082b524a] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 8, 2024 · 372cf87 · 372cf87
1 parent 9995c48
commit 372cf87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.changelog/11397.txt b/.changelog/11397.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/google/services/resourcemanager/resource_google_project.go b/google/services/resourcemanager/resource_google_project.go
@@ -71,7 +71,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.`,

diff --git a/website/docs/r/google_project.html.markdown b/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.