diff --git a/google/services/accessapproval/data_source_access_approval_folder_service_account_test.go b/google/services/accessapproval/data_source_access_approval_folder_service_account_test.go index d7ebb2986fb..eefff5f4ad3 100644 --- a/google/services/accessapproval/data_source_access_approval_folder_service_account_test.go +++ b/google/services/accessapproval/data_source_access_approval_folder_service_account_test.go @@ -54,7 +54,7 @@ func TestAccDataSourceAccessApprovalFolderServiceAccount_basic(t *testing.T) { func testAccDataSourceAccessApprovalFolderServiceAccount_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "my_folder" { - display_name = "tf-test-my-folder%{random_suffix}" + display_name = "tf-test-folder-aasa-%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } diff --git a/google/services/accessapproval/resource_access_approval_folder_settings_test.go b/google/services/accessapproval/resource_access_approval_folder_settings_test.go index cd708be49f7..acb71ef4dd8 100644 --- a/google/services/accessapproval/resource_access_approval_folder_settings_test.go +++ b/google/services/accessapproval/resource_access_approval_folder_settings_test.go @@ -81,7 +81,7 @@ func testAccAccessApprovalFolderSettings(t *testing.T) { func testAccAccessApprovalFolderSettings_full(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "my_folder" { - display_name = "tf-test-my-folder%{random_suffix}" + display_name = "tf-test-folder-sfu-%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } @@ -109,7 +109,7 @@ resource "google_folder_access_approval_settings" "folder_access_approval" { func testAccAccessApprovalFolderSettings_update(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "my_folder" { - display_name = "tf-test-my-folder%{random_suffix}" + display_name = "tf-test-folder-sup-%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } @@ -137,7 +137,7 @@ resource "google_folder_access_approval_settings" "folder_access_approval" { func testAccAccessApprovalFolderSettings_activeKeyVersion(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "my_folder" { - display_name = "tf-test-my-folder%{random_suffix}" + display_name = "tf-test-folder-kv-%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } diff --git a/google/services/compute/resource_compute_firewall_policy_association_test.go b/google/services/compute/resource_compute_firewall_policy_association_test.go index e823ac9a900..d821d2055ed 100644 --- a/google/services/compute/resource_compute_firewall_policy_association_test.go +++ b/google/services/compute/resource_compute_firewall_policy_association_test.go @@ -54,7 +54,7 @@ func TestAccComputeFirewallPolicyAssociation_basic(t *testing.T) { func testAccComputeFirewallPolicyAssociation_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { - display_name = "tf-test-folder-%{random_suffix}" + display_name = "tf-test-folder-bup-%{random_suffix}" parent = "%{org_name}" deletion_protection = false } @@ -110,7 +110,7 @@ func TestAccComputeFirewallPolicyAssociation_organization(t *testing.T) { func testAccComputeFirewallPolicyAssociation_organization(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { - display_name = "tf-test-my-folder-%{random_suffix}" + display_name = "tf-test-folder-fpau-%{random_suffix}" parent = "%{org_name}" deletion_protection = false } @@ -168,7 +168,7 @@ func TestAccComputeFirewallPolicyAssociation_swapover(t *testing.T) { func testAccComputeFirewallPolicyAssociation_swapover(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { - display_name = "tf-test-folder-%{random_suffix}" + display_name = "tf-test-folder-sou-%{random_suffix}" parent = "%{org_name}" deletion_protection = false } diff --git a/google/services/compute/resource_compute_region_backend_service_ha_policy_manual_leader_update_test.go b/google/services/compute/resource_compute_region_backend_service_ha_policy_manual_leader_update_test.go index 4d0b4f75692..211d08083c7 100644 --- a/google/services/compute/resource_compute_region_backend_service_ha_policy_manual_leader_update_test.go +++ b/google/services/compute/resource_compute_region_backend_service_ha_policy_manual_leader_update_test.go @@ -89,6 +89,7 @@ resource "google_compute_network_endpoint" "endpoint2" { instance = google_compute_instance.endpoint-instance2.name ip_address = google_compute_instance.endpoint-instance2.network_interface[0].network_ip + depends_on = [google_compute_network_endpoint.endpoint1] } data "google_compute_image" "my_image" { @@ -128,6 +129,7 @@ resource "google_compute_instance" "endpoint-instance2" { access_config { } } + depends_on = [google_compute_instance.endpoint-instance1] } resource "google_compute_network_endpoint_group" "neg" { @@ -161,11 +163,7 @@ resource "google_compute_region_backend_service" "default" { connection_draining_timeout_sec = 0 // Explicitly depend on the endpoints to prevent test flakes due to creating // the BackendService before the endpoints have been added to the NEG. - depends_on = [ - google_compute_network_endpoint_group.neg, - google_compute_network_endpoint.endpoint1, - google_compute_network_endpoint.endpoint2 - ] + depends_on = [google_compute_network_endpoint.endpoint2] } `, context) } diff --git a/google/services/iam3/resource_iam_folders_policy_binding_test.go b/google/services/iam3/resource_iam_folders_policy_binding_test.go index 42107cd0446..1e566e257cc 100644 --- a/google/services/iam3/resource_iam_folders_policy_binding_test.go +++ b/google/services/iam3/resource_iam_folders_policy_binding_test.go @@ -73,7 +73,7 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" { } resource "google_folder" "folder" { - display_name = "test folder%{random_suffix}" + display_name = "tf-test-iam3-folder%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } @@ -108,7 +108,7 @@ resource "google_iam_principal_access_boundary_policy" "pab_policy" { } resource "google_folder" "folder" { - display_name = "test folder%{random_suffix}" + display_name = "tf-test-iam3-folder%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } diff --git a/google/services/logging/resource_logging_folder_sink_test.go b/google/services/logging/resource_logging_folder_sink_test.go index 4d975178501..c41d69cc628 100644 --- a/google/services/logging/resource_logging_folder_sink_test.go +++ b/google/services/logging/resource_logging_folder_sink_test.go @@ -37,7 +37,7 @@ func TestAccLoggingFolderSink_basic(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-skb-" + acctest.RandString(t, 10) var sink logging.LogSink @@ -67,7 +67,7 @@ func TestAccLoggingFolderSink_described(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-sded-" + acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -91,7 +91,7 @@ func TestAccLoggingFolderSink_disabled(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-skdd-" + acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -115,7 +115,7 @@ func TestAccLoggingFolderSink_removeOptionals(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-skop-" + acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -148,7 +148,7 @@ func TestAccLoggingFolderSink_folderAcceptsFullFolderPath(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-path-" + acctest.RandString(t, 10) var sink logging.LogSink @@ -179,7 +179,7 @@ func TestAccLoggingFolderSink_update(t *testing.T) { sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) updatedBucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-skup-" + acctest.RandString(t, 10) parent := "organizations/" + org var sinkBefore, sinkAfter logging.LogSink @@ -225,7 +225,7 @@ func TestAccLoggingFolderSink_updateBigquerySink(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bqDatasetID := "tf_test_sink_" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-upbq-" + acctest.RandString(t, 10) acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, @@ -258,7 +258,7 @@ func TestAccLoggingFolderSink_heredoc(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) sinkName := "tf-test-sink-" + acctest.RandString(t, 10) bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10) - folderName := "tf-test-folder-" + acctest.RandString(t, 10) + folderName := "tf-test-folder-skhd-" + acctest.RandString(t, 10) var sink logging.LogSink diff --git a/google/services/resourcemanager3/resource_resource_manager_capability_generated_test.go b/google/services/resourcemanager3/resource_resource_manager_capability_generated_test.go deleted file mode 100644 index ade61b2a089..00000000000 --- a/google/services/resourcemanager3/resource_resource_manager_capability_generated_test.go +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -// ---------------------------------------------------------------------------- -// -// *** AUTO GENERATED CODE *** Type: MMv1 *** -// -// ---------------------------------------------------------------------------- -// -// This file is automatically generated by Magic Modules and manual -// changes will be clobbered when the file is regenerated. -// -// Please read more about how to change this file in -// .github/CONTRIBUTING.md. -// -// ---------------------------------------------------------------------------- - -package resourcemanager3_test - -import ( - "fmt" - "log" - "strconv" - "strings" - "testing" - "time" - - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" - - "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-provider-google/google/tpgresource" - transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" - - "google.golang.org/api/googleapi" -) - -var ( - _ = fmt.Sprintf - _ = log.Print - _ = strconv.Atoi - _ = strings.Trim - _ = time.Now - _ = resource.TestMain - _ = terraform.NewState - _ = envvar.TestEnvVar - _ = tpgresource.SetLabels - _ = transport_tpg.Config{} - _ = googleapi.Error{} -) - -func TestAccResourceManager3Capability_resourceManagerCapabilityExample(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - ExternalProviders: map[string]resource.ExternalProvider{ - "time": {}, - }, - Steps: []resource.TestStep{ - { - Config: testAccResourceManager3Capability_resourceManagerCapabilityExample(context), - }, - { - ResourceName: "google_resource_manager_capability.capability", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"capability_name", "parent"}, - }, - }, - }) -} - -func testAccResourceManager3Capability_resourceManagerCapabilityExample(context map[string]interface{}) string { - return acctest.Nprintf(` -resource "google_folder" "folder" { - display_name = "tf-test-my-folder%{random_suffix}" - parent = "organizations/%{org_id}" - deletion_protection = false -} -resource "time_sleep" "wait_60s" { - depends_on = [google_folder.folder] - create_duration = "60s" -} -resource "google_resource_manager_capability" "capability" { - value = true - parent = "${google_folder.folder.name}" - capability_name = "app-management" - depends_on = [time_sleep.wait_60s] -} -`, context) -} diff --git a/google/services/resourcemanager3/resource_resource_manager_capability_test.go b/google/services/resourcemanager3/resource_resource_manager_capability_test.go index 13727ac1c02..e006b2abe23 100644 --- a/google/services/resourcemanager3/resource_resource_manager_capability_test.go +++ b/google/services/resourcemanager3/resource_resource_manager_capability_test.go @@ -27,6 +27,8 @@ import ( ) func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t *testing.T) { + // The test fails as the folder with a configured capability fails to be deleted. + acctest.SkipIfVcr(t) t.Parallel() context := map[string]interface{}{ @@ -68,7 +70,7 @@ func TestAccResourceManagerCapability_resourceManagerCapabilityExample_basic(t * func testAccResourceManagerCapability_resourceManagerCapabilityExample_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_folder" "folder" { - display_name = "my-folder%{random_suffix}" + display_name = "tf-test-folder-cpup-%{random_suffix}" parent = "organizations/%{org_id}" deletion_protection = false } diff --git a/website/docs/r/compute_firewall_policy_association.html.markdown b/website/docs/r/compute_firewall_policy_association.html.markdown index 7a2c0b58aa8..20fc89ba00b 100644 --- a/website/docs/r/compute_firewall_policy_association.html.markdown +++ b/website/docs/r/compute_firewall_policy_association.html.markdown @@ -34,7 +34,7 @@ To get more information about FirewallPolicyAssociation, see: ```hcl resource "google_folder" "folder" { - display_name = "my-folder" + display_name = "folder-fpa" parent = "organizations/123456789" deletion_protection = false } @@ -56,7 +56,7 @@ resource "google_compute_firewall_policy_association" "default" { ```hcl resource "google_folder" "folder" { - display_name = "my-folder" + display_name = "folder-fpas" parent = "organizations/123456789" deletion_protection = false } diff --git a/website/docs/r/folder_access_approval_settings.html.markdown b/website/docs/r/folder_access_approval_settings.html.markdown index 46616733db8..342a4978c4b 100644 --- a/website/docs/r/folder_access_approval_settings.html.markdown +++ b/website/docs/r/folder_access_approval_settings.html.markdown @@ -33,7 +33,7 @@ To get more information about FolderSettings, see: ```hcl resource "google_folder" "my_folder" { - display_name = "my-folder" + display_name = "folder-faaf" parent = "organizations/123456789" deletion_protection = false } @@ -52,7 +52,7 @@ resource "google_folder_access_approval_settings" "folder_access_approval" { ```hcl resource "google_folder" "my_folder" { - display_name = "my-folder" + display_name = "folder-faak" parent = "organizations/123456789" deletion_protection = false } diff --git a/website/docs/r/kms_autokey_config.html.markdown b/website/docs/r/kms_autokey_config.html.markdown index f660a745ff4..1075acd801f 100644 --- a/website/docs/r/kms_autokey_config.html.markdown +++ b/website/docs/r/kms_autokey_config.html.markdown @@ -44,7 +44,7 @@ To get more information about AutokeyConfig, see: # Create Folder in GCP Organization resource "google_folder" "autokms_folder" { provider = google-beta - display_name = "my-folder" + display_name = "folder-cfg" parent = "organizations/123456789" deletion_protection = false } diff --git a/website/docs/r/kms_folder_kaj_policy_config.html.markdown b/website/docs/r/kms_folder_kaj_policy_config.html.markdown index ff602844f14..07643bcd58e 100644 --- a/website/docs/r/kms_folder_kaj_policy_config.html.markdown +++ b/website/docs/r/kms_folder_kaj_policy_config.html.markdown @@ -45,7 +45,7 @@ To get more information about FolderKajPolicyConfig, see: # Create Folder in GCP Organization. resource "google_folder" "kaj_folder" { provider = google-beta - display_name = "my-folder" + display_name = "folder-kajc" parent = "organizations/123456789" deletion_protection = false } diff --git a/website/docs/r/kms_key_handle.html.markdown b/website/docs/r/kms_key_handle.html.markdown index 79ae2e45f0c..8d68eb4ea94 100644 --- a/website/docs/r/kms_key_handle.html.markdown +++ b/website/docs/r/kms_key_handle.html.markdown @@ -42,7 +42,7 @@ To get more information about KeyHandle, see: # Create Folder in GCP Organization resource "google_folder" "autokms_folder" { provider = google-beta - display_name = "my-folder" + display_name = "folder-kh" parent = "organizations/123456789" deletion_protection = false } diff --git a/website/docs/r/resource_manager_capability.html.markdown b/website/docs/r/resource_manager_capability.html.markdown index ed7c68cbdfa..97ada32526f 100644 --- a/website/docs/r/resource_manager_capability.html.markdown +++ b/website/docs/r/resource_manager_capability.html.markdown @@ -35,7 +35,7 @@ To get more information about Capability, see: ```hcl resource "google_folder" "folder" { - display_name = "my-folder" + display_name = "folder-cap" parent = "organizations/123456789" deletion_protection = false }