Skip to content

Commit d4c0756

Browse files
Simplify network reference in AlloyDB examples (#8367) (#15218)
Signed-off-by: Modular Magician <[email protected]>
1 parent 2acb3ff commit d4c0756

7 files changed

+10
-16
lines changed

.changelog/8367.txt

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

google/resource_alloydb_cluster_generated_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func testAccAlloydbCluster_alloydbClusterBasicExample(context map[string]interfa
6060
resource "google_alloydb_cluster" "default" {
6161
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
6262
location = "us-central1"
63-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
63+
network = google_compute_network.default.id
6464
}
6565
6666
data "google_project" "project" {}
@@ -101,7 +101,7 @@ func testAccAlloydbCluster_alloydbClusterFullExample(context map[string]interfac
101101
resource "google_alloydb_cluster" "full" {
102102
cluster_id = "tf-test-alloydb-cluster-full%{random_suffix}"
103103
location = "us-central1"
104-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
104+
network = google_compute_network.default.id
105105
106106
initial_user {
107107
user = "tf-test-alloydb-cluster-full%{random_suffix}"

google/resource_alloydb_instance_generated_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "google_alloydb_instance" "default" {
7272
resource "google_alloydb_cluster" "default" {
7373
cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
7474
location = "us-central1"
75-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
75+
network = google_compute_network.default.id
7676
7777
initial_user {
7878
password = "tf-test-alloydb-cluster%{random_suffix}"

google/resource_database_migration_service_connection_profile_generated_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,12 @@ resource "google_compute_global_address" "private_ip_alloc" {
262262
purpose = "VPC_PEERING"
263263
prefix_length = 16
264264
network = google_compute_network.default.id
265-
266-
depends_on = [google_compute_network.default]
267265
}
268266
269267
resource "google_service_networking_connection" "vpc_connection" {
270268
network = google_compute_network.default.id
271269
service = "servicenetworking.googleapis.com"
272270
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
273-
274-
depends_on = [google_compute_global_address.private_ip_alloc]
275271
}
276272
277273
@@ -289,7 +285,7 @@ resource "google_database_migration_service_connection_profile" "alloydbprofile"
289285
user = "alloyuser%{random_suffix}"
290286
password = "alloypass%{random_suffix}"
291287
}
292-
vpc_network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
288+
vpc_network = google_compute_network.default.id
293289
labels = {
294290
alloyfoo = "alloybar"
295291
}

website/docs/r/alloydb_cluster.html.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ values will be stored in the raw state as plain text: `initial_user.password`.
4444
resource "google_alloydb_cluster" "default" {
4545
cluster_id = "alloydb-cluster"
4646
location = "us-central1"
47-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
47+
network = google_compute_network.default.id
4848
}
4949
5050
data "google_project" "project" {}
@@ -65,7 +65,7 @@ resource "google_compute_network" "default" {
6565
resource "google_alloydb_cluster" "full" {
6666
cluster_id = "alloydb-cluster-full"
6767
location = "us-central1"
68-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
68+
network = google_compute_network.default.id
6969
7070
initial_user {
7171
user = "alloydb-cluster-full"

website/docs/r/alloydb_instance.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ resource "google_alloydb_instance" "default" {
5252
resource "google_alloydb_cluster" "default" {
5353
cluster_id = "alloydb-cluster"
5454
location = "us-central1"
55-
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
55+
network = google_compute_network.default.id
5656
5757
initial_user {
5858
password = "alloydb-cluster"

website/docs/r/database_migration_service_connection_profile.html.markdown

+1-5
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,12 @@ resource "google_compute_global_address" "private_ip_alloc" {
206206
purpose = "VPC_PEERING"
207207
prefix_length = 16
208208
network = google_compute_network.default.id
209-
210-
depends_on = [google_compute_network.default]
211209
}
212210
213211
resource "google_service_networking_connection" "vpc_connection" {
214212
network = google_compute_network.default.id
215213
service = "servicenetworking.googleapis.com"
216214
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
217-
218-
depends_on = [google_compute_global_address.private_ip_alloc]
219215
}
220216
221217
@@ -233,7 +229,7 @@ resource "google_database_migration_service_connection_profile" "alloydbprofile"
233229
user = "alloyuser%{random_suffix}"
234230
password = "alloypass%{random_suffix}"
235231
}
236-
vpc_network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
232+
vpc_network = google_compute_network.default.id
237233
labels = {
238234
alloyfoo = "alloybar"
239235
}

0 commit comments

Comments
 (0)