diff --git a/mmv1/templates/terraform/examples/access_context_manager_access_policy_scoped.tf.erb b/mmv1/templates/terraform/examples/access_context_manager_access_policy_scoped.tf.erb index a294add4d8c6..46a72ae67517 100644 --- a/mmv1/templates/terraform/examples/access_context_manager_access_policy_scoped.tf.erb +++ b/mmv1/templates/terraform/examples/access_context_manager_access_policy_scoped.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:test_env_vars]['project'] %>" name = "<%= ctx[:test_env_vars]['project'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_policy" "<%= ctx[:primary_resource_id] %>" { diff --git a/mmv1/templates/terraform/examples/active_directory_peering_basic.tf.erb b/mmv1/templates/terraform/examples/active_directory_peering_basic.tf.erb index 832af8f86a8c..c68e7fb75b9b 100644 --- a/mmv1/templates/terraform/examples/active_directory_peering_basic.tf.erb +++ b/mmv1/templates/terraform/examples/active_directory_peering_basic.tf.erb @@ -41,4 +41,5 @@ resource "google_project" "peered-project" { project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/apigee_addons_test.tf.erb b/mmv1/templates/terraform/examples/apigee_addons_test.tf.erb index fb4e489b63cb..813ec9a80487 100644 --- a/mmv1/templates/terraform/examples/apigee_addons_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_addons_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_endpoint_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_endpoint_attachment_basic_test.tf.erb index ed85e2c4f2b5..6f0af483c2d5 100644 --- a/mmv1/templates/terraform/examples/apigee_endpoint_attachment_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_endpoint_attachment_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb b/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb index c7385a59a421..452bb5e6015f 100644 --- a/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_env_keystore_alias_self_signed_cert.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb index dc79ceb0668f..213e707861d5 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_basic_deployment_apiproxy_type_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb index 6357ad9f0cea..162ad65e0b68 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic.tf.erb index c4a87c7fa3ae..653bf99a83a7 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb index ec1b9d8182b8..f82569b5495e 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_group_attachment_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_group_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_group_basic_test.tf.erb index 818fdc40a2c7..65af6e2b206e 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_group_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_group_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb index 7a59fe8ef1d6..c0c6c8455bdc 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_keystore_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_beta_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_beta_test.tf.erb index c492ac5c7ee4..7213832df9da 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_beta_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_beta_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_beta_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_beta_test.tf.erb index 64d2e5a7757c..72ca49b02b26 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_beta_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_beta_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_test.tf.erb index 28fe4dc2d515..f6bbb38cc7ae 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_entries_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_test.tf.erb index dcf201842557..717e510bef4b 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_keyvaluemaps_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_patch_update_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_patch_update_test.tf.erb index b884c2c7f03f..0b1c825be8eb 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_patch_update_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_patch_update_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb b/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb index 78119ec25d43..859a687b6c70 100644 --- a/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_environment_reference_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_attachment_basic.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_attachment_basic.tf.erb index a3bd92489bc7..03566655e653 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_attachment_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_attachment_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb index d9ebf23c96bc..3366148622b8 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_attachment_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_basic_test.tf.erb index 567df37a119e..c436664a2c42 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_cidr_range_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_cidr_range_test.tf.erb index 305d76c7c8f2..e470b82dbd12 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_cidr_range_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_cidr_range_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_full_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_full_test.tf.erb index 7b549cc9f036..3dd881c9781a 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_full_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_full_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_ip_range_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_ip_range_test.tf.erb index 9e4d91d95bb6..15a898bab0fc 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_ip_range_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_ip_range_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_instance_service_attachment_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_instance_service_attachment_basic_test.tf.erb index 712718089cea..c6b39df1c87b 100644 --- a/mmv1/templates/terraform/examples/apigee_instance_service_attachment_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_instance_service_attachment_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_nat_address_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_nat_address_basic_test.tf.erb index 7dfef106caa5..7169dabb6715 100644 --- a/mmv1/templates/terraform/examples/apigee_nat_address_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_nat_address_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.erb index a0b0e6762698..e9851e1d711a 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb index 87fab9350fc3..632e6fad3f69 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.erb index a6f70393fc76..861e1df05af0 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb index f5ae4774fcb7..e6269351d3b7 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.erb index 4189c4be072e..80579ecccf43 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.erb @@ -9,6 +9,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb b/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb index e9e569222b51..b03974bb8eb1 100644 --- a/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.erb @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_sync_authorization_basic_test.tf.erb b/mmv1/templates/terraform/examples/apigee_sync_authorization_basic_test.tf.erb index 5f590fcd1e94..1f7f12db331d 100644 --- a/mmv1/templates/terraform/examples/apigee_sync_authorization_basic_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_sync_authorization_basic_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_target_server_test.tf.erb b/mmv1/templates/terraform/examples/apigee_target_server_test.tf.erb index 1afd90843ffe..130e609676d4 100644 --- a/mmv1/templates/terraform/examples/apigee_target_server_test.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_target_server_test.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/apigee_target_server_test_basic.tf.erb b/mmv1/templates/terraform/examples/apigee_target_server_test_basic.tf.erb index 6b1dd1d26765..d27abfb85d91 100644 --- a/mmv1/templates/terraform/examples/apigee_target_server_test_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apigee_target_server_test_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/app_engine_firewall_rule_basic.tf.erb b/mmv1/templates/terraform/examples/app_engine_firewall_rule_basic.tf.erb index 057f23b2e268..07820c92a6c5 100644 --- a/mmv1/templates/terraform/examples/app_engine_firewall_rule_basic.tf.erb +++ b/mmv1/templates/terraform/examples/app_engine_firewall_rule_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { diff --git a/mmv1/templates/terraform/examples/app_engine_flexible_app_version.tf.erb b/mmv1/templates/terraform/examples/app_engine_flexible_app_version.tf.erb index 641e65936952..032373d7cf44 100644 --- a/mmv1/templates/terraform/examples/app_engine_flexible_app_version.tf.erb +++ b/mmv1/templates/terraform/examples/app_engine_flexible_app_version.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "<%= ctx[:vars]['project'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { diff --git a/mmv1/templates/terraform/examples/apphub_service_basic.tf.erb b/mmv1/templates/terraform/examples/apphub_service_basic.tf.erb index c105754d1af4..869f7001d19b 100644 --- a/mmv1/templates/terraform/examples/apphub_service_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_service_basic.tf.erb @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/apphub_service_full.tf.erb b/mmv1/templates/terraform/examples/apphub_service_full.tf.erb index 7eb5d74a67c7..e76a286dc23c 100644 --- a/mmv1/templates/terraform/examples/apphub_service_full.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_service_full.tf.erb @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/apphub_service_project_attachment_basic.tf.erb b/mmv1/templates/terraform/examples/apphub_service_project_attachment_basic.tf.erb index 33d835bacc44..71eb1d7af699 100644 --- a/mmv1/templates/terraform/examples/apphub_service_project_attachment_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_service_project_attachment_basic.tf.erb @@ -7,6 +7,7 @@ resource "google_project" "service_project" { project_id ="<%= ctx[:vars]['service_project_attachment_id'] %>" name = "Service Project" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_120s" { diff --git a/mmv1/templates/terraform/examples/apphub_service_project_attachment_full.tf.erb b/mmv1/templates/terraform/examples/apphub_service_project_attachment_full.tf.erb index f88c9b9ab7fa..bffe2753f026 100644 --- a/mmv1/templates/terraform/examples/apphub_service_project_attachment_full.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_service_project_attachment_full.tf.erb @@ -8,6 +8,7 @@ resource "google_project" "service_project_full" { project_id ="<%= ctx[:vars]['service_project_attachment_id'] %>" name = "Service Project Full" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_120s" { diff --git a/mmv1/templates/terraform/examples/apphub_workload_basic.tf.erb b/mmv1/templates/terraform/examples/apphub_workload_basic.tf.erb index 0a18d7b2798f..23ccc6a2e1a0 100644 --- a/mmv1/templates/terraform/examples/apphub_workload_basic.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_workload_basic.tf.erb @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/apphub_workload_full.tf.erb b/mmv1/templates/terraform/examples/apphub_workload_full.tf.erb index 1f33aa4b7f6a..bd92c81d0e7e 100644 --- a/mmv1/templates/terraform/examples/apphub_workload_full.tf.erb +++ b/mmv1/templates/terraform/examples/apphub_workload_full.tf.erb @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/billing_project_info_basic.tf.erb b/mmv1/templates/terraform/examples/billing_project_info_basic.tf.erb index 09eb8ed8334c..3ca9dea1066f 100644 --- a/mmv1/templates/terraform/examples/billing_project_info_basic.tf.erb +++ b/mmv1/templates/terraform/examples/billing_project_info_basic.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" lifecycle { ignore_changes = [billing_account] } diff --git a/mmv1/templates/terraform/examples/compute_project_cloud_armor_tier_project_set.tf.erb b/mmv1/templates/terraform/examples/compute_project_cloud_armor_tier_project_set.tf.erb index 16122a86a963..ecd1950903d0 100644 --- a/mmv1/templates/terraform/examples/compute_project_cloud_armor_tier_project_set.tf.erb +++ b/mmv1/templates/terraform/examples/compute_project_cloud_armor_tier_project_set.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/templates/terraform/examples/consumer_quota_override.tf.erb b/mmv1/templates/terraform/examples/consumer_quota_override.tf.erb index 1e6ed54a4599..366c3ca1c90e 100644 --- a/mmv1/templates/terraform/examples/consumer_quota_override.tf.erb +++ b/mmv1/templates/terraform/examples/consumer_quota_override.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/consumer_quota_override_custom_dimension.tf.erb b/mmv1/templates/terraform/examples/consumer_quota_override_custom_dimension.tf.erb index 156cbecae1ba..29542bdec03c 100644 --- a/mmv1/templates/terraform/examples/consumer_quota_override_custom_dimension.tf.erb +++ b/mmv1/templates/terraform/examples/consumer_quota_override_custom_dimension.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/consumer_quota_override_zero_value.tf.erb b/mmv1/templates/terraform/examples/consumer_quota_override_zero_value.tf.erb index 6bc2f6f00186..afab737e5575 100644 --- a/mmv1/templates/terraform/examples/consumer_quota_override_zero_value.tf.erb +++ b/mmv1/templates/terraform/examples/consumer_quota_override_zero_value.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/dialogflow_intent_full.tf.erb b/mmv1/templates/terraform/examples/dialogflow_intent_full.tf.erb index fc0560d4cbe4..d0364703f76c 100644 --- a/mmv1/templates/terraform/examples/dialogflow_intent_full.tf.erb +++ b/mmv1/templates/terraform/examples/dialogflow_intent_full.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "agent_project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/templates/terraform/examples/dns_managed_zone_private_multiproject.tf.erb b/mmv1/templates/terraform/examples/dns_managed_zone_private_multiproject.tf.erb index d22c70671f5b..49c51a8c3508 100644 --- a/mmv1/templates/terraform/examples/dns_managed_zone_private_multiproject.tf.erb +++ b/mmv1/templates/terraform/examples/dns_managed_zone_private_multiproject.tf.erb @@ -36,6 +36,7 @@ resource "google_project" "project_1" { project_id = "<%= ctx[:vars]['project_1_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project" "project_2" { @@ -43,6 +44,7 @@ resource "google_project" "project_2" { project_id = "<%= ctx[:vars]['project_2_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_compute_network" "network_1_project_1" { diff --git a/mmv1/templates/terraform/examples/dns_policy_multiproject.tf.erb b/mmv1/templates/terraform/examples/dns_policy_multiproject.tf.erb index cfedeccc7948..84e171274afe 100644 --- a/mmv1/templates/terraform/examples/dns_policy_multiproject.tf.erb +++ b/mmv1/templates/terraform/examples/dns_policy_multiproject.tf.erb @@ -30,6 +30,7 @@ resource "google_project" "project_1" { project_id = "<%= ctx[:vars]['project_1_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project" "project_2" { @@ -37,6 +38,7 @@ resource "google_project" "project_2" { project_id = "<%= ctx[:vars]['project_2_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_compute_network" "network_1_project_1" { diff --git a/mmv1/templates/terraform/examples/firebase_database_instance_default_database.tf.erb b/mmv1/templates/terraform/examples/firebase_database_instance_default_database.tf.erb index 6d691e3cbea5..a8cca389fc66 100644 --- a/mmv1/templates/terraform/examples/firebase_database_instance_default_database.tf.erb +++ b/mmv1/templates/terraform/examples/firebase_database_instance_default_database.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "default" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/templates/terraform/examples/firebase_project_basic.tf.erb b/mmv1/templates/terraform/examples/firebase_project_basic.tf.erb index 3334201307eb..39840aeaaefa 100644 --- a/mmv1/templates/terraform/examples/firebase_project_basic.tf.erb +++ b/mmv1/templates/terraform/examples/firebase_project_basic.tf.erb @@ -4,6 +4,7 @@ resource "google_project" "default" { project_id = "<%= ctx[:vars]['project_name'] %>" name = "<%= ctx[:vars]['project_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" diff --git a/mmv1/templates/terraform/examples/firestore_document_basic.tf.erb b/mmv1/templates/terraform/examples/firestore_document_basic.tf.erb index 49aed49f7835..9302846d5497 100644 --- a/mmv1/templates/terraform/examples/firestore_document_basic.tf.erb +++ b/mmv1/templates/terraform/examples/firestore_document_basic.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/firestore_document_nested_document.tf.erb b/mmv1/templates/terraform/examples/firestore_document_nested_document.tf.erb index c2e9d43a8192..9167ffcfa688 100644 --- a/mmv1/templates/terraform/examples/firestore_document_nested_document.tf.erb +++ b/mmv1/templates/terraform/examples/firestore_document_nested_document.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/folder_access_approval_active_key_version.tf.erb b/mmv1/templates/terraform/examples/folder_access_approval_active_key_version.tf.erb index 3fa8d47af8bd..64f844f433c0 100644 --- a/mmv1/templates/terraform/examples/folder_access_approval_active_key_version.tf.erb +++ b/mmv1/templates/terraform/examples/folder_access_approval_active_key_version.tf.erb @@ -8,6 +8,7 @@ resource "google_project" "my_project" { name = "My Project" project_id = "your-project-id" folder_id = google_folder.my_folder.name + deletion_policy = "DELETE" } resource "google_kms_key_ring" "key_ring" { diff --git a/mmv1/templates/terraform/examples/go/access_context_manager_access_policy_scoped.tf.tmpl b/mmv1/templates/terraform/examples/go/access_context_manager_access_policy_scoped.tf.tmpl index ba6eb1909505..b031c076fddc 100644 --- a/mmv1/templates/terraform/examples/go/access_context_manager_access_policy_scoped.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/access_context_manager_access_policy_scoped.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.TestEnvVars "project"}}" name = "{{index $.TestEnvVars "project"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_policy" "{{$.PrimaryResourceId}}" { diff --git a/mmv1/templates/terraform/examples/go/active_directory_peering_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/active_directory_peering_basic.tf.tmpl index 9a5436051f16..51c61dea4d78 100644 --- a/mmv1/templates/terraform/examples/go/active_directory_peering_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/active_directory_peering_basic.tf.tmpl @@ -39,4 +39,5 @@ resource "google_project" "peered-project" { project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/go/apigee_addons_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_addons_test.tf.tmpl index 4312512591c3..7dd26447e516 100644 --- a/mmv1/templates/terraform/examples/go/apigee_addons_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_addons_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_endpoint_attachment_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_endpoint_attachment_basic_test.tf.tmpl index da403eb64ef7..613a4a98606f 100644 --- a/mmv1/templates/terraform/examples/go/apigee_endpoint_attachment_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_endpoint_attachment_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_env_keystore_alias_self_signed_cert.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_env_keystore_alias_self_signed_cert.tf.tmpl index 2e2ccacf9bfb..4cffd3f021e3 100644 --- a/mmv1/templates/terraform/examples/go/apigee_env_keystore_alias_self_signed_cert.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_env_keystore_alias_self_signed_cert.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_basic_deployment_apiproxy_type_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_basic_deployment_apiproxy_type_test.tf.tmpl index 4899f8167119..c1e4045d48c5 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_basic_deployment_apiproxy_type_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_basic_deployment_apiproxy_type_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_basic_test.tf.tmpl index 5b510fe6a2c7..ff63f69ed691 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic.tf.tmpl index 173f42d34b56..d008def35c06 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic_test.tf.tmpl index 0372045cf58f..611e1a31136f 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_group_attachment_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_group_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_group_basic_test.tf.tmpl index 2399abcbbc81..6118cc0b6c98 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_group_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_group_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_keystore_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_keystore_test.tf.tmpl index 715b93230502..3806673a0c61 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_keystore_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_keystore_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_patch_update_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_patch_update_test.tf.tmpl index 62f000185328..d2bb56710d93 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_patch_update_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_patch_update_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_reference_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_reference_test.tf.tmpl index 2ce22afb50d6..2acd802bba19 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_reference_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_reference_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_environment_type_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_environment_type_test.tf.tmpl index 9bff358f70f0..8e0a87c5e0aa 100644 --- a/mmv1/templates/terraform/examples/go/apigee_environment_type_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_environment_type_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic.tf.tmpl index c245b1b8c59c..9c535fae47c7 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic_test.tf.tmpl index 691d9485db61..b70cf9d4d3b4 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_attachment_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_basic_test.tf.tmpl index d9d4273f89f4..2c8e0d988950 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_cidr_range_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_cidr_range_test.tf.tmpl index ac11534b18f2..6136c01baeac 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_cidr_range_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_cidr_range_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_full_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_full_test.tf.tmpl index 0a2b9b0ce1f9..80ee6da8ae87 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_full_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_full_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_ip_range_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_ip_range_test.tf.tmpl index 45077f0bcc56..edb467cc02f5 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_ip_range_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_ip_range_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_instance_service_attachment_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_instance_service_attachment_basic_test.tf.tmpl index 94b875d626be..1a4cfddcba23 100644 --- a/mmv1/templates/terraform/examples/go/apigee_instance_service_attachment_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_instance_service_attachment_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_nat_address_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_nat_address_basic_test.tf.tmpl index 505f4e07c7ec..ce2a4f9206f8 100644 --- a/mmv1/templates/terraform/examples/go/apigee_nat_address_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_nat_address_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl index 013329cc595e..5b5b6adf8ea2 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_test.tf.tmpl index 97cf9790c9c2..508d8899f826 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl index de620539eef3..457d32a0aefa 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_test.tf.tmpl index 70ef75f38fca..4e193a9658bc 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_cloud_full_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_drz_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_drz_test.tf.tmpl index 280e00517261..269b2bfe70ba 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_drz_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_drz_test.tf.tmpl @@ -9,6 +9,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_organization_retention_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_organization_retention_test.tf.tmpl index 482896c22f35..95f5f38fb758 100644 --- a/mmv1/templates/terraform/examples/go/apigee_organization_retention_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_organization_retention_test.tf.tmpl @@ -5,6 +5,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_sync_authorization_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_sync_authorization_basic_test.tf.tmpl index f8e15b09457d..277bdf85022e 100644 --- a/mmv1/templates/terraform/examples/go/apigee_sync_authorization_basic_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_sync_authorization_basic_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_target_server_test.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_target_server_test.tf.tmpl index d18b8ca6a11b..3930cc27ff5a 100644 --- a/mmv1/templates/terraform/examples/go/apigee_target_server_test.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_target_server_test.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/apigee_target_server_test_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apigee_target_server_test_basic.tf.tmpl index b456180b129d..f5d53555ed45 100644 --- a/mmv1/templates/terraform/examples/go/apigee_target_server_test_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apigee_target_server_test_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "apigee" { diff --git a/mmv1/templates/terraform/examples/go/app_engine_firewall_rule_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/app_engine_firewall_rule_basic.tf.tmpl index 3a0850c57aae..65ff5428d7bb 100644 --- a/mmv1/templates/terraform/examples/go/app_engine_firewall_rule_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/app_engine_firewall_rule_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { diff --git a/mmv1/templates/terraform/examples/go/app_engine_flexible_app_version.tf.tmpl b/mmv1/templates/terraform/examples/go/app_engine_flexible_app_version.tf.tmpl index c5d1d2098ec0..242bdbd85d13 100644 --- a/mmv1/templates/terraform/examples/go/app_engine_flexible_app_version.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/app_engine_flexible_app_version.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "{{index $.Vars "project"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { diff --git a/mmv1/templates/terraform/examples/go/apphub_service_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_service_basic.tf.tmpl index 37cb491126ae..0c11196256e0 100644 --- a/mmv1/templates/terraform/examples/go/apphub_service_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_service_basic.tf.tmpl @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/go/apphub_service_full.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_service_full.tf.tmpl index 8a0807d03794..e9a8ee7e82ef 100644 --- a/mmv1/templates/terraform/examples/go/apphub_service_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_service_full.tf.tmpl @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_basic.tf.tmpl index d62798e1a249..f70836d2f6bb 100644 --- a/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_basic.tf.tmpl @@ -7,6 +7,7 @@ resource "google_project" "service_project" { project_id ="{{index $.Vars "service_project_attachment_id"}}" name = "Service Project" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_120s" { diff --git a/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_full.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_full.tf.tmpl index 5577a71f60e4..080cc3ff9072 100644 --- a/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_service_project_attachment_full.tf.tmpl @@ -8,6 +8,7 @@ resource "google_project" "service_project_full" { project_id ="{{index $.Vars "service_project_attachment_id"}}" name = "Service Project Full" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_120s" { diff --git a/mmv1/templates/terraform/examples/go/apphub_workload_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_workload_basic.tf.tmpl index 9006e8db8ea4..392395e8017e 100644 --- a/mmv1/templates/terraform/examples/go/apphub_workload_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_workload_basic.tf.tmpl @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/go/apphub_workload_full.tf.tmpl b/mmv1/templates/terraform/examples/go/apphub_workload_full.tf.tmpl index 9d179903e1a8..ca13f5699c30 100644 --- a/mmv1/templates/terraform/examples/go/apphub_workload_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/apphub_workload_full.tf.tmpl @@ -11,6 +11,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/templates/terraform/examples/go/billing_project_info_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/billing_project_info_basic.tf.tmpl index ff23a6ca4bb8..df607cce8e6f 100644 --- a/mmv1/templates/terraform/examples/go/billing_project_info_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/billing_project_info_basic.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" lifecycle { ignore_changes = [billing_account] } diff --git a/mmv1/templates/terraform/examples/go/compute_project_cloud_armor_tier_project_set.tf.tmpl b/mmv1/templates/terraform/examples/go/compute_project_cloud_armor_tier_project_set.tf.tmpl index a92fbbb8d92c..15afc43b736e 100644 --- a/mmv1/templates/terraform/examples/go/compute_project_cloud_armor_tier_project_set.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/compute_project_cloud_armor_tier_project_set.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/templates/terraform/examples/go/consumer_quota_override.tf.tmpl b/mmv1/templates/terraform/examples/go/consumer_quota_override.tf.tmpl index 487659dc7297..95c967625eed 100644 --- a/mmv1/templates/terraform/examples/go/consumer_quota_override.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/consumer_quota_override.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/go/consumer_quota_override_custom_dimension.tf.tmpl b/mmv1/templates/terraform/examples/go/consumer_quota_override_custom_dimension.tf.tmpl index 714b2c414c64..6fd2996027cc 100644 --- a/mmv1/templates/terraform/examples/go/consumer_quota_override_custom_dimension.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/consumer_quota_override_custom_dimension.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/go/consumer_quota_override_zero_value.tf.tmpl b/mmv1/templates/terraform/examples/go/consumer_quota_override_zero_value.tf.tmpl index 23237c9729ce..7c79a3180b36 100644 --- a/mmv1/templates/terraform/examples/go/consumer_quota_override_zero_value.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/consumer_quota_override_zero_value.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/go/dialogflow_intent_full.tf.tmpl b/mmv1/templates/terraform/examples/go/dialogflow_intent_full.tf.tmpl index c46b0a27c917..9fcbced7f5a0 100644 --- a/mmv1/templates/terraform/examples/go/dialogflow_intent_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/dialogflow_intent_full.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "agent_project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/templates/terraform/examples/go/dns_managed_zone_private_multiproject.tf.tmpl b/mmv1/templates/terraform/examples/go/dns_managed_zone_private_multiproject.tf.tmpl index 4aa0b22e0ce5..692a8ef0864e 100644 --- a/mmv1/templates/terraform/examples/go/dns_managed_zone_private_multiproject.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/dns_managed_zone_private_multiproject.tf.tmpl @@ -36,6 +36,7 @@ resource "google_project" "project_1" { project_id = "{{index $.Vars "project_1_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project" "project_2" { @@ -43,6 +44,7 @@ resource "google_project" "project_2" { project_id = "{{index $.Vars "project_2_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_compute_network" "network_1_project_1" { diff --git a/mmv1/templates/terraform/examples/go/dns_policy_multiproject.tf.tmpl b/mmv1/templates/terraform/examples/go/dns_policy_multiproject.tf.tmpl index 235066c9d50f..74be0624fdc8 100644 --- a/mmv1/templates/terraform/examples/go/dns_policy_multiproject.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/dns_policy_multiproject.tf.tmpl @@ -30,6 +30,7 @@ resource "google_project" "project_1" { project_id = "{{index $.Vars "project_1_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project" "project_2" { @@ -37,6 +38,7 @@ resource "google_project" "project_2" { project_id = "{{index $.Vars "project_2_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_compute_network" "network_1_project_1" { diff --git a/mmv1/templates/terraform/examples/go/firebase_database_instance_default_database.tf.tmpl b/mmv1/templates/terraform/examples/go/firebase_database_instance_default_database.tf.tmpl index 90d7fd0f5a29..083fa263b42d 100644 --- a/mmv1/templates/terraform/examples/go/firebase_database_instance_default_database.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/firebase_database_instance_default_database.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "default" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/templates/terraform/examples/go/firebase_project_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/firebase_project_basic.tf.tmpl index 045e9f84a588..46a2cb2d62b4 100644 --- a/mmv1/templates/terraform/examples/go/firebase_project_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/firebase_project_basic.tf.tmpl @@ -4,6 +4,7 @@ resource "google_project" "default" { project_id = "{{index $.Vars "project_name"}}" name = "{{index $.Vars "project_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" diff --git a/mmv1/templates/terraform/examples/go/firestore_document_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/firestore_document_basic.tf.tmpl index c9a43f186d74..34f54c069258 100644 --- a/mmv1/templates/terraform/examples/go/firestore_document_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/firestore_document_basic.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/go/firestore_document_nested_document.tf.tmpl b/mmv1/templates/terraform/examples/go/firestore_document_nested_document.tf.tmpl index 3d97035fa01a..c49b4e96b329 100644 --- a/mmv1/templates/terraform/examples/go/firestore_document_nested_document.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/firestore_document_nested_document.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/go/folder_access_approval_active_key_version.tf.tmpl b/mmv1/templates/terraform/examples/go/folder_access_approval_active_key_version.tf.tmpl index df9ec2d3e80d..64d4f3a55e47 100644 --- a/mmv1/templates/terraform/examples/go/folder_access_approval_active_key_version.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/folder_access_approval_active_key_version.tf.tmpl @@ -8,6 +8,7 @@ resource "google_project" "my_project" { name = "My Project" project_id = "your-project-id" folder_id = google_folder.my_folder.name + deletion_policy = "DELETE" } resource "google_kms_key_ring" "key_ring" { diff --git a/mmv1/templates/terraform/examples/go/iam_access_boundary_policy_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/iam_access_boundary_policy_basic.tf.tmpl index 7d5a95ef331d..d988b22f66e3 100644 --- a/mmv1/templates/terraform/examples/go/iam_access_boundary_policy_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iam_access_boundary_policy_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_level" "test-access" { diff --git a/mmv1/templates/terraform/examples/go/iam_deny_policy_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/iam_deny_policy_basic.tf.tmpl index cb88784e1f17..90536245f8fb 100644 --- a/mmv1/templates/terraform/examples/go/iam_deny_policy_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iam_deny_policy_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "{{index $.Vars "project_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "{{$.PrimaryResourceId}}" { diff --git a/mmv1/templates/terraform/examples/go/iap_app_engine_service.tf.tmpl b/mmv1/templates/terraform/examples/go/iap_app_engine_service.tf.tmpl index dff90f5307e6..96f9c87817eb 100644 --- a/mmv1/templates/terraform/examples/go/iap_app_engine_service.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iap_app_engine_service.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/go/iap_appengine.tf.tmpl b/mmv1/templates/terraform/examples/go/iap_appengine.tf.tmpl index f63aa36038ea..45ad554567ec 100644 --- a/mmv1/templates/terraform/examples/go/iap_appengine.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iap_appengine.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/go/iap_brand.tf.tmpl b/mmv1/templates/terraform/examples/go/iap_brand.tf.tmpl index c84d3f3c5830..feec98ca93c8 100644 --- a/mmv1/templates/terraform/examples/go/iap_brand.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iap_brand.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/go/iap_client.tf.tmpl b/mmv1/templates/terraform/examples/go/iap_client.tf.tmpl index 2f1b53827816..88af2235248c 100644 --- a/mmv1/templates/terraform/examples/go/iap_client.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iap_client.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/go/iap_project.tf.tmpl b/mmv1/templates/terraform/examples/go/iap_project.tf.tmpl index f099d4bf62a9..70a68b4a8fd7 100644 --- a/mmv1/templates/terraform/examples/go/iap_project.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/iap_project.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/go/identity_platform_config_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/identity_platform_config_basic.tf.tmpl index ae84812c99dc..445c1a377e0a 100644 --- a/mmv1/templates/terraform/examples/go/identity_platform_config_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/identity_platform_config_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "default" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_acct"}}" + deletion_policy = "DELETE" labels = { firebase = "enabled" } diff --git a/mmv1/templates/terraform/examples/go/identity_platform_config_minimal.tf.tmpl b/mmv1/templates/terraform/examples/go/identity_platform_config_minimal.tf.tmpl index fa59b765874f..f9a77e23061a 100644 --- a/mmv1/templates/terraform/examples/go/identity_platform_config_minimal.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/identity_platform_config_minimal.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "default" { name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_acct"}}" + deletion_policy = "DELETE" labels = { firebase = "enabled" } diff --git a/mmv1/templates/terraform/examples/go/integration_connectors_managed_zone.tf.tmpl b/mmv1/templates/terraform/examples/go/integration_connectors_managed_zone.tf.tmpl index d60da1736c11..6ba34c480050 100644 --- a/mmv1/templates/terraform/examples/go/integration_connectors_managed_zone.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/integration_connectors_managed_zone.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "target_project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project_iam_member" "dns_peer_binding" { diff --git a/mmv1/templates/terraform/examples/go/kms_autokey_config_all.tf.tmpl b/mmv1/templates/terraform/examples/go/kms_autokey_config_all.tf.tmpl index d2c504b6f355..1dfef71cbf3f 100644 --- a/mmv1/templates/terraform/examples/go/kms_autokey_config_all.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/kms_autokey_config_all.tf.tmpl @@ -14,6 +14,7 @@ resource "google_project" "key_project" { folder_id = google_folder.autokms_folder.folder_id billing_account = "{{index $.TestEnvVars "billing_account"}}" depends_on = [google_folder.autokms_folder] + deletion_policy = "DELETE" } # Enable the Cloud KMS API diff --git a/mmv1/templates/terraform/examples/go/kms_key_handle_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/kms_key_handle_basic.tf.tmpl index daead61d342d..a1aec00b4930 100644 --- a/mmv1/templates/terraform/examples/go/kms_key_handle_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/kms_key_handle_basic.tf.tmpl @@ -14,6 +14,7 @@ resource "google_project" "key_project" { folder_id = google_folder.autokms_folder.folder_id billing_account = "{{index $.TestEnvVars "billing_account"}}" depends_on = [google_folder.autokms_folder] + deletion_policy = "DELETE" } # Create the resource project diff --git a/mmv1/templates/terraform/examples/go/monitoring_monitored_project_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/monitoring_monitored_project_basic.tf.tmpl index 7aeff8242ab7..a043ba953711 100644 --- a/mmv1/templates/terraform/examples/go/monitoring_monitored_project_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/monitoring_monitored_project_basic.tf.tmpl @@ -7,4 +7,5 @@ resource "google_project" "basic" { project_id = "{{index $.Vars "monitored_project"}}" name = "{{index $.Vars "monitored_project"}}-display" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/monitoring_monitored_project_long_form.tf.tmpl b/mmv1/templates/terraform/examples/go/monitoring_monitored_project_long_form.tf.tmpl index e96c7923651f..c26cdc569f60 100644 --- a/mmv1/templates/terraform/examples/go/monitoring_monitored_project_long_form.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/monitoring_monitored_project_long_form.tf.tmpl @@ -7,4 +7,5 @@ resource "google_project" "basic" { project_id = "{{index $.Vars "monitored_project"}}" name = "{{index $.Vars "monitored_project"}}-display" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/network_attachment_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/network_attachment_basic.tf.tmpl index 948b3a02ba43..ec9f23221b61 100644 --- a/mmv1/templates/terraform/examples/go/network_attachment_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/network_attachment_basic.tf.tmpl @@ -35,6 +35,7 @@ resource "google_project" "rejected_producer_project" { name = "{{index $.Vars "rejected_producer_project_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "google_project" "accepted_producer_project" { @@ -42,4 +43,5 @@ resource "google_project" "accepted_producer_project" { name = "{{index $.Vars "accepted_producer_project_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/node_group_share_settings.tf.tmpl b/mmv1/templates/terraform/examples/go/node_group_share_settings.tf.tmpl index fbf5d9836c8a..94800793ec5c 100644 --- a/mmv1/templates/terraform/examples/go/node_group_share_settings.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/node_group_share_settings.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "guest_project" { project_id = "{{index $.Vars "guest_project_id"}}" name = "{{index $.Vars "guest_project_name"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_compute_node_template" "soletenant-tmpl" { diff --git a/mmv1/templates/terraform/examples/go/org_policy_policy_enforce.tf.tmpl b/mmv1/templates/terraform/examples/go/org_policy_policy_enforce.tf.tmpl index fa739896cb30..8441f6dcdc8f 100644 --- a/mmv1/templates/terraform/examples/go/org_policy_policy_enforce.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/org_policy_policy_enforce.tf.tmpl @@ -13,4 +13,5 @@ resource "google_project" "basic" { project_id = "id" name = "id" org_id = "123456789" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/org_policy_policy_project.tf.tmpl b/mmv1/templates/terraform/examples/go/org_policy_policy_project.tf.tmpl index 96c248672ba0..7016cda43ed8 100644 --- a/mmv1/templates/terraform/examples/go/org_policy_policy_project.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/org_policy_policy_project.tf.tmpl @@ -27,4 +27,5 @@ resource "google_project" "basic" { project_id = "id" name = "id" org_id = "123456789" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/organization_access_approval_active_key_version.tf.tmpl b/mmv1/templates/terraform/examples/go/organization_access_approval_active_key_version.tf.tmpl index ffd6fb7b41b5..629a4195a5be 100644 --- a/mmv1/templates/terraform/examples/go/organization_access_approval_active_key_version.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/organization_access_approval_active_key_version.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "my_project" { name = "My Project" project_id = "your-project-id" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_kms_key_ring" "key_ring" { diff --git a/mmv1/templates/terraform/examples/go/region_consumer_quota_override.tf.tmpl b/mmv1/templates/terraform/examples/go/region_consumer_quota_override.tf.tmpl index 108f57c012d4..cf6953b9cffb 100644 --- a/mmv1/templates/terraform/examples/go/region_consumer_quota_override.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/region_consumer_quota_override.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/go/resource_manager_lien.tf.tmpl b/mmv1/templates/terraform/examples/go/resource_manager_lien.tf.tmpl index ca5698d04162..e847ec9b4eac 100644 --- a/mmv1/templates/terraform/examples/go/resource_manager_lien.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/resource_manager_lien.tf.tmpl @@ -8,4 +8,5 @@ resource "google_resource_manager_lien" "{{$.PrimaryResourceId}}" { resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "A very important project!" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/go/shared_reservation_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/shared_reservation_basic.tf.tmpl index adc0fe50ad3c..202f64c469d6 100644 --- a/mmv1/templates/terraform/examples/go/shared_reservation_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/shared_reservation_basic.tf.tmpl @@ -3,6 +3,7 @@ resource "google_project" "owner_project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } @@ -16,6 +17,7 @@ resource "google_project" "guest_project" { project_id = "tf-test-2%{random_suffix}" name = "tf-test-2%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_organization_policy" "shared_reservation_org_policy" { diff --git a/mmv1/templates/terraform/examples/go/tag_binding_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/tag_binding_basic.tf.tmpl index 5ce32b6d2022..e66f8369874d 100644 --- a/mmv1/templates/terraform/examples/go/tag_binding_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/tag_binding_basic.tf.tmpl @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "{{index $.Vars "project_id"}}" name = "{{index $.Vars "project_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" + deletion_policy = "DELETE" } resource "google_tags_tag_key" "key" { diff --git a/mmv1/templates/terraform/examples/go/vertex_ai_featureonlinestore_featureview_cross_project.tf.tmpl b/mmv1/templates/terraform/examples/go/vertex_ai_featureonlinestore_featureview_cross_project.tf.tmpl index 05b8eab12560..e81d0081edc8 100644 --- a/mmv1/templates/terraform/examples/go/vertex_ai_featureonlinestore_featureview_cross_project.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/vertex_ai_featureonlinestore_featureview_cross_project.tf.tmpl @@ -6,6 +6,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/go/vmware_engine_network_legacy.tf.tmpl b/mmv1/templates/terraform/examples/go/vmware_engine_network_legacy.tf.tmpl index 4dcf950f8f30..9936dabd3275 100644 --- a/mmv1/templates/terraform/examples/go/vmware_engine_network_legacy.tf.tmpl +++ b/mmv1/templates/terraform/examples/go/vmware_engine_network_legacy.tf.tmpl @@ -21,6 +21,7 @@ resource "google_project" "acceptance" { project_id = "{{index $.Vars "proj_id"}}" org_id = "{{index $.TestEnvVars "org_id"}}" billing_account = "{{index $.TestEnvVars "billing_account"}}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/iam_access_boundary_policy_basic.tf.erb b/mmv1/templates/terraform/examples/iam_access_boundary_policy_basic.tf.erb index 8bc48667ae54..0fd56cf941be 100644 --- a/mmv1/templates/terraform/examples/iam_access_boundary_policy_basic.tf.erb +++ b/mmv1/templates/terraform/examples/iam_access_boundary_policy_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]["project_id"] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_level" "test-access" { diff --git a/mmv1/templates/terraform/examples/iam_deny_policy_basic.tf.erb b/mmv1/templates/terraform/examples/iam_deny_policy_basic.tf.erb index ce12af38140c..7242616fbfbf 100644 --- a/mmv1/templates/terraform/examples/iam_deny_policy_basic.tf.erb +++ b/mmv1/templates/terraform/examples/iam_deny_policy_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { name = "<%= ctx[:vars]["project_name"] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "<%= ctx[:primary_resource_id] %>" { diff --git a/mmv1/templates/terraform/examples/iap_app_engine_service.tf.erb b/mmv1/templates/terraform/examples/iap_app_engine_service.tf.erb index dff90f5307e6..96f9c87817eb 100644 --- a/mmv1/templates/terraform/examples/iap_app_engine_service.tf.erb +++ b/mmv1/templates/terraform/examples/iap_app_engine_service.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/iap_appengine.tf.erb b/mmv1/templates/terraform/examples/iap_appengine.tf.erb index f63aa36038ea..45ad554567ec 100644 --- a/mmv1/templates/terraform/examples/iap_appengine.tf.erb +++ b/mmv1/templates/terraform/examples/iap_appengine.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/iap_brand.tf.erb b/mmv1/templates/terraform/examples/iap_brand.tf.erb index 3c65c7abfef0..d0dbffdc62b4 100644 --- a/mmv1/templates/terraform/examples/iap_brand.tf.erb +++ b/mmv1/templates/terraform/examples/iap_brand.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/iap_client.tf.erb b/mmv1/templates/terraform/examples/iap_client.tf.erb index 9ea7623f4527..126817dc9d10 100644 --- a/mmv1/templates/terraform/examples/iap_client.tf.erb +++ b/mmv1/templates/terraform/examples/iap_client.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/templates/terraform/examples/iap_project.tf.erb b/mmv1/templates/terraform/examples/iap_project.tf.erb index f099d4bf62a9..70a68b4a8fd7 100644 --- a/mmv1/templates/terraform/examples/iap_project.tf.erb +++ b/mmv1/templates/terraform/examples/iap_project.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/identity_platform_config_basic.tf.erb b/mmv1/templates/terraform/examples/identity_platform_config_basic.tf.erb index 0405bf9620ea..5529d34c7fb3 100644 --- a/mmv1/templates/terraform/examples/identity_platform_config_basic.tf.erb +++ b/mmv1/templates/terraform/examples/identity_platform_config_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "default" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_acct'] -%>" + deletion_policy = "DELETE" labels = { firebase = "enabled" } diff --git a/mmv1/templates/terraform/examples/identity_platform_config_minimal.tf.erb b/mmv1/templates/terraform/examples/identity_platform_config_minimal.tf.erb index fda0049ecc1d..4c6186816d5d 100644 --- a/mmv1/templates/terraform/examples/identity_platform_config_minimal.tf.erb +++ b/mmv1/templates/terraform/examples/identity_platform_config_minimal.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "default" { name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_acct'] -%>" + deletion_policy = "DELETE" labels = { firebase = "enabled" } diff --git a/mmv1/templates/terraform/examples/integration_connectors_managed_zone.tf.erb b/mmv1/templates/terraform/examples/integration_connectors_managed_zone.tf.erb index 4ab8b003ebd5..fb5d58ad28c4 100644 --- a/mmv1/templates/terraform/examples/integration_connectors_managed_zone.tf.erb +++ b/mmv1/templates/terraform/examples/integration_connectors_managed_zone.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "target_project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project_iam_member" "dns_peer_binding" { diff --git a/mmv1/templates/terraform/examples/kms_autokey_config_all.tf.erb b/mmv1/templates/terraform/examples/kms_autokey_config_all.tf.erb index 1d48d66afdc0..f72418bdba8c 100644 --- a/mmv1/templates/terraform/examples/kms_autokey_config_all.tf.erb +++ b/mmv1/templates/terraform/examples/kms_autokey_config_all.tf.erb @@ -14,6 +14,7 @@ resource "google_project" "key_project" { folder_id = google_folder.autokms_folder.folder_id billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" depends_on = [google_folder.autokms_folder] + deletion_policy = "DELETE" } # Enable the Cloud KMS API diff --git a/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.erb b/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.erb index 27df68625892..327cf589046c 100644 --- a/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.erb +++ b/mmv1/templates/terraform/examples/kms_key_handle_basic.tf.erb @@ -14,6 +14,7 @@ resource "google_project" "key_project" { folder_id = google_folder.autokms_folder.folder_id billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" depends_on = [google_folder.autokms_folder] + deletion_policy = "DELETE" } # Create the resource project @@ -24,6 +25,7 @@ resource "google_project" "resource_project" { folder_id = google_folder.autokms_folder.folder_id billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" depends_on = [google_folder.autokms_folder] + deletion_policy = "DELETE" } # Enable the Cloud KMS API diff --git a/mmv1/templates/terraform/examples/monitoring_monitored_project_basic.tf.erb b/mmv1/templates/terraform/examples/monitoring_monitored_project_basic.tf.erb index ce32ef1a7978..814a40f47a51 100644 --- a/mmv1/templates/terraform/examples/monitoring_monitored_project_basic.tf.erb +++ b/mmv1/templates/terraform/examples/monitoring_monitored_project_basic.tf.erb @@ -7,4 +7,5 @@ resource "google_project" "basic" { project_id = "<%= ctx[:vars]['monitored_project'] %>" name = "<%= ctx[:vars]['monitored_project'] %>-display" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/monitoring_monitored_project_long_form.tf.erb b/mmv1/templates/terraform/examples/monitoring_monitored_project_long_form.tf.erb index 877056db134a..086c9d5ac80e 100644 --- a/mmv1/templates/terraform/examples/monitoring_monitored_project_long_form.tf.erb +++ b/mmv1/templates/terraform/examples/monitoring_monitored_project_long_form.tf.erb @@ -7,4 +7,5 @@ resource "google_project" "basic" { project_id = "<%= ctx[:vars]['monitored_project'] %>" name = "<%= ctx[:vars]['monitored_project'] %>-display" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/network_attachment_basic.tf.erb b/mmv1/templates/terraform/examples/network_attachment_basic.tf.erb index 3fe14b29adfe..fadfe335ec09 100644 --- a/mmv1/templates/terraform/examples/network_attachment_basic.tf.erb +++ b/mmv1/templates/terraform/examples/network_attachment_basic.tf.erb @@ -35,6 +35,7 @@ resource "google_project" "rejected_producer_project" { name = "<%= ctx[:vars]['rejected_producer_project_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "google_project" "accepted_producer_project" { @@ -42,4 +43,5 @@ resource "google_project" "accepted_producer_project" { name = "<%= ctx[:vars]['accepted_producer_project_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb b/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb index b2658a831187..64d2f3073139 100644 --- a/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb +++ b/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "guest_project" { project_id = "<%= ctx[:vars]['guest_project_id'] %>" name = "<%= ctx[:vars]['guest_project_name'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_compute_node_template" "soletenant-tmpl" { diff --git a/mmv1/templates/terraform/examples/org_policy_policy_enforce.tf.erb b/mmv1/templates/terraform/examples/org_policy_policy_enforce.tf.erb index fa739896cb30..8441f6dcdc8f 100644 --- a/mmv1/templates/terraform/examples/org_policy_policy_enforce.tf.erb +++ b/mmv1/templates/terraform/examples/org_policy_policy_enforce.tf.erb @@ -13,4 +13,5 @@ resource "google_project" "basic" { project_id = "id" name = "id" org_id = "123456789" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/org_policy_policy_project.tf.erb b/mmv1/templates/terraform/examples/org_policy_policy_project.tf.erb index 96c248672ba0..7016cda43ed8 100644 --- a/mmv1/templates/terraform/examples/org_policy_policy_project.tf.erb +++ b/mmv1/templates/terraform/examples/org_policy_policy_project.tf.erb @@ -27,4 +27,5 @@ resource "google_project" "basic" { project_id = "id" name = "id" org_id = "123456789" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/organization_access_approval_active_key_version.tf.erb b/mmv1/templates/terraform/examples/organization_access_approval_active_key_version.tf.erb index c100453e7d35..52e8ccab0dbd 100644 --- a/mmv1/templates/terraform/examples/organization_access_approval_active_key_version.tf.erb +++ b/mmv1/templates/terraform/examples/organization_access_approval_active_key_version.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "my_project" { name = "My Project" project_id = "your-project-id" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_kms_key_ring" "key_ring" { diff --git a/mmv1/templates/terraform/examples/region_consumer_quota_override.tf.erb b/mmv1/templates/terraform/examples/region_consumer_quota_override.tf.erb index 0263adf61ef6..ab9e111fc966 100644 --- a/mmv1/templates/terraform/examples/region_consumer_quota_override.tf.erb +++ b/mmv1/templates/terraform/examples/region_consumer_quota_override.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/templates/terraform/examples/resource_manager_lien.tf.erb b/mmv1/templates/terraform/examples/resource_manager_lien.tf.erb index fedab4764e14..5f64d49be9fb 100644 --- a/mmv1/templates/terraform/examples/resource_manager_lien.tf.erb +++ b/mmv1/templates/terraform/examples/resource_manager_lien.tf.erb @@ -8,4 +8,5 @@ resource "google_resource_manager_lien" "<%= ctx[:primary_resource_id] %>" { resource "google_project" "project" { project_id = "<%= ctx[:vars]["project_id"] %>" name = "A very important project!" + deletion_policy = "DELETE" } diff --git a/mmv1/templates/terraform/examples/shared_reservation_basic.tf.erb b/mmv1/templates/terraform/examples/shared_reservation_basic.tf.erb index 5980471808c0..fc58d27f8605 100644 --- a/mmv1/templates/terraform/examples/shared_reservation_basic.tf.erb +++ b/mmv1/templates/terraform/examples/shared_reservation_basic.tf.erb @@ -3,6 +3,7 @@ resource "google_project" "owner_project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } @@ -16,6 +17,7 @@ resource "google_project" "guest_project" { project_id = "tf-test-2%{random_suffix}" name = "tf-test-2%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_organization_policy" "shared_reservation_org_policy" { diff --git a/mmv1/templates/terraform/examples/tag_binding_basic.tf.erb b/mmv1/templates/terraform/examples/tag_binding_basic.tf.erb index 055199f03747..570f74c5e471 100644 --- a/mmv1/templates/terraform/examples/tag_binding_basic.tf.erb +++ b/mmv1/templates/terraform/examples/tag_binding_basic.tf.erb @@ -2,6 +2,7 @@ resource "google_project" "project" { project_id = "<%= ctx[:vars]['project_id'] %>" name = "<%= ctx[:vars]['project_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" + deletion_policy = "DELETE" } resource "google_tags_tag_key" "key" { diff --git a/mmv1/templates/terraform/examples/vertex_ai_featureonlinestore_featureview_cross_project.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featureonlinestore_featureview_cross_project.tf.erb index cd3b9f230e57..0608b40ec410 100644 --- a/mmv1/templates/terraform/examples/vertex_ai_featureonlinestore_featureview_cross_project.tf.erb +++ b/mmv1/templates/terraform/examples/vertex_ai_featureonlinestore_featureview_cross_project.tf.erb @@ -6,6 +6,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/templates/terraform/examples/vmware_engine_network_legacy.tf.erb b/mmv1/templates/terraform/examples/vmware_engine_network_legacy.tf.erb index 2e339d7b0113..f3e033249b4a 100644 --- a/mmv1/templates/terraform/examples/vmware_engine_network_legacy.tf.erb +++ b/mmv1/templates/terraform/examples/vmware_engine_network_legacy.tf.erb @@ -21,6 +21,7 @@ resource "google_project" "acceptance" { project_id = "<%= ctx[:vars]['proj_id'] %>" org_id = "<%= ctx[:test_env_vars]['org_id'] %>" billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/third_party/cai2hcl/services/resourcemanager/testdata/project_create.tf b/mmv1/third_party/cai2hcl/services/resourcemanager/testdata/project_create.tf index 822a86613e97..4cd53c1de83d 100644 --- a/mmv1/third_party/cai2hcl/services/resourcemanager/testdata/project_create.tf +++ b/mmv1/third_party/cai2hcl/services/resourcemanager/testdata/project_create.tf @@ -8,4 +8,5 @@ resource "google_project" "example-project" { name = "My Project" project_id = "example-project" + deletion_policy = "DELETE" } diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go index 493fdd7c385f..ba5c68df2dfd 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_access_policy_iam_test.go @@ -138,6 +138,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/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl b/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl index 3742eb83d05f..3660864ab62f 100644 --- a/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl +++ b/mmv1/third_party/terraform/services/apigee/go/resource_apigee_environment_type_test.go.tmpl @@ -55,6 +55,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/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go index dc31cf1e22f9..0552bfc2f450 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_env_keystore_alias_pkcs12_test.go @@ -50,6 +50,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/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb b/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb index 075ac5bd3911..b6e640e691ee 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_environment_type_test.go.erb @@ -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/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go index bef990185f2f..79619fee6e82 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook_test.go @@ -49,6 +49,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/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go index e55b29ffeee0..5a9e912ae451 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file_test.go @@ -59,6 +59,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" { @@ -180,6 +181,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/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go index 036d39673ce2..f069067d3c97 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment_test.go @@ -60,6 +60,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/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go index d4ef8ef4289a..6e8761c69987 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_test.go @@ -60,6 +60,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" { @@ -166,6 +167,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/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go index 97d0a8830f32..e297e3171f14 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_sync_authorization_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" { @@ -102,6 +103,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" { @@ -161,6 +163,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/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go index 6387d6828a6b..2676b594408b 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_test.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_target_server_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" { @@ -128,6 +129,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" { @@ -240,6 +242,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" { @@ -349,6 +352,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/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go index bf13977689b8..f666f04bd5d6 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_application_test.go @@ -78,6 +78,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_app_engine_application" "acceptance" { @@ -102,6 +103,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_app_engine_application" "acceptance" { @@ -121,6 +123,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_app_engine_application" "acceptance" { diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb index a233e5c3aa97..bd3832d48dd1 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_flexible_app_version_test.go.erb @@ -59,6 +59,7 @@ resource "google_project" "my_project" { project_id = "tf-test-appeng-flex%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -245,6 +246,7 @@ resource "google_project" "my_project" { project_id = "tf-test-appeng-flex%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go index 3280e43573c9..e0dcae079430 100644 --- a/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go +++ b/mmv1/third_party/terraform/services/appengine/resource_app_engine_standard_app_version_test.go @@ -64,6 +64,7 @@ resource "google_project" "my_project" { project_id = "tf-test-appeng-std%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { @@ -151,6 +152,7 @@ resource "google_project" "my_project" { project_id = "tf-test-appeng-std%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { @@ -272,6 +274,7 @@ resource "google_project" "my_project" { project_id = "tf-test-appeng-std%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_app_engine_application" "app" { diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go index be4d994d6ec0..6612c9caa0a7 100644 --- a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go +++ b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_service_test.go @@ -42,6 +42,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go index 0a8ba2ec4253..d47fd4d35c50 100644 --- a/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go +++ b/mmv1/third_party/terraform/services/apphub/data_source_apphub_discovered_workload_test.go @@ -41,6 +41,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go b/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go index 943f03bb5900..bda173d120cf 100644 --- a/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go +++ b/mmv1/third_party/terraform/services/apphub/resource_apphub_service_test.go @@ -64,6 +64,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go b/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go index 7f03b3d35ea7..9093ff57aecc 100644 --- a/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go +++ b/mmv1/third_party/terraform/services/apphub/resource_apphub_workload_test.go @@ -64,6 +64,7 @@ resource "google_project" "service_project" { name = "Service Project" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } # Enable Compute API diff --git a/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go b/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go index 04d809e94ef9..ffc59734ae29 100644 --- a/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go +++ b/mmv1/third_party/terraform/services/billing/resource_billing_budget_test.go @@ -592,6 +592,7 @@ resource "google_project" "project1" { name = "tf-test-%{random_suffix_1}" org_id = "%{org}" billing_account = "%{project_billing_acct}" + deletion_policy = "DELETE" } resource "google_project" "project2" { @@ -599,6 +600,7 @@ resource "google_project" "project2" { name = "tf-test-%{random_suffix_2}" org_id = "%{org}" billing_account = "%{project_billing_acct}" + deletion_policy = "DELETE" } resource "google_billing_budget" "budget" { @@ -636,6 +638,7 @@ resource "google_project" "project1" { name = "tf-test-%{random_suffix_1}" org_id = "%{org}" billing_account = "%{project_billing_acct}" + deletion_policy = "DELETE" } resource "google_project" "project2" { @@ -643,6 +646,7 @@ resource "google_project" "project2" { name = "tf-test-%{random_suffix_2}" org_id = "%{org}" billing_account = "%{project_billing_acct}" + deletion_policy = "DELETE" } resource "google_billing_budget" "budget" { diff --git a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go index b088d4040105..19400d6c7701 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go +++ b/mmv1/third_party/terraform/services/binaryauthorization/go/resource_binary_authorization_policy_test.go @@ -21,7 +21,7 @@ func TestAccBinaryAuthorizationPolicy_basic(t *testing.T) { pid := "tf-test-" + acctest.RandString(t, 10) billingId := envvar.GetTestBillingAccountFromEnv(t) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -165,9 +165,9 @@ func testAccCheckBinaryAuthorizationPolicyDefault(t *testing.T, pid string) reso config := acctest.GoogleProviderConfig(t) url := fmt.Sprintf("https://binaryauthorization.googleapis.com/v1/projects/%s/policy", pid) pol, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "GET", - RawURL: url, + Config: config, + Method: "GET", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { @@ -194,6 +194,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -211,6 +212,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -243,6 +245,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -307,6 +310,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } data "google_client_config" "current" { diff --git a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb index 05f407a52f10..4d8e46e3616e 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.erb @@ -195,6 +195,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -212,6 +213,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -244,6 +246,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "binauthz" { @@ -308,6 +311,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } data "google_client_config" "current" { diff --git a/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go b/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go index b0c044aded08..f6740cc5895d 100644 --- a/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go +++ b/mmv1/third_party/terraform/services/cloudquotas/resource_cloud_quotas_quota_preference_test.go @@ -63,6 +63,7 @@ func testAccCloudQuotasQuotaPreference_cloudquotasQuotaPreferenceBasicExample_ba name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "cloudquotas" { @@ -112,6 +113,7 @@ func testAccCloudQuotasQuotaPreference_cloudquotasQuotaPreferenceBasicExample_in name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "cloudquotas" { @@ -150,6 +152,7 @@ func testAccCloudQuotasQuotaPreference_cloudquotasQuotaPreferenceBasicExample_de name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "cloudquotas" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl index 1ccd74953d44..d01ec9aa745a 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_from_machine_image_test.go.tmpl @@ -598,6 +598,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl index e29c131cb3b4..ac553ff83357 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_template_test.go.tmpl @@ -2853,6 +2853,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -2869,6 +2870,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl index 4f729fbb74b5..7308ff48735d 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_instance_test.go.tmpl @@ -6619,6 +6619,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -6635,6 +6636,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl index 21fbab93d494..d22cdd5968b0 100644 --- a/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/go/resource_compute_region_instance_template_test.go.tmpl @@ -2356,6 +2356,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -2372,6 +2373,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb index e47376ecddc1..95a089a3154c 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.erb @@ -954,6 +954,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb index fc3ad9bd05ac..fd08ab884cfe 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.erb @@ -2863,6 +2863,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -2879,6 +2880,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb index 14583f4321cd..cc035b02e98f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.erb @@ -6728,6 +6728,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -6744,6 +6745,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go index 096c179f8f46..cd0142ef5549 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_cloud_armor_tier_test.go @@ -82,6 +82,7 @@ resource "google_project" "project" { name = "%{projectID}" org_id = "%{org}" billing_account = "%{billingId}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -104,6 +105,7 @@ resource "google_project" "project" { name = "%{projectID}" org_id = "%{org}" billing_account = "%{billingId}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go index 39bf09aa41ca..5553dd2331b3 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_default_network_tier_test.go @@ -71,6 +71,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -93,6 +94,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go index 45f001271bb0..d594781c541d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_project_metadata_test.go @@ -129,6 +129,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -154,6 +155,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -179,6 +181,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -205,6 +208,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb index 7a1cd1c5eed9..7674b32c2d3e 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.erb @@ -2366,6 +2366,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -2382,6 +2383,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go index a5f3f21bfb92..52b836733dd1 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_shared_reservation_update_test.go @@ -61,6 +61,7 @@ resource "google_project" "owner_project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } @@ -75,6 +76,7 @@ resource "google_project" "guest_project" { name = "tf-test-2%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project" "guest_project_second" { @@ -82,6 +84,7 @@ resource "google_project" "guest_project_second" { name = "tf-test-3%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project" "guest_project_third" { @@ -89,6 +92,7 @@ resource "google_project" "guest_project_third" { name = "tf-test-4%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_organization_policy" "shared_reservation_org_policy" { @@ -150,6 +154,7 @@ resource "google_project" "owner_project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "compute" { @@ -163,6 +168,7 @@ resource "google_project" "guest_project" { name = "tf-test-2%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project" "guest_project_second" { @@ -170,6 +176,7 @@ resource "google_project" "guest_project_second" { name = "tf-test-3%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project" "guest_project_third" { @@ -177,6 +184,7 @@ resource "google_project" "guest_project_third" { name = "tf-test-4%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_organization_policy" "shared_reservation_org_policy" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go index 5b38a6b70156..6880d447814a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go @@ -117,6 +117,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project" "service" { @@ -124,6 +125,7 @@ resource "google_project" "service" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host" { @@ -159,6 +161,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project" "service" { @@ -166,6 +169,7 @@ resource "google_project" "service" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host" { @@ -187,6 +191,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project" "service" { @@ -194,6 +199,7 @@ resource "google_project" "service" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host" { @@ -230,6 +236,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project" "service" { @@ -237,6 +244,7 @@ resource "google_project" "service" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host" { diff --git a/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go b/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go index fd4feabe6858..0d0e48cce00f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_usage_export_bucket_test.go @@ -39,6 +39,7 @@ resource "google_project" "base" { name = "Export Bucket Base" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service" { diff --git a/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl index c7ed43e32666..43acb80e0900 100644 --- a/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/go/resource_container_cluster_test.go.tmpl @@ -8469,6 +8469,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -8485,6 +8486,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb index ac6780fea3e5..08ee69a7fa11 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb +++ b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb @@ -8546,6 +8546,7 @@ resource "google_project" "host_project" { project_id = "%s-host" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host_project" { @@ -8562,6 +8563,7 @@ resource "google_project" "service_project" { project_id = "%s-service" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "service_project" { diff --git a/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go b/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go index 240bb5453ce2..2b84140aa14d 100644 --- a/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go +++ b/mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go @@ -59,6 +59,7 @@ resource "google_project" "project" { project_id = "%s" name = "%[1]s" org_id = "%s" + deletion_policy = "DELETE" lifecycle { ignore_changes = [billing_account] } diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go index b7f60b07a3f8..640d82c9e1e5 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_agent_test.go @@ -3,9 +3,9 @@ package dialogflow_test import ( "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowAgent_update(t *testing.T) { @@ -52,6 +52,7 @@ func testAccDialogflowAgent_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -95,6 +96,7 @@ func testAccDialogflowAgent_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go index 373894d57561..40339bd665f0 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_entity_type_test.go @@ -49,6 +49,7 @@ func testAccDialogflowEntityType_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -100,6 +101,7 @@ func testAccDialogflowEntityType_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go index 3d96bd347040..4cde09ca75e7 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_fulfillment_test.go @@ -49,6 +49,7 @@ func testAccDialogflowFulfillment_basic(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -91,6 +92,7 @@ func testAccDialogflowEntityType_full(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go index f9d1339ab953..f4e4194ca4d4 100644 --- a/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/go/resource_dialogflow_intent_test.go @@ -74,6 +74,7 @@ func testAccDialogflowIntent_basic(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -115,6 +116,7 @@ func testAccDialogflowIntent_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -165,6 +167,7 @@ func testAccDialogflowIntent_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb index f6cbb50c55c1..4dde62a9509b 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.erb @@ -53,6 +53,7 @@ func testAccDialogflowAgent_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -96,6 +97,7 @@ func testAccDialogflowAgent_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb index 11075e4ebd06..d33bffd365aa 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.erb @@ -50,6 +50,7 @@ func testAccDialogflowEntityType_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -101,6 +102,7 @@ func testAccDialogflowEntityType_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb index 7107116736da..e4a5051ab6b5 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.erb @@ -50,6 +50,7 @@ func testAccDialogflowFulfillment_basic(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -92,6 +93,7 @@ func testAccDialogflowEntityType_full(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb index 417285949bf6..4a1832950168 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.erb @@ -75,6 +75,7 @@ func testAccDialogflowIntent_basic(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -116,6 +117,7 @@ func testAccDialogflowIntent_full1(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { @@ -166,6 +168,7 @@ func testAccDialogflowIntent_full2(context map[string]interface{}) string { project_id = "tf-test-dialogflow-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "agent_project" { diff --git a/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go b/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go index d84978da525b..e2521f2b5b33 100644 --- a/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go +++ b/mmv1/third_party/terraform/services/documentaiwarehouse/resource_document_ai_warehouse_document_schema_test.go @@ -126,6 +126,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" "contentwarehouse" { @@ -159,6 +160,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -201,6 +203,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -242,6 +245,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -283,6 +287,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -341,6 +346,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -406,6 +412,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -454,6 +461,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -495,6 +503,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { @@ -536,6 +545,7 @@ resource "google_project" "project" { name = "tf-test-%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_document_ai_warehouse_location" "loc" { diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl index a5f1b25fd928..ca3363783930 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_project_test.go.tmpl @@ -47,6 +47,7 @@ resource "google_project" "default" { project_id = "tf-test-my-project%{random_suffix}" name = "tf-test-my-project%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" diff --git a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl index 86b26599fa69..8106154a2bff 100644 --- a/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebase/go/resource_firebase_web_app_test.go.tmpl @@ -125,6 +125,7 @@ resource "google_project" "default" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb index 9a53aff81f0b..2317b0380a4b 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_project_test.go.erb @@ -48,6 +48,7 @@ resource "google_project" "default" { project_id = "tf-test-my-project%{random_suffix}" name = "tf-test-my-project%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" diff --git a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb index 85f64ee8c37e..587528e46604 100644 --- a/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb +++ b/mmv1/third_party/terraform/services/firebase/resource_firebase_web_app_test.go.erb @@ -126,6 +126,7 @@ resource "google_project" "default" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl index 764a76113cae..dfd7901eff82 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/firebaseappcheck/go/resource_firebase_app_check_service_config_test.go.tmpl @@ -67,6 +67,7 @@ resource "google_project" "default" { project_id = "tf-test-appcheck%{random_suffix}" name = "tf-test-appcheck%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb index 298c89c11f50..0839ab183c22 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_service_config_test.go.erb @@ -68,6 +68,7 @@ resource "google_project" "default" { project_id = "tf-test-appcheck%{random_suffix}" name = "tf-test-appcheck%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" labels = { "firebase" = "enabled" } diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go index 4f3e61d95e63..e4d3914f984c 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_document_test.go @@ -48,6 +48,7 @@ resource "google_project" "project" { project_id = "tf-test%s" name = "tf-test%s" org_id = "%s" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go index b17f503c84ad..7543ea0043aa 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go @@ -78,6 +78,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "time_sleep" "wait_60_seconds" { diff --git a/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl index f3308d0f4f89..0efe16dc20f4 100644 --- a/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub/go/resource_gke_hub_feature_membership_test.go.tmpl @@ -1344,6 +1344,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "anthos" { diff --git a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb b/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb index a15fa7090392..cd2cbecc37d0 100644 --- a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_test.go.erb @@ -1347,6 +1347,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "anthos" { diff --git a/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go b/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go index 0d85b9b38d83..48eb09f11440 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go +++ b/mmv1/third_party/terraform/services/gkehub2/go/iam_gke_hub_feature_test.go @@ -128,6 +128,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -164,6 +165,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -213,6 +215,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -250,6 +253,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -286,6 +290,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id diff --git a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl index 32afc2869eb2..cb2517c469f4 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_feature_test.go.tmpl @@ -148,6 +148,7 @@ resource "google_project" "project" { org_id = "%{org_id}" billing_account = "%{billing_account}" provider = google-beta + deletion_policy = "DELETE" } resource "google_project_service" "mesh" { @@ -901,6 +902,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mesh" { @@ -956,6 +958,7 @@ resource "google_project" "project_2" { project_id = "tf-test-gkehub%{random_suffix}-2" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "compute_2" { diff --git a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl index 4ccbfabfa3e5..7fb8d5170a94 100644 --- a/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl +++ b/mmv1/third_party/terraform/services/gkehub2/go/resource_gke_hub_fleet_test.go.tmpl @@ -118,6 +118,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "gkehub" { diff --git a/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb index 852db173bfa0..1df8bc08690b 100644 --- a/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.erb @@ -129,6 +129,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -165,6 +166,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -214,6 +216,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -251,6 +254,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id @@ -287,6 +291,7 @@ resource "google_project" "project" { project_id = "%{project_id}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mcsd" { project = google_project.project.project_id diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb index 2b3979fb2126..15e61cb7bd47 100644 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb @@ -149,6 +149,7 @@ resource "google_project" "project" { org_id = "%{org_id}" billing_account = "%{billing_account}" provider = google-beta + deletion_policy = "DELETE" } resource "google_project_service" "mesh" { @@ -985,6 +986,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "mesh" { @@ -1040,6 +1042,7 @@ resource "google_project" "project_2" { project_id = "tf-test-gkehub%{random_suffix}-2" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "compute_2" { diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb index e41d8f8ce17d..b7f823017e3f 100755 --- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb +++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_fleet_test.go.erb @@ -119,6 +119,7 @@ resource "google_project" "project" { project_id = "tf-test-gkehub%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "gkehub" { diff --git a/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go b/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go index fab549dd3035..3725784c4660 100644 --- a/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go +++ b/mmv1/third_party/terraform/services/iam2/go/resource_iam_deny_policy_test.go @@ -76,7 +76,7 @@ func TestAccIAM2DenyPolicy_iamDenyPolicyFolderParent(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "parent"}, }, - { + { Config: testAccIAM2DenyPolicy_iamDenyPolicyFolderUpdate(context), }, { @@ -96,6 +96,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "example" { @@ -142,6 +143,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "example" { diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go b/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go index c6c302303e6b..916dbf0ca439 100644 --- a/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go +++ b/mmv1/third_party/terraform/services/iam2/resource_iam_access_boundary_policy_test.go @@ -75,6 +75,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_level" "test-access" { @@ -129,6 +130,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_access_context_manager_access_level" "test-access" { diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb index a3ffe0fe402e..921c454c7166 100644 --- a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.erb @@ -97,6 +97,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "example" { @@ -143,6 +144,7 @@ resource "google_project" "project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_iam_deny_policy" "example" { diff --git a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go index d1d8d2019c64..0442f018d845 100644 --- a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go +++ b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go @@ -43,6 +43,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go b/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go index cada2c783e32..a9fc2d73eea1 100644 --- a/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go +++ b/mmv1/third_party/terraform/services/iap/resource_iap_brand_test.go @@ -40,6 +40,7 @@ resource "google_project" "project" { project_id = "tf-test%{random_suffix}" name = "tf-test%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "google_project_service" "project_service" { diff --git a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go index f17719ca72ef..3b7ddf95bffe 100644 --- a/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go +++ b/mmv1/third_party/terraform/services/identityplatform/resource_identity_platform_config_test.go @@ -54,6 +54,7 @@ resource "google_project" "basic" { name = "tf-test-my-project%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_acct}" + deletion_policy = "DELETE" labels = { firebase = "enabled" } @@ -132,6 +133,7 @@ resource "google_project" "basic" { name = "tf-test-my-project%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_acct}" + deletion_policy = "DELETE" labels = { firebase = "enabled" } diff --git a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go index dbdeb07868e8..0dd089a68647 100644 --- a/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go +++ b/mmv1/third_party/terraform/services/integrationconnectors/resource_integration_connectors_managed_zone_test.go @@ -53,6 +53,7 @@ resource "google_project" "target_project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_iam_member" "dns_peer_binding" { @@ -115,6 +116,7 @@ resource "google_project" "target_project" { name = "tf-test%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_iam_member" "dns_peer_binding" { diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb index fec62d1eb443..7b51456cbeda 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_secret_asymmetric_test.go.erb @@ -128,6 +128,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl index a9141acc64c2..7eb1400649ef 100644 --- a/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/data_source_google_kms_secret_asymmetric_test.go.tmpl @@ -127,6 +127,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl index b31446773c88..fd76fe6db428 100644 --- a/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/iam_kms_crypto_key_test.go.tmpl @@ -369,6 +369,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -413,6 +414,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -467,6 +469,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -517,6 +520,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -562,6 +566,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -612,6 +617,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -667,6 +673,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { diff --git a/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl b/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl index ce234d262722..7f0d609c63f1 100644 --- a/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/go/iam_kms_key_ring_test.go.tmpl @@ -282,6 +282,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -321,6 +322,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -370,6 +372,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -415,6 +418,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -455,6 +459,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -500,6 +505,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -547,6 +553,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { diff --git a/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb b/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb index 3129c52301c7..0afa1af185ac 100644 --- a/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/iam_kms_crypto_key_test.go.erb @@ -370,6 +370,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -414,6 +415,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -468,6 +470,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -518,6 +521,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -563,6 +567,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -613,6 +618,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -668,6 +674,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { diff --git a/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb b/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb index 00b836b67488..19eb5d77f374 100644 --- a/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb +++ b/mmv1/third_party/terraform/services/kms/iam_kms_key_ring_test.go.erb @@ -283,6 +283,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -322,6 +323,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -371,6 +373,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -416,6 +419,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -456,6 +460,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -501,6 +506,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { @@ -548,6 +554,7 @@ resource "google_project" "test_project" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "kms" { diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go index 1d2488d15140..172af8e4f404 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_crypto_key_test.go @@ -673,6 +673,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -703,6 +704,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -731,6 +733,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -758,6 +761,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -790,6 +794,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -812,6 +817,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -843,6 +849,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -876,6 +883,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -908,6 +916,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -942,6 +951,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -980,6 +990,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -1010,6 +1021,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -1044,6 +1056,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -1082,6 +1095,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -1120,6 +1134,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go index 053b10d7e6dc..35f3b31e7a33 100644 --- a/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go +++ b/mmv1/third_party/terraform/services/kms/resource_kms_key_ring_test.go @@ -62,6 +62,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -84,6 +85,7 @@ resource "google_project" "acceptance" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go index ddf6f770a40e..96a2d98a4cc7 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_cmek_settings_test.go @@ -44,6 +44,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "logging_service" { diff --git a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go index c962da0de36b..dc41e8468a77 100644 --- a/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go +++ b/mmv1/third_party/terraform/services/logging/data_source_google_logging_project_settings_test.go @@ -40,6 +40,7 @@ func testAccLoggingProjectSettings_datasource(context map[string]interface{}) st name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "logging_service" { diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go index 12e363dfe457..b5e88111e424 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_bucket_config_test.go @@ -276,6 +276,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "basic" { @@ -295,6 +296,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } // time_sleep would allow for permissions to be granted before creating log bucket @@ -324,6 +326,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "fixed_locked" { @@ -350,6 +353,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "logging_service" { @@ -504,6 +508,7 @@ func getLoggingBucketConfigs(context map[string]interface{}) map[string]string { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account_name}" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "basic" { @@ -622,6 +627,7 @@ resource "google_project" "default" { name = "%{project_name}" org_id = "%{org_id}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "basic" { diff --git a/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go b/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go index b6482366c698..cb3274ce5a70 100644 --- a/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go +++ b/mmv1/third_party/terraform/services/logging/resource_logging_project_sink_test.go @@ -376,7 +376,8 @@ resource "google_project" "project" { project_id = "%s" name = "%s" org_id = "%s" - billing_account = "%s" + billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "logging_service" { @@ -517,6 +518,7 @@ resource "google_project" "destination-project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "destination-bucket" { @@ -579,6 +581,7 @@ resource "google_project" "destination-project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_logging_project_bucket_config" "destination-bucket" { diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go index 1b216489bf18..15f9d8183d54 100644 --- a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go +++ b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_monitored_project_test.go @@ -76,6 +76,7 @@ resource "google_project" "basic" { project_id = "tf-test-m-id%{random_suffix}" name = "tf-test-m-id%{random_suffix}-display" org_id = "%{org_id}" + deletion_policy = "DELETE" } `, context) } @@ -91,6 +92,7 @@ resource "google_project" "basic" { project_id = "tf-test-m-id%{random_suffix}" name = "tf-test-m-id%{random_suffix}-display" org_id = "%{org_id}" + deletion_policy = "DELETE" } `, context) } diff --git a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go index e91cc848f72e..f4cb03f24fde 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go +++ b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go @@ -184,6 +184,7 @@ resource "google_project" "basic" { project_id = "tf-test-id%{random_suffix}" name = "tf-test-id%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } @@ -338,6 +339,7 @@ resource "google_project" "basic" { project_id = "tf-test-id%{random_suffix}" name = "tf-test-id%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } @@ -375,6 +377,7 @@ resource "google_project" "basic" { project_id = "tf-test-id%{random_suffix}" name = "tf-test-id%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } diff --git a/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go b/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go index c57b782b47ba..b83dd0628ebd 100644 --- a/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go +++ b/mmv1/third_party/terraform/services/oslogin/resource_os_login_ssh_public_key_test.go @@ -47,6 +47,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" "compute" { project = google_project.project.project_id diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go index 47736d5ba86d..600e08064826 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_service_test.go @@ -36,6 +36,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "foo" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go index ff21d0ae1f7b..4840c2bdbf53 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_project_test.go @@ -42,6 +42,7 @@ resource "google_project" "project" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" labels = { my-label = "my-label-value" } diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go index 9bf777f00060..c0a89bace550 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_binding_test.go @@ -3,9 +3,10 @@ package resourcemanager_test import ( "fmt" "regexp" + "testing" + "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -266,7 +267,7 @@ func TestAccProjectIamBinding_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { @@ -282,6 +283,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -298,6 +300,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -320,6 +323,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -336,6 +340,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -352,6 +357,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -368,6 +374,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go index e201bb1207c9..019e75c5029c 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_member_test.go @@ -3,9 +3,10 @@ package resourcemanager_test import ( "fmt" "regexp" + "testing" + "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -182,7 +183,7 @@ func TestAccProjectIamMember_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for member \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { @@ -198,6 +199,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { @@ -214,6 +216,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { @@ -236,6 +239,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go index e70c0136e6b0..9b923080d453 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_iam_policy_test.go @@ -55,7 +55,7 @@ func TestAccProjectIamPolicy_emptyMembers(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -72,7 +72,7 @@ func TestAccProjectIamPolicy_expanded(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -92,7 +92,7 @@ func TestAccProjectIamPolicy_basicAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -122,7 +122,7 @@ func TestAccProjectIamPolicy_expandedAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -141,7 +141,7 @@ func TestAccProjectIamPolicy_withCondition(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -176,7 +176,7 @@ func TestAccProjectIamPolicy_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), + Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value for bindings\\.1\\.members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { @@ -264,6 +264,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -299,6 +300,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -352,6 +354,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } `, pid, pid, org) } @@ -362,6 +365,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -384,6 +388,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -415,6 +420,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -468,6 +474,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_service_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_service_test.go.tmpl index fd656babf6ce..57d13174696f 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/resourcemanager/go/resource_google_project_service_test.go.tmpl @@ -256,6 +256,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -277,6 +278,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -299,6 +301,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -314,6 +317,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -336,6 +340,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } // by passing through locals, we break the dependency chain @@ -366,6 +371,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -384,6 +390,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { 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 5d6b3b1ec90d..ca151fe79b6d 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project.go @@ -67,17 +67,10 @@ func ResourceGoogleProject() *schema.Resource { ValidateFunc: verify.ValidateProjectID(), Description: `The project ID. Changing this forces a new project to be created.`, }, - "skip_delete": { - Type: schema.TypeBool, - 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.`, - }, "deletion_policy": { Type: schema.TypeString, Optional: true, - Default: "DELETE", + Default: "PREVENT", Description: `The deletion policy for the Project. Setting PREVENT will protect the project against any destroy actions caused by a terraform apply or terraform destroy. Setting ABANDON allows the resource to be abandoned rather than deleted. Possible values are: "PREVENT", "ABANDON", "DELETE"`, ValidateFunc: validation.StringInSlice([]string{"PREVENT", "ABANDON", "DELETE"}, false), @@ -316,7 +309,7 @@ func resourceGoogleProjectRead(d *schema.ResourceData, meta interface{}) error { } // Explicitly set client-side fields to default values if unset if _, ok := d.GetOkExists("deletion_policy"); !ok { - if err := d.Set("deletion_policy", "DELETE"); err != nil { + if err := d.Set("deletion_policy", "PREVENT"); err != nil { return fmt.Errorf("Error setting deletion_policy: %s", err) } } @@ -514,7 +507,7 @@ func resourceGoogleProjectDelete(d *schema.ResourceData, meta interface{}) error return err } deletionPolicy := d.Get("deletion_policy").(string) - // Only delete projects if skip_delete isn't set + if deletionPolicy == "PREVENT" { return fmt.Errorf("Cannot destroy project as deletion_policy is set to PREVENT.") } else if deletionPolicy == "ABANDON" { @@ -523,19 +516,16 @@ func resourceGoogleProjectDelete(d *schema.ResourceData, meta interface{}) error return nil } else { // Only delete projects if deletion_policy isn't PREVENT or ABANDON - // Only delete projects if skip_delete isn't set - if !d.Get("skip_delete").(bool) { - parts := strings.Split(d.Id(), "/") - pid := parts[len(parts)-1] - if err := transport_tpg.Retry(transport_tpg.RetryOptions{ - RetryFunc: func() error { - _, delErr := config.NewResourceManagerClient(userAgent).Projects.Delete(pid).Do() - return delErr - }, - Timeout: d.Timeout(schema.TimeoutDelete), - }); err != nil { - return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Project %s", pid)) - } + parts := strings.Split(d.Id(), "/") + pid := parts[len(parts)-1] + if err := transport_tpg.Retry(transport_tpg.RetryOptions{ + RetryFunc: func() error { + _, delErr := config.NewResourceManagerClient(userAgent).Projects.Delete(pid).Do() + return delErr + }, + Timeout: d.Timeout(schema.TimeoutDelete), + }); err != nil { + return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Project %s", pid)) } } d.SetId("") diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go index e1136dfe96a2..acb8cd5407ca 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_default_service_accounts_test.go @@ -46,6 +46,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_default_service_accounts" "acceptance" { @@ -177,6 +178,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go index 0dca2fdbfaff..5b8dd41cf342 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_audit_config_test.go @@ -307,6 +307,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { @@ -329,6 +330,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { @@ -359,6 +361,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { @@ -381,6 +384,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { @@ -409,6 +413,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { @@ -427,6 +432,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_audit_config" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb index 6d1eba93d359..4e4e801c6eb3 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.erb @@ -283,6 +283,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -299,6 +300,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -321,6 +323,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -337,6 +340,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -353,6 +357,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { @@ -369,6 +374,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go index 06086dacfbc0..3798b54fe940 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_remove_test.go @@ -94,6 +94,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { @@ -122,6 +123,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { @@ -150,6 +152,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { @@ -178,6 +181,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { @@ -206,6 +210,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { @@ -240,6 +245,7 @@ resource "google_project" "project" { project_id = "tf-test-%s" name = "tf-test-%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_binding" "bar" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb index d2bcdd026033..54ac175e8693 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.erb @@ -199,6 +199,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { @@ -215,6 +216,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { @@ -237,6 +239,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_member" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb index fe37c521628f..187cfc7bec72 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.erb @@ -265,6 +265,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -300,6 +301,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -353,6 +355,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } `, pid, pid, org) } @@ -363,6 +366,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -385,6 +389,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -416,6 +421,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { @@ -469,6 +475,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_iam_policy" "acceptance" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb index a19f4245e514..b564bd4b050e 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_service_test.go.erb @@ -257,6 +257,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -278,6 +279,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -300,6 +302,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -315,6 +318,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -337,6 +341,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } // by passing through locals, we break the dependency chain @@ -367,6 +372,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { @@ -386,6 +392,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "test" { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go index 41bfdb3037b1..2bdac97b9dfc 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_test.go @@ -60,7 +60,7 @@ func TestAccProject_create(t *testing.T) { Steps: []resource.TestStep{ // This step creates a new project { - Config: testAccProject_create(pid, org), + Config: testAccProject(pid, org), Check: resource.ComposeTestCheckFunc( testAccCheckGoogleProjectExists("google_project.acceptance", pid), ), @@ -96,7 +96,7 @@ func TestAccProject_billing(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy"}, }, // Update to a different billing account { @@ -107,7 +107,7 @@ func TestAccProject_billing(t *testing.T) { }, // Unlink the billing account { - Config: testAccProject_create(pid, org), + Config: testAccProject(pid, org), Check: resource.ComposeTestCheckFunc( testAccCheckGoogleProjectHasBillingAccount(t, "google_project.acceptance", pid, ""), ), @@ -137,7 +137,7 @@ func TestAccProject_labels(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "labels", "terraform_labels", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy", "labels", "terraform_labels"}, }, // update project with labels { @@ -149,7 +149,7 @@ func TestAccProject_labels(t *testing.T) { }, // update project delete labels { - Config: testAccProject_create(pid, org), + Config: testAccProject(pid, org), Check: resource.ComposeTestCheckFunc( testAccCheckGoogleProjectExists("google_project.acceptance", pid), testAccCheckGoogleProjectHasNoLabels(t, "google_project.acceptance", pid), @@ -210,7 +210,7 @@ func TestAccProject_migrateParent(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy"}, }, { Config: testAccProject_migrateParentOrg(pid, folderDisplayName, org), @@ -219,7 +219,7 @@ func TestAccProject_migrateParent(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy"}, }, { Config: testAccProject_migrateParentFolder(pid, folderDisplayName, org), @@ -228,7 +228,7 @@ func TestAccProject_migrateParent(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy"}, }, }, }) @@ -367,7 +367,7 @@ func TestAccProject_noAllowDestroy(t *testing.T) { ResourceName: "google_project.acceptance", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"skip_delete", "deletion_policy"}, + ImportStateVerifyIgnore: []string{"deletion_policy"}, }, { Config: testAccProject_noAllowDestroy(pid, org), @@ -375,7 +375,7 @@ func TestAccProject_noAllowDestroy(t *testing.T) { ExpectError: regexp.MustCompile("deletion_policy"), }, { - Config: testAccProject_create(pid, org), + Config: testAccProject(pid, org), }, }, }) @@ -415,10 +415,22 @@ func testAccProject_createWithoutOrg(pid string) string { resource "google_project" "acceptance" { project_id = "%s" name = "%s" + deletion_policy = "DELETE" } `, pid, pid) } +func testAccProject(pid, org string) string { + return fmt.Sprintf(` +resource "google_project" "acceptance" { + project_id = "%s" + name = "%s" + org_id = "%s" + deletion_policy = "DELETE" +} +`, pid, pid, org) +} + func testAccProject_noAllowDestroy(pid, org string) string { return fmt.Sprintf(` resource "google_project" "acceptance" { @@ -448,6 +460,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } `, pid, pid, org, billing) } @@ -458,6 +471,7 @@ resource "google_project" "acceptance" { project_id = "%s" name = "%s" org_id = "%s" + deletion_policy = "DELETE" labels = {`, pid, pid, org) l := "" @@ -476,6 +490,7 @@ resource "google_project" "acceptance" { name = "%s" org_id = "%s" billing_account = "%s" # requires billing to enable compute API + deletion_policy = "DELETE" auto_create_network = false } `, pid, pid, org, billing) @@ -486,6 +501,7 @@ func testAccProject_parentFolder(pid, folderName, org string) string { resource "google_project" "acceptance" { project_id = "%s" name = "%s" + deletion_policy = "DELETE" folder_id = google_folder.folder1.id } @@ -503,6 +519,7 @@ func testAccProject_migrateParentFolder(pid, folderName, org string) string { resource "google_project" "acceptance" { project_id = "%s" name = "%s" + deletion_policy = "DELETE" folder_id = google_folder.folder1.id } @@ -520,6 +537,7 @@ func testAccProject_migrateParentOrg(pid, folderName, org string) string { resource "google_project" "acceptance" { project_id = "%s" name = "%s" + deletion_policy = "DELETE" org_id = "%s" } diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go index 850b43bf3824..0161a7bbe89b 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_resourcemanager_lien_test.go @@ -100,6 +100,7 @@ resource "google_project" "project" { project_id = "%s" name = "some test project" org_id = "%s" + deletion_policy = "DELETE" } resource "google_resource_manager_lien" "lien" { diff --git a/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go b/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go index ef1849b31545..395602ae144c 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/data_source_google_service_networking_peered_dns_domain_test.go @@ -45,6 +45,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host-compute" { diff --git a/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go b/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go index d7ba99d3a270..89489a47f8c2 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/resource_google_service_networking_peered_dns_domain_test.go @@ -36,6 +36,7 @@ resource "google_project" "host" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "host-compute" { diff --git a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go index a91dd1643c12..20340de72a0d 100644 --- a/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go +++ b/mmv1/third_party/terraform/services/servicenetworking/resource_service_networking_connection_test.go @@ -186,6 +186,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "servicenetworking" { @@ -223,6 +224,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "servicenetworking" { @@ -278,6 +280,7 @@ resource "google_project" "project" { name = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_project_service" "servicenetworking" { diff --git a/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl b/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl index 22a7d1e9f0bc..7b5f732b3fc6 100644 --- a/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl +++ b/mmv1/third_party/terraform/services/serviceusage/go/resource_service_usage_consumer_quota_override_test.go.tmpl @@ -39,6 +39,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "quota%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb b/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb index 9ee901f4a6c2..d621f922ee8b 100644 --- a/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb +++ b/mmv1/third_party/terraform/services/serviceusage/resource_service_usage_consumer_quota_override_test.go.erb @@ -40,6 +40,7 @@ resource "google_project" "my_project" { name = "tf-test-project" project_id = "quota%{random_suffix}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "google_service_usage_consumer_quota_override" "override" { diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go index 6f1a94e0f017..71ee6758c746 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go +++ b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go @@ -3030,6 +3030,7 @@ resource "google_project" "testproject" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_sql_database_instance" "instance" { @@ -3057,6 +3058,7 @@ resource "google_project" "testproject" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_sql_database_instance" "instance" { @@ -3090,6 +3092,7 @@ resource "google_project" "testproject" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_sql_database_instance" "instance" { @@ -3123,6 +3126,7 @@ resource "google_project" "testproject" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_sql_database_instance" "instance" { @@ -3157,6 +3161,7 @@ resource "google_project" "testproject" { project_id = "%s" org_id = "%s" billing_account = "%s" + deletion_policy = "DELETE" } resource "google_sql_database_instance" "instance" { diff --git a/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go b/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go index bf999a4ad9f1..24c48a851365 100644 --- a/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go +++ b/mmv1/third_party/terraform/services/storage/data_source_google_storage_buckets_test.go @@ -70,6 +70,7 @@ resource "google_project" "acceptance" { project_id = local.project_id org_id = local.organization billing_account = local.billing_account + deletion_policy = "DELETE" } resource "google_storage_bucket" "one" { diff --git a/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go b/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go index d6b7177ecdf2..83f48c3aeb56 100644 --- a/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go +++ b/mmv1/third_party/terraform/services/storage/go/resource_storage_bucket_test.go @@ -133,7 +133,7 @@ func TestAccStorageBucket_AutoclassDiffSupress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,false), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, false), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -146,7 +146,7 @@ func TestAccStorageBucket_AutoclassDiffSupress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,true), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, true), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -346,7 +346,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"ASYNC_TURBO"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "ASYNC_TURBO"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "ASYNC_TURBO"), @@ -359,7 +359,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"DEFAULT"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "DEFAULT"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "DEFAULT"), @@ -399,7 +399,7 @@ func TestAccStorageBucket_multiLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_multiLocation_rpo(bucketName,"DEFAULT"), + Config: testAccStorageBucket_multiLocation_rpo(bucketName, "DEFAULT"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "DEFAULT"), @@ -1513,7 +1513,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,7776000), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 7776000), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1528,7 +1528,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,0), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1804,7 +1804,7 @@ resource "google_storage_bucket" "bucket" { `, bucketName) } -func testAccStorageBucket_dualLocation_rpo(bucketName string,rpo string) string { +func testAccStorageBucket_dualLocation_rpo(bucketName string, rpo string) string { return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" @@ -1815,10 +1815,10 @@ resource "google_storage_bucket" "bucket" { } rpo = "%s" } -`, bucketName,rpo) +`, bucketName, rpo) } -func testAccStorageBucket_multiLocation_rpo(bucketName string,rpo string) string { +func testAccStorageBucket_multiLocation_rpo(bucketName string, rpo string) string { return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" @@ -1826,7 +1826,7 @@ resource "google_storage_bucket" "bucket" { force_destroy = true rpo = "%s" } -`, bucketName,rpo) +`, bucketName, rpo) } func testAccStorageBucket_customAttributes(bucketName string) string { @@ -2447,6 +2447,7 @@ resource "google_project" "acceptance" { project_id = "tf-test-%{random_suffix}" org_id = "%{organization}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { @@ -2548,7 +2549,7 @@ resource "google_storage_bucket" "bucket" { } func testAccStorageBucket_SoftDeletePolicy(bucketName string, duration int) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" location = "US" diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb index 01a27190e7fb..34a56d019ad1 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.erb @@ -2445,6 +2445,7 @@ resource "google_project" "acceptance" { project_id = "tf-test-%{random_suffix}" org_id = "%{organization}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/services/tags/resource_tags_test.go b/mmv1/third_party/terraform/services/tags/resource_tags_test.go index ec62dd61d55d..f883b401ed7e 100644 --- a/mmv1/third_party/terraform/services/tags/resource_tags_test.go +++ b/mmv1/third_party/terraform/services/tags/resource_tags_test.go @@ -378,6 +378,7 @@ resource "google_project" "project" { project_id = "%{project_id}" name = "%{project_id}" org_id = "%{org_id}" + deletion_policy = "DELETE" } resource "google_tags_tag_key" "key" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go index fff3aafbfcc8..b96b3be603ab 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_peering_test.go @@ -42,6 +42,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go index df76f5d3527a..5bf2f8114544 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_policy_test.go @@ -43,6 +43,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go index f59315fab11d..efe047561ac0 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/data_source_google_vmwareengine_network_test.go @@ -42,6 +42,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go index ddedb3210f44..b2ed3a741d8c 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_cluster_test.go @@ -75,6 +75,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go index cbad915c046c..ee2b0a21b198 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_external_address_test.go @@ -67,6 +67,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go index eda97eae2c4f..708065b04472 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_peering_test.go @@ -55,6 +55,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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go index c1fd041086d6..2eb1d8ba869a 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_policy_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" "vmwareengine" { diff --git a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go index 2497e263486a..2b1b19a6ad7f 100644 --- a/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go +++ b/mmv1/third_party/terraform/services/vmwareengine/resource_vmwareengine_network_test.go @@ -65,6 +65,7 @@ resource "google_project" "acceptance" { project_id = "tf-test-%{random_suffix}" org_id = "%{organization}" billing_account = "%{billing_account}" + deletion_policy = "DELETE" } resource "google_project_service" "acceptance" { diff --git a/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown b/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown index 0aca9aa44f66..76fac5661814 100644 --- a/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown +++ b/mmv1/third_party/terraform/website/docs/guides/version_6_upgrade.html.markdown @@ -333,3 +333,16 @@ in GCP, including the labels configured through Terraform, the system, and other ### Resource: `google_identity_platform_project_default_config` is now removed `google_identity_platform_project_default_config` is removed in favor of `google_identity_platform_project_config` + +## Resource: `google_project` + +### Project deletion now prevented by default with `deletion_policy` + +The field `skip_delete` is removed and the default value for `deletion_policy` is now +`PREVENT` instead of `DELETE`. The `PREVENT` value for `deletion_policy` stops Terraform +from deleting or recreating your project. Setting this field to `ABANDON` allows the +resource to be abandoned instead of deleted. To remove deletion protection entirely, +explicitly set this field to `DELETE` in your configuration and run `terraform apply`. 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. 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 fff53a4a8874..6d45074bb2d5 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,12 +78,6 @@ 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 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. Please refer to the field 'effective_labels' for all of the labels present on the resource. @@ -104,7 +98,7 @@ The following arguments are supported: * `deletion_policy` - (Optional) The deletion policy for the Project. Setting PREVENT will protect the project against any destroy actions caused by a terraform apply or terraform destroy. Setting ABANDON allows the resource to be abandoned rather than deleted, i.e., the Terraform resource can be deleted without deleting the Project via - the Google API. Possible values are: "PREVENT", "ABANDON", "DELETE". Default value is `DELETE`. + the Google API. Possible values are: "PREVENT", "ABANDON", "DELETE". Default value is `PREVENT`. ## Attributes Reference diff --git a/mmv1/third_party/tgc/tests/data/example_project_create.tf b/mmv1/third_party/tgc/tests/data/example_project_create.tf index 487a8b48873c..8039b56979ba 100644 --- a/mmv1/third_party/tgc/tests/data/example_project_create.tf +++ b/mmv1/third_party/tgc/tests/data/example_project_create.tf @@ -33,6 +33,7 @@ resource "google_project" "my_project-in-a-folder" { folder_id = google_folder.department1.name billing_account = "{{.Project.BillingAccountName}}" + deletion_policy = "DELETE" labels = { "project-label-key-a" = "project-label-val-a" diff --git a/mmv1/third_party/tgc/tests/data/example_project_create_empty_project_id.tf b/mmv1/third_party/tgc/tests/data/example_project_create_empty_project_id.tf index d260d17b364b..1f4b89671223 100644 --- a/mmv1/third_party/tgc/tests/data/example_project_create_empty_project_id.tf +++ b/mmv1/third_party/tgc/tests/data/example_project_create_empty_project_id.tf @@ -33,6 +33,7 @@ resource "google_project" "my_project-in-a-folder" { folder_id = google_folder.department1.name billing_account = "{{.Project.BillingAccountName}}" + deletion_policy = "DELETE" labels = { "project-label-key-a" = "project-label-val-a" diff --git a/mmv1/third_party/tgc/tests/data/example_project_in_folder.tf b/mmv1/third_party/tgc/tests/data/example_project_in_folder.tf index b75f74a3316f..10504a515737 100644 --- a/mmv1/third_party/tgc/tests/data/example_project_in_folder.tf +++ b/mmv1/third_party/tgc/tests/data/example_project_in_folder.tf @@ -31,4 +31,5 @@ resource "google_project" "my_project" { name = "My Project" project_id = "foobat" folder_id = "folders/{{.FolderID}}" + deletion_policy = "DELETE" } diff --git a/mmv1/third_party/tgc/tests/data/example_project_in_org.tf b/mmv1/third_party/tgc/tests/data/example_project_in_org.tf index 615ca8de7a45..157d666ba226 100644 --- a/mmv1/third_party/tgc/tests/data/example_project_in_org.tf +++ b/mmv1/third_party/tgc/tests/data/example_project_in_org.tf @@ -31,4 +31,5 @@ resource "google_project" "my_project" { name = "My Project" project_id = "foobat" org_id = "{{.OrgID}}" + deletion_policy = "DELETE" } diff --git a/mmv1/third_party/tgc/tests/data/example_project_update.tf b/mmv1/third_party/tgc/tests/data/example_project_update.tf index 65d9f6fc2f3b..e9a1bd3206e6 100644 --- a/mmv1/third_party/tgc/tests/data/example_project_update.tf +++ b/mmv1/third_party/tgc/tests/data/example_project_update.tf @@ -37,4 +37,5 @@ resource "google_project" "my_project" { labels = { "project-label-key-a" = "project-label-val-a" } + deletion_policy = "DELETE" }