Place security policy under folder for easier cleanup (#5174) (#10027)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 8, 2021 · 78a700f · 78a700f
1 parent 43e0024
commit 78a700f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.changelog/5174.txt b/.changelog/5174.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/website/docs/r/compute_organization_security_policy.html.markdown b/website/docs/r/compute_organization_security_policy.html.markdown
@@ -39,7 +39,6 @@ To get more information about OrganizationSecurityPolicy, see:
 ```hcl
 resource "google_compute_organization_security_policy" "policy" {
   provider = google-beta
-
   display_name = "tf-test%{random_suffix}"
   parent       = "organizations/123456789"
 }

diff --git a/website/docs/r/compute_organization_security_policy_association.html.markdown b/website/docs/r/compute_organization_security_policy_association.html.markdown
@@ -37,16 +37,20 @@ To get more information about OrganizationSecurityPolicyAssociation, see:
 
 
 ```hcl
+resource "google_folder" "security_policy_target" {
+  provider     = google-beta
+  display_name = "tf-test-secpol-%{random_suffix}"
+  parent       = "organizations/123456789"
+}
+
 resource "google_compute_organization_security_policy" "policy" {
   provider = google-beta
-
   display_name = "tf-test%{random_suffix}"
-  parent       = "organizations/123456789"
+  parent       = google_folder.security_policy_target.name
 }
 
 resource "google_compute_organization_security_policy_rule" "policy" {
   provider = google-beta
-
   policy_id = google_compute_organization_security_policy.policy.id
   action = "allow"
 
@@ -69,7 +73,6 @@ resource "google_compute_organization_security_policy_rule" "policy" {
 
 resource "google_compute_organization_security_policy_association" "policy" {
   provider = google-beta
-
   name          = "tf-test%{random_suffix}"
   attachment_id = google_compute_organization_security_policy.policy.parent
   policy_id     = google_compute_organization_security_policy.policy.id
@@ -123,5 +126,4 @@ OrganizationSecurityPolicyAssociation can be imported using any of these accepte
 
 ```
 $ terraform import google_compute_organization_security_policy_association.default {{policy_id}}/association/{{name}}
-$ terraform import google_compute_organization_security_policy_association.default {{policy_id}}/{{name}}
 ```
diff --git a/website/docs/r/compute_organization_security_policy_rule.html.markdown b/website/docs/r/compute_organization_security_policy_rule.html.markdown
@@ -39,7 +39,6 @@ To get more information about OrganizationSecurityPolicyRule, see:
 ```hcl
 resource "google_compute_organization_security_policy" "policy" {
   provider = google-beta
-
   display_name = "tf-test%{random_suffix}"
   parent       = "organizations/123456789"
 }
@@ -208,5 +207,4 @@ OrganizationSecurityPolicyRule can be imported using any of these accepted forma
 
 ```
 $ terraform import google_compute_organization_security_policy_rule.default {{policy_id}}/priority/{{priority}}
-$ terraform import google_compute_organization_security_policy_rule.default {{policy_id}}/{{priority}}
 ```