Skip to content

Commit 049212e

Browse files
zli82016zli82016
committed
use short names
1 parent 95608db commit 049212e

11 files changed

+23
-23
lines changed

‎mmv1/products/accessapproval/FolderSettings.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ examples:
4444
- name: 'folder_access_approval_full'
4545
primary_resource_id: 'folder_access_approval'
4646
vars:
47-
folder_name: 'my-folder-faaFull'
47+
folder_name: 'older-faaf'
4848
test_env_vars:
4949
org_id: 'ORG_ID'
5050
exclude_test: true
5151
- name: 'folder_access_approval_active_key_version'
5252
primary_resource_id: 'folder_access_approval'
5353
vars:
54-
folder_name: 'my-folder-faaActiveKey'
54+
folder_name: 'folder-faak'
5555
test_env_vars:
5656
org_id: 'ORG_ID'
5757
exclude_test: true

‎mmv1/products/kms/AutokeyConfig.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ examples:
6363
# test depends upon google_project_service_identity service which is still in beta, so we need to keep test limited to beta
6464
min_version: 'beta'
6565
vars:
66-
folder_name: 'my-folder-cfg'
66+
folder_name: 'folder-cfg'
6767
key_project_name: 'key-proj'
6868
test_env_vars:
6969
org_id: 'ORG_ID'

‎mmv1/products/kms/FolderKajPolicyConfig.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ examples:
5757
primary_resource_id: "example"
5858
min_version: 'beta'
5959
vars:
60-
folder_name: 'my-folder-kaj-config'
60+
folder_name: 'folder-kajc'
6161
test_env_vars:
6262
org_id: 'ORG_ID'
6363
billing_account: 'BILLING_ACCT'

‎mmv1/products/kms/KeyHandle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ examples:
5757
# test depends upon google_project_service_identity service which is still in beta, so we need to keep test limited to beta
5858
min_version: 'beta'
5959
vars:
60-
folder_name: 'my-folder-kh'
60+
folder_name: 'folder-kh'
6161
key_project_name: 'key-proj'
6262
resource_project_name: 'res-proj'
6363
test_env_vars:

‎mmv1/products/resourcemanager3/Capability.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ examples:
5050
- name: 'resource_manager_capability'
5151
primary_resource_id: 'capability'
5252
vars:
53-
display_name: 'my-folder-cap'
53+
display_name: 'folder-cap'
5454
test_env_vars:
5555
org_id: "ORG_ID"
5656
external_providers: ["time"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestAccDataSourceAccessApprovalFolderServiceAccount_basic(t *testing.T) {
3838
func testAccDataSourceAccessApprovalFolderServiceAccount_basic(context map[string]interface{}) string {
3939
return acctest.Nprintf(`
4040
resource "google_folder" "my_folder" {
41-
display_name = "tf-test-my-folder-faasa-%{random_suffix}"
41+
display_name = "tf-test-folder-aasa-%{random_suffix}"
4242
parent = "organizations/%{org_id}"
4343
deletion_protection = false
4444
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func testAccAccessApprovalFolderSettings(t *testing.T) {
6565
func testAccAccessApprovalFolderSettings_full(context map[string]interface{}) string {
6666
return acctest.Nprintf(`
6767
resource "google_folder" "my_folder" {
68-
display_name = "tf-test-my-folder-settings-%{random_suffix}"
68+
display_name = "tf-test-folder-sfu-%{random_suffix}"
6969
parent = "organizations/%{org_id}"
7070
deletion_protection = false
7171
}
@@ -93,7 +93,7 @@ resource "google_folder_access_approval_settings" "folder_access_approval" {
9393
func testAccAccessApprovalFolderSettings_update(context map[string]interface{}) string {
9494
return acctest.Nprintf(`
9595
resource "google_folder" "my_folder" {
96-
display_name = "tf-test-my-folder-settings-up-%{random_suffix}"
96+
display_name = "tf-test-folder-sup-%{random_suffix}"
9797
parent = "organizations/%{org_id}"
9898
deletion_protection = false
9999
}
@@ -121,7 +121,7 @@ resource "google_folder_access_approval_settings" "folder_access_approval" {
121121
func testAccAccessApprovalFolderSettings_activeKeyVersion(context map[string]interface{}) string {
122122
return acctest.Nprintf(`
123123
resource "google_folder" "my_folder" {
124-
display_name = "tf-test-my-folder-settings-kv-%{random_suffix}"
124+
display_name = "tf-test-folder-kv-%{random_suffix}"
125125
parent = "organizations/%{org_id}"
126126
deletion_protection = false
127127
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestAccComputeFirewallPolicyAssociation_basic(t *testing.T) {
3838
func testAccComputeFirewallPolicyAssociation_basic(context map[string]interface{}) string {
3939
return acctest.Nprintf(`
4040
resource "google_folder" "folder" {
41-
display_name = "tf-test-folder-%{random_suffix}"
41+
display_name = "tf-test-folder-bup-%{random_suffix}"
4242
parent = "%{org_name}"
4343
deletion_protection = false
4444
}
@@ -94,7 +94,7 @@ func TestAccComputeFirewallPolicyAssociation_organization(t *testing.T) {
9494
func testAccComputeFirewallPolicyAssociation_organization(context map[string]interface{}) string {
9595
return acctest.Nprintf(`
9696
resource "google_folder" "folder" {
97-
display_name = "tf-test-my-folder-fpa-up-%{random_suffix}"
97+
display_name = "tf-test-folder-fpau-%{random_suffix}"
9898
parent = "%{org_name}"
9999
deletion_protection = false
100100
}
@@ -152,7 +152,7 @@ func TestAccComputeFirewallPolicyAssociation_swapover(t *testing.T) {
152152
func testAccComputeFirewallPolicyAssociation_swapover(context map[string]interface{}) string {
153153
return acctest.Nprintf(`
154154
resource "google_folder" "folder" {
155-
display_name = "tf-test-folder-%{random_suffix}"
155+
display_name = "tf-test-folder-sou-%{random_suffix}"
156156
parent = "%{org_name}"
157157
deletion_protection = false
158158
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func testAccKMSFolderKajPolicyConfig_update(context map[string]interface{}) stri
114114
# Create Folder in GCP Organization.
115115
resource "google_folder" "kaj_folder" {
116116
provider = google-beta
117-
display_name = "tf-test-my-folder-kaj-up-%{random_suffix}"
117+
display_name = "tf-test-folder-kaup-%{random_suffix}"
118118
parent = "organizations/%{org_id}"
119119
deletion_protection = false
120120
}

‎mmv1/third_party/terraform/services/logging/resource_logging_folder_sink_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccLoggingFolderSink_basic(t *testing.T) {
2121
org := envvar.GetTestOrgFromEnv(t)
2222
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
2323
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
24-
folderName := "tf-test-folder-sink-b" + acctest.RandString(t, 10)
24+
folderName := "tf-test-folder-skb-" + acctest.RandString(t, 10)
2525

2626
var sink logging.LogSink
2727

@@ -51,7 +51,7 @@ func TestAccLoggingFolderSink_described(t *testing.T) {
5151
org := envvar.GetTestOrgFromEnv(t)
5252
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
5353
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
54-
folderName := "tf-test-folder-sink-described" + acctest.RandString(t, 10)
54+
folderName := "tf-test-folder-sded-" + acctest.RandString(t, 10)
5555

5656
acctest.VcrTest(t, resource.TestCase{
5757
PreCheck: func() { acctest.AccTestPreCheck(t) },
@@ -75,7 +75,7 @@ func TestAccLoggingFolderSink_disabled(t *testing.T) {
7575
org := envvar.GetTestOrgFromEnv(t)
7676
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
7777
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
78-
folderName := "tf-test-folder-sink-disabled" + acctest.RandString(t, 10)
78+
folderName := "tf-test-folder-skdd-" + acctest.RandString(t, 10)
7979

8080
acctest.VcrTest(t, resource.TestCase{
8181
PreCheck: func() { acctest.AccTestPreCheck(t) },
@@ -99,7 +99,7 @@ func TestAccLoggingFolderSink_removeOptionals(t *testing.T) {
9999
org := envvar.GetTestOrgFromEnv(t)
100100
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
101101
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
102-
folderName := "tf-test-folder-sink-op" + acctest.RandString(t, 10)
102+
folderName := "tf-test-folder-skop-" + acctest.RandString(t, 10)
103103

104104
acctest.VcrTest(t, resource.TestCase{
105105
PreCheck: func() { acctest.AccTestPreCheck(t) },
@@ -132,7 +132,7 @@ func TestAccLoggingFolderSink_folderAcceptsFullFolderPath(t *testing.T) {
132132
org := envvar.GetTestOrgFromEnv(t)
133133
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
134134
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
135-
folderName := "tf-test-folder-sink-path" + acctest.RandString(t, 10)
135+
folderName := "tf-test-folder-path-" + acctest.RandString(t, 10)
136136

137137
var sink logging.LogSink
138138

@@ -163,7 +163,7 @@ func TestAccLoggingFolderSink_update(t *testing.T) {
163163
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
164164
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
165165
updatedBucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
166-
folderName := "tf-test-folder-sink-up" + acctest.RandString(t, 10)
166+
folderName := "tf-test-folder-skup-" + acctest.RandString(t, 10)
167167
parent := "organizations/" + org
168168

169169
var sinkBefore, sinkAfter logging.LogSink
@@ -209,7 +209,7 @@ func TestAccLoggingFolderSink_updateBigquerySink(t *testing.T) {
209209
org := envvar.GetTestOrgFromEnv(t)
210210
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
211211
bqDatasetID := "tf_test_sink_" + acctest.RandString(t, 10)
212-
folderName := "tf-test-folder-sink-upbq" + acctest.RandString(t, 10)
212+
folderName := "tf-test-folder-upbq-" + acctest.RandString(t, 10)
213213

214214
acctest.VcrTest(t, resource.TestCase{
215215
PreCheck: func() { acctest.AccTestPreCheck(t) },
@@ -242,7 +242,7 @@ func TestAccLoggingFolderSink_heredoc(t *testing.T) {
242242
org := envvar.GetTestOrgFromEnv(t)
243243
sinkName := "tf-test-sink-" + acctest.RandString(t, 10)
244244
bucketName := "tf-test-sink-bucket-" + acctest.RandString(t, 10)
245-
folderName := "tf-test-folder-sink-hd" + acctest.RandString(t, 10)
245+
folderName := "tf-test-folder-skhd-" + acctest.RandString(t, 10)
246246

247247
var sink logging.LogSink
248248

0 commit comments

Comments
 (0)