Skip to content

Commit 20442db

Browse files
modular-magicianmodular-magician
authored
use bootstrapped networks for service networking (#8473) (#15327)
Signed-off-by: Modular Magician <[email protected]>
1 parent 9374042 commit 20442db

11 files changed

+114
-109
lines changed

‎.changelog/8473.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/resource_alloydb_backup_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ func TestAccAlloydbBackup_createBackupWithMandatoryFields(t *testing.T) {
100100

101101
context := map[string]interface{}{
102102
"random_suffix": acctest.RandString(t, 10),
103+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbbackup-mandatory"),
103104
}
104105

105106
acctest.VcrTest(t, resource.TestCase{
@@ -126,13 +127,13 @@ resource "google_alloydb_backup" "default" {
126127
resource "google_alloydb_cluster" "default" {
127128
location = "us-central1"
128129
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
129-
network = google_compute_network.default.id
130+
network = data.google_compute_network.default.id
130131
}
131132
132133
data "google_project" "project" { }
133134
134-
resource "google_compute_network" "default" {
135-
name = "tf-test-alloydb-cluster%{random_suffix}"
135+
data "google_compute_network" "default" {
136+
name = "%{network_name}"
136137
}
137138
138139
resource "google_alloydb_instance" "default" {
@@ -148,7 +149,7 @@ resource "google_compute_global_address" "private_ip_alloc" {
148149
address_type = "INTERNAL"
149150
purpose = "VPC_PEERING"
150151
prefix_length = 16
151-
network = google_compute_network.default.id
152+
network = data.google_compute_network.default.id
152153
lifecycle {
153154
ignore_changes = [
154155
address,
@@ -162,7 +163,7 @@ resource "google_compute_global_address" "private_ip_alloc" {
162163
}
163164
164165
resource "google_service_networking_connection" "vpc_connection" {
165-
network = google_compute_network.default.id
166+
network = data.google_compute_network.default.id
166167
service = "servicenetworking.googleapis.com"
167168
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
168169
}

‎google/resource_alloydb_instance_generated_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func TestAccAlloydbInstance_alloydbInstanceBasicExample(t *testing.T) {
3434
t.Parallel()
3535

3636
context := map[string]interface{}{
37+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydb-instance-basic"),
3738
"random_suffix": acctest.RandString(t, 10),
3839
}
3940

@@ -72,7 +73,7 @@ resource "google_alloydb_instance" "default" {
7273
resource "google_alloydb_cluster" "default" {
7374
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
7475
location = "us-central1"
75-
network = google_compute_network.default.id
76+
network = data.google_compute_network.default.id
7677
7778
initial_user {
7879
password = "tf-test-alloydb-cluster%{random_suffix}"
@@ -81,20 +82,20 @@ resource "google_alloydb_cluster" "default" {
8182
8283
data "google_project" "project" {}
8384
84-
resource "google_compute_network" "default" {
85-
name = "tf-test-alloydb-cluster%{random_suffix}"
85+
data "google_compute_network" "default" {
86+
name = "%{network_name}"
8687
}
8788
8889
resource "google_compute_global_address" "private_ip_alloc" {
8990
name = "tf-test-alloydb-cluster%{random_suffix}"
9091
address_type = "INTERNAL"
9192
purpose = "VPC_PEERING"
9293
prefix_length = 16
93-
network = google_compute_network.default.id
94+
network = data.google_compute_network.default.id
9495
}
9596
9697
resource "google_service_networking_connection" "vpc_connection" {
97-
network = google_compute_network.default.id
98+
network = data.google_compute_network.default.id
9899
service = "servicenetworking.googleapis.com"
99100
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
100101
}

‎google/resource_alloydb_instance_test.go

+35-30
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ func TestAccAlloydbInstance_update(t *testing.T) {
1414

1515
context := map[string]interface{}{
1616
"random_suffix": acctest.RandString(t, 10),
17+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbinstance-update"),
1718
}
1819

1920
acctest.VcrTest(t, resource.TestCase{
@@ -64,7 +65,7 @@ resource "google_alloydb_instance" "default" {
6465
resource "google_alloydb_cluster" "default" {
6566
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
6667
location = "us-central1"
67-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
68+
network = data.google_compute_network.default.id
6869
6970
initial_user {
7071
password = "tf-test-alloydb-cluster%{random_suffix}"
@@ -74,20 +75,20 @@ resource "google_alloydb_cluster" "default" {
7475
data "google_project" "project" {
7576
}
7677
77-
resource "google_compute_network" "default" {
78-
name = "tf-test-alloydb-cluster%{random_suffix}"
78+
data "google_compute_network" "default" {
79+
name = "%{network_name}"
7980
}
8081
8182
resource "google_compute_global_address" "private_ip_alloc" {
8283
name = "tf-test-alloydb-cluster%{random_suffix}"
8384
address_type = "INTERNAL"
8485
purpose = "VPC_PEERING"
8586
prefix_length = 16
86-
network = google_compute_network.default.id
87+
network = data.google_compute_network.default.id
8788
}
8889
8990
resource "google_service_networking_connection" "vpc_connection" {
90-
network = google_compute_network.default.id
91+
network = data.google_compute_network.default.id
9192
service = "servicenetworking.googleapis.com"
9293
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
9394
}
@@ -100,6 +101,7 @@ func TestAccAlloydbInstance_createInstanceWithMandatoryFields(t *testing.T) {
100101

101102
context := map[string]interface{}{
102103
"random_suffix": acctest.RandString(t, 10),
104+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbinstance-mandatory"),
103105
}
104106

105107
acctest.VcrTest(t, resource.TestCase{
@@ -127,25 +129,25 @@ resource "google_alloydb_instance" "default" {
127129
resource "google_alloydb_cluster" "default" {
128130
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
129131
location = "us-central1"
130-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
132+
network = data.google_compute_network.default.id
131133
}
132134
133135
data "google_project" "project" {}
134136
135-
resource "google_compute_network" "default" {
136-
name = "tf-test-alloydb-cluster%{random_suffix}"
137+
data "google_compute_network" "default" {
138+
name = "%{network_name}"
137139
}
138140
139141
resource "google_compute_global_address" "private_ip_alloc" {
140142
name = "tf-test-alloydb-cluster%{random_suffix}"
141143
address_type = "INTERNAL"
142144
purpose = "VPC_PEERING"
143145
prefix_length = 16
144-
network = google_compute_network.default.id
146+
network = data.google_compute_network.default.id
145147
}
146148
147149
resource "google_service_networking_connection" "vpc_connection" {
148-
network = google_compute_network.default.id
150+
network = data.google_compute_network.default.id
149151
service = "servicenetworking.googleapis.com"
150152
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
151153
}
@@ -158,6 +160,7 @@ func TestAccAlloydbInstance_createInstanceWithMaximumFields(t *testing.T) {
158160

159161
context := map[string]interface{}{
160162
"random_suffix": acctest.RandString(t, 10),
163+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbinstance-maximum"),
161164
}
162165

163166
acctest.VcrTest(t, resource.TestCase{
@@ -204,25 +207,25 @@ resource "google_alloydb_instance" "default" {
204207
resource "google_alloydb_cluster" "default" {
205208
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
206209
location = "us-central1"
207-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
210+
network = data.google_compute_network.default.id
208211
}
209212
210213
data "google_project" "project" {}
211214
212-
resource "google_compute_network" "default" {
213-
name = "tf-test-alloydb-cluster%{random_suffix}"
215+
data "google_compute_network" "default" {
216+
name = "%{network_name}"
214217
}
215218
216219
resource "google_compute_global_address" "private_ip_alloc" {
217220
name = "tf-test-alloydb-cluster%{random_suffix}"
218221
address_type = "INTERNAL"
219222
purpose = "VPC_PEERING"
220223
prefix_length = 16
221-
network = google_compute_network.default.id
224+
network = data.google_compute_network.default.id
222225
}
223226
224227
resource "google_service_networking_connection" "vpc_connection" {
225-
network = google_compute_network.default.id
228+
network = data.google_compute_network.default.id
226229
service = "servicenetworking.googleapis.com"
227230
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
228231
}
@@ -235,6 +238,7 @@ func TestAccAlloydbInstance_createPrimaryAndReadPoolInstance(t *testing.T) {
235238

236239
context := map[string]interface{}{
237240
"random_suffix": acctest.RandString(t, 10),
241+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbinstance-readpool"),
238242
}
239243

240244
acctest.VcrTest(t, resource.TestCase{
@@ -271,25 +275,25 @@ resource "google_alloydb_instance" "read_pool" {
271275
resource "google_alloydb_cluster" "default" {
272276
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
273277
location = "us-central1"
274-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
278+
network = data.google_compute_network.default.id
275279
}
276280
277281
data "google_project" "project" {}
278282
279-
resource "google_compute_network" "default" {
280-
name = "tf-test-alloydb-cluster%{random_suffix}"
283+
data "google_compute_network" "default" {
284+
name = "%{network_name}"
281285
}
282286
283287
resource "google_compute_global_address" "private_ip_alloc" {
284288
name = "tf-test-alloydb-cluster%{random_suffix}"
285289
address_type = "INTERNAL"
286290
purpose = "VPC_PEERING"
287291
prefix_length = 16
288-
network = google_compute_network.default.id
292+
network = data.google_compute_network.default.id
289293
}
290294
291295
resource "google_service_networking_connection" "vpc_connection" {
292-
network = google_compute_network.default.id
296+
network = data.google_compute_network.default.id
293297
service = "servicenetworking.googleapis.com"
294298
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
295299
}
@@ -302,6 +306,7 @@ func TestAccAlloydbInstance_updateDatabaseFlagInPrimaryInstance(t *testing.T) {
302306

303307
context := map[string]interface{}{
304308
"random_suffix": acctest.RandString(t, 10),
309+
"network_name": acctest.BootstrapSharedTestNetwork(t, "alloydbinstance-updatedb"),
305310
}
306311

307312
acctest.VcrTest(t, resource.TestCase{
@@ -339,25 +344,25 @@ resource "google_alloydb_instance" "primary" {
339344
resource "google_alloydb_cluster" "default" {
340345
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
341346
location = "us-central1"
342-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
347+
network = data.google_compute_network.default.id
343348
}
344349
345350
data "google_project" "project" {}
346351
347-
resource "google_compute_network" "default" {
348-
name = "tf-test-alloydb-cluster%{random_suffix}"
352+
data "google_compute_network" "default" {
353+
name = "%{network_name}"
349354
}
350355
351356
resource "google_compute_global_address" "private_ip_alloc" {
352357
name = "tf-test-alloydb-cluster%{random_suffix}"
353358
address_type = "INTERNAL"
354359
purpose = "VPC_PEERING"
355360
prefix_length = 16
356-
network = google_compute_network.default.id
361+
network = data.google_compute_network.default.id
357362
}
358363
359364
resource "google_service_networking_connection" "vpc_connection" {
360-
network = google_compute_network.default.id
365+
network = data.google_compute_network.default.id
361366
service = "servicenetworking.googleapis.com"
362367
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
363368
}
@@ -379,25 +384,25 @@ resource "google_alloydb_instance" "primary" {
379384
resource "google_alloydb_cluster" "default" {
380385
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
381386
location = "us-central1"
382-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
387+
network = data.google_compute_network.default.id
383388
}
384389
385390
data "google_project" "project" {}
386391
387-
resource "google_compute_network" "default" {
388-
name = "tf-test-alloydb-cluster%{random_suffix}"
392+
data "google_compute_network" "default" {
393+
name = "%{network_name}"
389394
}
390395
391396
resource "google_compute_global_address" "private_ip_alloc" {
392397
name = "tf-test-alloydb-cluster%{random_suffix}"
393398
address_type = "INTERNAL"
394399
purpose = "VPC_PEERING"
395400
prefix_length = 16
396-
network = google_compute_network.default.id
401+
network = data.google_compute_network.default.id
397402
}
398403
399404
resource "google_service_networking_connection" "vpc_connection" {
400-
network = google_compute_network.default.id
405+
network = data.google_compute_network.default.id
401406
service = "servicenetworking.googleapis.com"
402407
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
403408
}

‎google/resource_cloudbuild_worker_pool_test.go

+6-12
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ func TestAccCloudbuildWorkerPool_withNetwork(t *testing.T) {
9999
context := map[string]interface{}{
100100
"random_suffix": acctest.RandString(t, 10),
101101
"project": envvar.GetTestProjectFromEnv(),
102+
"network_name": acctest.BootstrapSharedTestNetwork(t, "cloudbuild-workerpool"),
102103
}
103104

104105
acctest.VcrTest(t, resource.TestCase{
@@ -120,30 +121,23 @@ func TestAccCloudbuildWorkerPool_withNetwork(t *testing.T) {
120121

121122
func testAccCloudbuildWorkerPool_withNetwork(context map[string]interface{}) string {
122123
return acctest.Nprintf(`
123-
resource "google_project_service" "servicenetworking" {
124-
service = "servicenetworking.googleapis.com"
125-
disable_on_destroy = false
126-
}
127124
128-
resource "google_compute_network" "network" {
129-
name = "tf-test-network%{random_suffix}"
130-
auto_create_subnetworks = false
131-
depends_on = [google_project_service.servicenetworking]
125+
data "google_compute_network" "network" {
126+
name = "%{network_name}"
132127
}
133128
134129
resource "google_compute_global_address" "worker_range" {
135130
name = "tf-test-worker-pool-range%{random_suffix}"
136131
purpose = "VPC_PEERING"
137132
address_type = "INTERNAL"
138133
prefix_length = 16
139-
network = google_compute_network.network.id
134+
network = data.google_compute_network.network.id
140135
}
141136
142137
resource "google_service_networking_connection" "worker_pool_conn" {
143-
network = google_compute_network.network.id
138+
network = data.google_compute_network.network.id
144139
service = "servicenetworking.googleapis.com"
145140
reserved_peering_ranges = [google_compute_global_address.worker_range.name]
146-
depends_on = [google_project_service.servicenetworking]
147141
}
148142
149143
resource "google_cloudbuild_worker_pool" "pool" {
@@ -155,7 +149,7 @@ resource "google_cloudbuild_worker_pool" "pool" {
155149
no_external_ip = false
156150
}
157151
network_config {
158-
peered_network = google_compute_network.network.id
152+
peered_network = data.google_compute_network.network.id
159153
peered_network_ip_range = "/29"
160154
}
161155
depends_on = [google_service_networking_connection.worker_pool_conn]

0 commit comments

Comments
 (0)