Skip to content

Commit 2aa4231

Browse files
modular-magicianmodular-magician
authored
Update bootstrapped network names in AlloyDB tests (#14157) (#23099)
[upstream:750dab43fa8fc41b6d5dc3591473ff14f2be69f2] Signed-off-by: Modular Magician <[email protected]>
1 parent 3cda11f commit 2aa4231

13 files changed

+51
-51
lines changed

‎google/services/alloydb/data_source_alloydb_cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccAlloydbDatabaseClusterDatasourceConfig(t *testing.T) {
2828

2929
context := map[string]interface{}{
3030
"random_suffix": acctest.RandString(t, 10),
31-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-cluster-ds"),
31+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3232
}
3333

3434
acctest.VcrTest(t, resource.TestCase{

‎google/services/alloydb/data_source_alloydb_database_instance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccAlloydbDatabaseInstanceDatasourceConfig(t *testing.T) {
2828

2929
context := map[string]interface{}{
3030
"random_suffix": acctest.RandString(t, 10),
31-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-mandatory-1"),
31+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3232
}
3333

3434
acctest.VcrTest(t, resource.TestCase{

‎google/services/alloydb/resource_alloydb_backup_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccAlloydbBackup_alloydbBackupBasicTestExample(t *testing.T) {
3434
t.Parallel()
3535

3636
context := map[string]interface{}{
37-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
37+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3838
"random_suffix": acctest.RandString(t, 10),
3939
}
4040

@@ -167,7 +167,7 @@ func TestAccAlloydbBackup_alloydbBackupFullTestExample(t *testing.T) {
167167
t.Parallel()
168168

169169
context := map[string]interface{}{
170-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
170+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
171171
"random_suffix": acctest.RandString(t, 10),
172172
}
173173

‎google/services/alloydb/resource_alloydb_backup_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccAlloydbBackup_update(t *testing.T) {
2828

2929
random_suffix := acctest.RandString(t, 10)
3030
context := map[string]interface{}{
31-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-backup-update-1"),
31+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3232
"random_suffix": random_suffix,
3333
}
3434

@@ -135,7 +135,7 @@ func TestAccAlloydbBackup_createBackupWithMandatoryFields(t *testing.T) {
135135

136136
context := map[string]interface{}{
137137
"random_suffix": acctest.RandString(t, 10),
138-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-backup-mandatory-1"),
138+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
139139
}
140140

141141
acctest.VcrTest(t, resource.TestCase{
@@ -185,7 +185,7 @@ func TestAccAlloydbBackup_usingCMEK(t *testing.T) {
185185
t.Parallel()
186186

187187
context := map[string]interface{}{
188-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-backup-cmek-1"),
188+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
189189
"random_suffix": acctest.RandString(t, 10),
190190
"kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-bootstrap-alloydb-backup-key1").CryptoKey.Name,
191191
}

‎google/services/alloydb/resource_alloydb_cluster_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func TestAccAlloydbCluster_alloydbSecondaryClusterBasicTestExample(t *testing.T)
308308
t.Parallel()
309309

310310
context := map[string]interface{}{
311-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
311+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
312312
"random_suffix": acctest.RandString(t, 10),
313313
}
314314

‎google/services/alloydb/resource_alloydb_cluster_restore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccAlloydbCluster_restore(t *testing.T) {
3535

3636
context := map[string]interface{}{
3737
"random_suffix": acctest.RandString(t, 10),
38-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-restore-1"),
38+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3939
}
4040

4141
acctest.VcrTest(t, resource.TestCase{

‎google/services/alloydb/resource_alloydb_cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestAccAlloydbCluster_upgrade(t *testing.T) {
8787
t.Parallel()
8888

8989
context := map[string]interface{}{
90-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-upgrade-1"),
90+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
9191
"random_suffix": acctest.RandString(t, 10),
9292
}
9393

‎google/services/alloydb/resource_alloydb_instance_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccAlloydbInstance_alloydbInstanceBasicTestExample(t *testing.T) {
3434
t.Parallel()
3535

3636
context := map[string]interface{}{
37-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
37+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3838
"random_suffix": acctest.RandString(t, 10),
3939
}
4040

@@ -91,7 +91,7 @@ func TestAccAlloydbInstance_alloydbSecondaryInstanceBasicTestExample(t *testing.
9191
t.Parallel()
9292

9393
context := map[string]interface{}{
94-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
94+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
9595
"random_suffix": acctest.RandString(t, 10),
9696
}
9797

‎google/services/alloydb/resource_alloydb_instance_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccAlloydbInstance_update(t *testing.T) {
2828

2929
random_suffix := acctest.RandString(t, 10)
3030
context := map[string]interface{}{
31-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-update-1"),
31+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3232
"random_suffix": random_suffix,
3333
}
3434

@@ -129,7 +129,7 @@ func TestAccAlloydbInstance_createInstanceWithMandatoryFields(t *testing.T) {
129129

130130
context := map[string]interface{}{
131131
"random_suffix": acctest.RandString(t, 10),
132-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-mandatory-1"),
132+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
133133
}
134134

135135
acctest.VcrTest(t, resource.TestCase{
@@ -149,7 +149,7 @@ func TestAccAlloydbInstance_stopstart(t *testing.T) {
149149
t.Parallel()
150150

151151
suffix := acctest.RandString(t, 10)
152-
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-clientconnectionconfig")
152+
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1")
153153

154154
context := map[string]interface{}{
155155
"random_suffix": suffix,
@@ -267,7 +267,7 @@ data "google_compute_network" "default" {
267267
268268
context := map[string]interface{}{
269269
"random_suffix": acctest.RandString(t, 10),
270-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-maximum-1"),
270+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
271271
}
272272
273273
acctest.VcrTest(t, resource.TestCase{
@@ -339,7 +339,7 @@ func TestAccAlloydbInstance_createPrimaryAndReadPoolInstance(t *testing.T) {
339339

340340
context := map[string]interface{}{
341341
"random_suffix": acctest.RandString(t, 10),
342-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-readpool-1"),
342+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
343343
}
344344

345345
acctest.VcrTest(t, resource.TestCase{
@@ -394,7 +394,7 @@ data "google_compute_network" "default" {
394394
395395
context := map[string]interface{}{
396396
"random_suffix": acctest.RandString(t, 10),
397-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-updatedb-1"),
397+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
398398
}
399399
400400
acctest.VcrTest(t, resource.TestCase{
@@ -475,7 +475,7 @@ data "google_compute_network" "default" {
475475
func TestAccAlloydbInstance_createInstanceWithNetworkConfigAndAllocatedIPRange(t *testing.T) {
476476
t.Parallel()
477477

478-
testId := "alloydbinstance-network-config-1"
478+
testId := "alloydb-1"
479479
addressName := acctest.BootstrapSharedTestGlobalAddress(t, testId)
480480
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, testId)
481481

@@ -533,7 +533,7 @@ func TestAccAlloydbInstance_clientConnectionConfig(t *testing.T) {
533533
t.Parallel()
534534

535535
suffix := acctest.RandString(t, 10)
536-
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-clientconnectionconfig")
536+
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1")
537537

538538
context := map[string]interface{}{
539539
"random_suffix": suffix,
@@ -698,7 +698,7 @@ func TestAccAlloydbInstance_networkConfig(t *testing.T) {
698698
t.Parallel()
699699

700700
suffix := acctest.RandString(t, 10)
701-
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-networkconfig")
701+
networkName := acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1")
702702

703703
context1 := map[string]interface{}{
704704
"random_suffix": suffix,

‎google/services/alloydb/resource_alloydb_secondary_cluster_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
func TestAccAlloydbCluster_secondaryClusterMandatoryFields(t *testing.T) {
2929
t.Parallel()
3030
context := map[string]interface{}{
31-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
31+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
3232
"random_suffix": acctest.RandString(t, 10),
3333
}
3434

@@ -102,7 +102,7 @@ func TestAccAlloydbCluster_secondaryClusterMissingSecondaryConfig(t *testing.T)
102102
t.Parallel()
103103

104104
context := map[string]interface{}{
105-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
105+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
106106
"random_suffix": acctest.RandString(t, 10),
107107
}
108108

@@ -167,7 +167,7 @@ func TestAccAlloydbCluster_secondaryClusterDefinedSecondaryConfigButMissingClust
167167
t.Parallel()
168168

169169
context := map[string]interface{}{
170-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
170+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
171171
"random_suffix": acctest.RandString(t, 10),
172172
}
173173

@@ -235,7 +235,7 @@ func TestAccAlloydbCluster_secondaryClusterDefinedSecondaryConfigButClusterTypeI
235235
t.Parallel()
236236

237237
context := map[string]interface{}{
238-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
238+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
239239
"random_suffix": acctest.RandString(t, 10),
240240
}
241241

@@ -304,7 +304,7 @@ func TestAccAlloydbCluster_secondaryClusterUpdate(t *testing.T) {
304304
t.Parallel()
305305

306306
context := map[string]interface{}{
307-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
307+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
308308
"random_suffix": acctest.RandString(t, 10),
309309
}
310310

@@ -390,7 +390,7 @@ func TestAccAlloydbCluster_secondaryClusterUsingCMEK(t *testing.T) {
390390
t.Parallel()
391391

392392
context := map[string]interface{}{
393-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
393+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
394394
"random_suffix": acctest.RandString(t, 10),
395395
"kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-east1", "tf-bootstrap-alloydb-secondary-key1").CryptoKey.Name,
396396
}
@@ -478,7 +478,7 @@ func TestAccAlloydbCluster_secondaryClusterWithNetworkConfig(t *testing.T) {
478478
t.Parallel()
479479

480480
context := map[string]interface{}{
481-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
481+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
482482
"random_suffix": acctest.RandString(t, 10),
483483
}
484484

@@ -552,8 +552,8 @@ func TestAccAlloydbCluster_secondaryClusterWithNetworkConfigAndAllocatedIPRange(
552552
t.Parallel()
553553

554554
context := map[string]interface{}{
555-
"address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydbinstance-network-config-1"),
556-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
555+
"address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydb-1"),
556+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
557557
"random_suffix": acctest.RandString(t, 10),
558558
}
559559

@@ -635,7 +635,7 @@ func TestAccAlloydbCluster_secondaryClusterPromote(t *testing.T) {
635635
context := map[string]interface{}{
636636
"random_suffix": acctest.RandString(t, 10),
637637
"secondary_cluster_location": "us-east1",
638-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
638+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
639639
}
640640

641641
acctest.VcrTest(t, resource.TestCase{
@@ -790,7 +790,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndSimultaneousUpdate(t *testi
790790
context := map[string]interface{}{
791791
"random_suffix": acctest.RandString(t, 10),
792792
"secondary_cluster_location": "us-east1",
793-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
793+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
794794
}
795795

796796
acctest.VcrTest(t, resource.TestCase{
@@ -886,7 +886,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteOriginalPrimary(t *te
886886
context := map[string]interface{}{
887887
"random_suffix": acctest.RandString(t, 10),
888888
"secondary_cluster_location": "us-east1",
889-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
889+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
890890
}
891891

892892
acctest.VcrTest(t, resource.TestCase{
@@ -969,7 +969,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndUpdate(t *testing.T) {
969969
context := map[string]interface{}{
970970
"random_suffix": acctest.RandString(t, 10),
971971
"secondary_cluster_location": "us-east1",
972-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
972+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
973973
}
974974

975975
acctest.VcrTest(t, resource.TestCase{
@@ -1074,8 +1074,8 @@ func TestAccAlloydbCluster_secondaryClusterPromoteWithNetworkConfigAndAllocatedI
10741074

10751075
context := map[string]interface{}{
10761076
"random_suffix": acctest.RandString(t, 10),
1077-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
1078-
"address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydbinstance-network-config-1"),
1077+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
1078+
"address_name": acctest.BootstrapSharedTestGlobalAddress(t, "alloydb-1"),
10791079
}
10801080

10811081
acctest.VcrTest(t, resource.TestCase{
@@ -1242,7 +1242,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddAndDeleteAutomatedBackup
12421242
context := map[string]interface{}{
12431243
"random_suffix": acctest.RandString(t, 10),
12441244
"secondary_cluster_location": "us-south1",
1245-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
1245+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
12461246
"hour": 23,
12471247
}
12481248

@@ -1383,7 +1383,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndDeleteTimeBasedRetentionPol
13831383
context := map[string]interface{}{
13841384
"random_suffix": acctest.RandString(t, 10),
13851385
"secondary_cluster_location": "us-south1",
1386-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
1386+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
13871387
}
13881388

13891389
acctest.VcrTest(t, resource.TestCase{
@@ -1605,7 +1605,7 @@ func TestAccAlloydbCluster_secondaryClusterPromoteAndAddContinuousBackupConfig(t
16051605
context := map[string]interface{}{
16061606
"random_suffix": acctest.RandString(t, 10),
16071607
"secondary_cluster_location": "us-south1",
1608-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydbinstance-network-config-1"),
1608+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-1"),
16091609
}
16101610

16111611
acctest.VcrTest(t, resource.TestCase{

0 commit comments

Comments
 (0)