use short names

Author: zli82016

mmv1/products/accessapproval/FolderSettings.yaml

@@ -44,14 +44,14 @@ examples:
   - name: 'folder_access_approval_full'
     primary_resource_id: 'folder_access_approval'
     vars:
-      folder_name: 'my-folder-faaFull'
+      folder_name: 'folder-faaf'
     test_env_vars:
       org_id: 'ORG_ID'
     exclude_test: true
   - name: 'folder_access_approval_active_key_version'
     primary_resource_id: 'folder_access_approval'
     vars:
-      folder_name: 'my-folder-faaActiveKey'
+      folder_name: 'folder-faak'
     test_env_vars:
       org_id: 'ORG_ID'
     exclude_test: true

mmv1/products/compute/FirewallPolicyAssociation.yaml

@@ -51,7 +51,7 @@ examples:
     vars:
       policy_name: 'my-policy'
       association_name: 'my-association'
-      folder_name: 'my-folder-fpa'
+      folder_name: 'folder-fpa'
     test_env_vars:
       org_id: 'ORG_ID'
     exclude_test: true
@@ -60,7 +60,7 @@ examples:
     vars:
       policy_name: 'my-policy'
       association_name: 'my-association'
-      folder_name: 'my-folder-fpaSwap'
+      folder_name: 'folder-fpas'
     test_env_vars:
       org_id: 'ORG_ID'
     exclude_test: true

mmv1/products/kms/AutokeyConfig.yaml

@@ -63,7 +63,7 @@ examples:
     # test depends upon google_project_service_identity service which is still in beta, so we need to keep test limited to beta
     min_version: 'beta'
     vars:
-      folder_name: 'my-folder-cfg'
+      folder_name: 'folder-cfg'
       key_project_name: 'key-proj'
     test_env_vars:
       org_id: 'ORG_ID'

mmv1/products/kms/FolderKajPolicyConfig.yaml

@@ -57,7 +57,7 @@ examples:
     primary_resource_id: "example"
     min_version: 'beta'
     vars:
-      folder_name: 'my-folder-kaj-config'
+      folder_name: 'folder-kajc'
     test_env_vars:
       org_id: 'ORG_ID'
       billing_account: 'BILLING_ACCT'

mmv1/products/kms/KeyHandle.yaml

@@ -57,7 +57,7 @@ examples:
     # test depends upon google_project_service_identity service which is still in beta, so we need to keep test limited to beta
     min_version: 'beta'
     vars:
-      folder_name: 'my-folder-kh'
+      folder_name: 'folder-kh'
       key_project_name: 'key-proj'
       resource_project_name: 'res-proj'
     test_env_vars:

mmv1/products/resourcemanager3/Capability.yaml

@@ -50,7 +50,7 @@ examples:
   - name: 'resource_manager_capability'
     primary_resource_id: 'capability'
     vars:
-      display_name: 'my-folder-cap'
+      display_name: 'folder-cap'
     test_env_vars:
       org_id: "ORG_ID"
     external_providers: ["time"]

mmv1/third_party/terraform/services/accessapproval/data_source_access_approval_folder_service_account_test.go

@@ -38,7 +38,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-faasa-%{random_suffix}"
+  display_name = "tf-test-folder-aasa-%{random_suffix}"
   parent       = "organizations/%{org_id}"
   deletion_protection = false
 }

mmv1/third_party/terraform/services/accessapproval/resource_access_approval_folder_settings_test.go

@@ -65,7 +65,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-settings-%{random_suffix}"
+  display_name = "tf-test-folder-sfu-%{random_suffix}"
   parent       = "organizations/%{org_id}"
   deletion_protection = false
 }
@@ -93,7 +93,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-settings-up-%{random_suffix}"
+  display_name = "tf-test-folder-sup-%{random_suffix}"
   parent       = "organizations/%{org_id}"
   deletion_protection = false
 }
@@ -121,7 +121,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-settings-kv-%{random_suffix}"
+  display_name = "tf-test-folder-kv-%{random_suffix}"
   parent       = "organizations/%{org_id}"
   deletion_protection = false
 }

mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_association_test.go

@@ -38,7 +38,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
 }
@@ -94,7 +94,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-fpa-up-%{random_suffix}"
+  display_name = "tf-test-folder-fpau-%{random_suffix}"
   parent       = "%{org_name}"
   deletion_protection = false
 }
@@ -152,7 +152,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
 }

mmv1/third_party/terraform/services/kms/resource_kms_folder_kaj_policy_config_test.go.tmpl

@@ -61,7 +61,7 @@ func testAccKMSFolderKajPolicyConfig_basic(context map[string]interface{}) strin
 # Create Folder in GCP Organization.
 resource "google_folder" "kaj_folder" {
 	provider     = google-beta
-	display_name = "tf-test-my-folder-kaj-%{random_suffix}"
+	display_name = "tf-test-folder-kaj-%{random_suffix}"
 	parent       = "organizations/%{org_id}"
 	deletion_protection = false
 }
@@ -114,7 +114,7 @@ func testAccKMSFolderKajPolicyConfig_update(context map[string]interface{}) stri
 # Create Folder in GCP Organization.
 resource "google_folder" "kaj_folder" {
 	provider     = google-beta
-	display_name = "tf-test-my-folder-kaj-up-%{random_suffix}"
+	display_name = "tf-test-folder-kaup-%{random_suffix}"
 	parent       = "organizations/%{org_id}"
 	deletion_protection = false
 }