Add warnings to legacy Org Policy resources (GoogleCloudPlatform#5222)

* allow disabling service accounts Co-authored-by: upodroid <[email protected]> * fix typos * revert warning change * add orgpolicy warnings Co-authored-by: upodroid <[email protected]>
khajduczenia · Oct 12, 2021 · 4110e2a · 4110e2a
1 parent 5ee58fd
commit 4110e2a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/..._party/terraform/website/docs/r/google_folder_organization_policy.html.markdown b/..._party/terraform/website/docs/r/google_folder_organization_policy.html.markdown
@@ -9,9 +9,15 @@ description: |-
 
 # google\_folder\_organization\_policy
 
-Allows management of Organization policies for a Google Folder. For more information see
-[the official documentation](https://cloud.google.com/resource-manager/docs/organization-policy/overview) and
-[API](https://cloud.google.com/resource-manager/reference/rest/v1/folders/setOrgPolicy).
+Allows management of Organization Policies for a Google Cloud Folder. 
+
+~> **Warning:** This resource has been superseded by `google_org_policy_policy`. `google_org_policy_policy` uses Organization Policy API V2 instead of Cloud Resource Manager API V1 and it supports additional features such as tags and conditions.
+
+To get more information about Organization Policies, see:
+
+* [API documentation](https://cloud.google.com/resource-manager/reference/rest/v1/folders/setOrgPolicy)
+* How-to Guides
+    * [Introduction to the Organization Policy Service](https://cloud.google.com/resource-manager/docs/organization-policy/overview)
 
 ## Example Usage
 

diff --git a/mmv1/third_party/terraform/website/docs/r/google_organization_policy.html.markdown b/mmv1/third_party/terraform/website/docs/r/google_organization_policy.html.markdown
@@ -9,10 +9,15 @@ description: |-
 
 # google\_organization\_policy
 
-Allows management of Organization policies for a Google Organization. For more information see
-[the official
-documentation](https://cloud.google.com/resource-manager/docs/organization-policy/overview) and
-[API](https://cloud.google.com/resource-manager/reference/rest/v1/organizations/setOrgPolicy).
+Allows management of Organization Policies for a Google Cloud Organization. 
+
+~> **Warning:** This resource has been superseded by `google_org_policy_policy`. `google_org_policy_policy` uses Organization Policy API V2 instead of Cloud Resource Manager API V1 and it supports additional features such as tags and conditions.
+
+To get more information about Organization Policies, see:
+
+* [API documentation](https://cloud.google.com/resource-manager/reference/rest/v1/organizations/setOrgPolicy)
+* How-to Guides
+    * [Introduction to the Organization Policy Service](https://cloud.google.com/resource-manager/docs/organization-policy/overview)
 
 ## Example Usage
 

diff --git a/...party/terraform/website/docs/r/google_project_organization_policy.html.markdown b/...party/terraform/website/docs/r/google_project_organization_policy.html.markdown
@@ -9,10 +9,15 @@ description: |-
 
 # google\_project\_organization\_policy
 
-Allows management of Organization policies for a Google Project. For more information see
-[the official
-documentation](https://cloud.google.com/resource-manager/docs/organization-policy/overview) and
-[API](https://cloud.google.com/resource-manager/reference/rest/v1/projects/setOrgPolicy).
+Allows management of Organization Policies for a Google Cloud Project.
+
+~> **Warning:** This resource has been superseded by `google_org_policy_policy`. `google_org_policy_policy` uses Organization Policy API V2 instead of Cloud Resource Manager API V1 and it supports additional features such as tags and conditions.
+
+To get more information about Organization Policies, see:
+
+* [API documentation](https://cloud.google.com/resource-manager/reference/rest/v1/projects/setOrgPolicy)
+* How-to Guides
+    * [Introduction to the Organization Policy Service](https://cloud.google.com/resource-manager/docs/organization-policy/overview)
 
 ## Example Usage