Make deletion_policy field for Project resource PREVENT by default …

…(#11255) (#7955) [upstream:9905a08d80a5fc0bc137ae2cb06bac27e29678ac] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 13, 2024 · 67547a5 · 67547a5
1 parent f262963
commit 67547a5
Show file tree

Hide file tree

Showing 175 changed files with 445 additions and 41 deletions.
diff --git a/.changelog/11255.txt b/.changelog/11255.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+resourcemanager: Make `deletion-policy` in `google_project` 'PREVENT' by default. This makes deleting them require an explicit intent. `google_project` resources cannot be destroyed unless `deletion_policy` is set to 'ABANDON' or 'NONE' for the resource.
+```
diff --git a/...a/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go b/...a/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go
@@ -140,6 +140,7 @@ func createScopedPolicy(t *testing.T, org string) string {
 		project_id      = "acm-tf-test-%s"
 		name            = "acm-tf-test-%s"
 		org_id          = "%s"
+		deletion_policy = "DELETE"
 		}
 
 		resource "google_access_context_manager_access_policy" "access-policy" {

diff --git a/google-beta/services/apigee/iam_apigee_environment_generated_test.go b/google-beta/services/apigee/iam_apigee_environment_generated_test.go
@@ -136,6 +136,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -210,6 +211,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -298,6 +300,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -374,6 +377,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -448,6 +452,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go b/google-beta/services/apigee/resource_apigee_addons_config_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test-%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_endpoint_attachment_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/google-beta/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go
@@ -52,6 +52,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go b/google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_env_references_generated_test.go b/google-beta/services/apigee/resource_apigee_env_references_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_attachment_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go b/google-beta/services/apigee/resource_apigee_envgroup_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_environment_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -161,6 +162,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -260,6 +262,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/...e-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go b/...e-beta/services/apigee/resource_apigee_environment_keyvaluemaps_entries_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test-%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -209,6 +210,7 @@ resource "google_project" "project" {
    name            = "tf-test%{random_suffix}" 
    org_id          = "%{org_id}" 
    billing_account = "%{billing_account}" 
+   deletion_policy = "DELETE"
  } 
   
  resource "google_project_service" "apigee" { 

diff --git a/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go b/google-beta/services/apigee/resource_apigee_environment_keyvaluemaps_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test-%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -195,6 +196,7 @@ resource "google_project" "project" {
    name            = "tf-test%{random_suffix}" 
    org_id          = "%{org_id}" 
    billing_account = "%{billing_account}" 
+   deletion_policy = "DELETE"
  } 
   
  resource "google_project_service" "apigee" { 

diff --git a/google-beta/services/apigee/resource_apigee_environment_type_test.go b/google-beta/services/apigee/resource_apigee_environment_type_test.go
@@ -56,6 +56,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_flowhook_test.go b/google-beta/services/apigee/resource_apigee_flowhook_test.go
@@ -51,6 +51,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_attachment_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_instance_generated_test.go b/google-beta/services/apigee/resource_apigee_instance_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -158,6 +159,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -251,6 +253,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -346,6 +349,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -500,6 +504,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go
@@ -61,6 +61,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -182,6 +183,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/...beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/...beta/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test-my-project%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go b/google-beta/services/apigee/resource_apigee_nat_address_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_organization_generated_test.go b/google-beta/services/apigee/resource_apigee_organization_generated_test.go
@@ -66,6 +66,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -152,6 +153,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -208,6 +210,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -364,6 +367,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -484,6 +488,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -634,6 +639,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go b/google-beta/services/apigee/resource_apigee_sharedflow_deployment_test.go
@@ -62,6 +62,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_sharedflow_test.go b/google-beta/services/apigee/resource_apigee_sharedflow_test.go
@@ -62,6 +62,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -168,6 +169,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go b/google-beta/services/apigee/resource_apigee_sync_authorization_generated_test.go
@@ -59,6 +59,7 @@ resource "google_project" "project" {
   name            = "tf-test-my-project%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_sync_authorization_test.go b/google-beta/services/apigee/resource_apigee_sync_authorization_test.go
@@ -61,6 +61,7 @@ resource "google_project" "project" {
   name            = "tf-test-my-project%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -104,6 +105,7 @@ resource "google_project" "project" {
   name            = "tf-test-my-project%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {
@@ -163,6 +165,7 @@ resource "google_project" "project" {
   name            = "tf-test-my-project%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {

diff --git a/google-beta/services/apigee/resource_apigee_target_server_generated_test.go b/google-beta/services/apigee/resource_apigee_target_server_generated_test.go
@@ -65,6 +65,7 @@ resource "google_project" "project" {
   name            = "tf-test%{random_suffix}"
   org_id          = "%{org_id}"
   billing_account = "%{billing_account}"
+  deletion_policy = "DELETE"
 }
 
 resource "google_project_service" "apigee" {