Skip to content

change the prefix of folders #25728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
modular-magician merged 1 commit into from
Jan 9, 2026
Merged

change the prefix of folders #25728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/services/accessapproval/data_source_access_approval_folder_service_account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions google/services/accessapproval/resource_access_approval_folder_settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions google/services/compute/resource_compute_firewall_policy_association_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
8 changes: 3 additions & 5 deletions ...es/compute/resource_compute_region_backend_service_ha_policy_manual_leader_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions google/services/iam3/resource_iam_folders_policy_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
16 changes: 8 additions & 8 deletions google/services/logging/resource_logging_folder_sink_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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) },
Expand All @@ -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) },
Expand All @@ -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) },
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) },
Expand Down Expand Up @@ -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

Expand Down
99 changes: 0 additions & 99 deletions google/services/resourcemanager3/resource_resource_manager_capability_generated_test.go
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion google/services/resourcemanager3/resource_resource_manager_capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}{
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/compute_firewall_policy_association.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/folder_access_approval_settings.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/kms_autokey_config.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/kms_folder_kaj_policy_config.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/kms_key_handle.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/resource_manager_capability.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading