Skip to content

Commit b0701ef

Browse files
modular-magicianmodular-magician
authored
Replace self link for TPG#5542 (#3467) (#2034)
Signed-off-by: Modular Magician <[email protected]>
1 parent 6122e3c commit b0701ef

14 files changed

+100
-98
lines changed

‎.changelog/3467.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

‎google-beta/iam_iap_web_backend_service_generated_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func testAccIapWebBackendServiceIamMember_basicGenerated(context map[string]inte
273273
return Nprintf(`
274274
resource "google_compute_backend_service" "default" {
275275
name = "tf-test-backend-service%{random_suffix}"
276-
health_checks = [google_compute_http_health_check.default.self_link]
276+
health_checks = [google_compute_http_health_check.default.id]
277277
}
278278
279279
resource "google_compute_http_health_check" "default" {
@@ -296,7 +296,7 @@ func testAccIapWebBackendServiceIamPolicy_basicGenerated(context map[string]inte
296296
return Nprintf(`
297297
resource "google_compute_backend_service" "default" {
298298
name = "tf-test-backend-service%{random_suffix}"
299-
health_checks = [google_compute_http_health_check.default.self_link]
299+
health_checks = [google_compute_http_health_check.default.id]
300300
}
301301
302302
resource "google_compute_http_health_check" "default" {
@@ -325,7 +325,7 @@ func testAccIapWebBackendServiceIamPolicy_emptyBinding(context map[string]interf
325325
return Nprintf(`
326326
resource "google_compute_backend_service" "default" {
327327
name = "tf-test-backend-service%{random_suffix}"
328-
health_checks = [google_compute_http_health_check.default.self_link]
328+
health_checks = [google_compute_http_health_check.default.id]
329329
}
330330
331331
resource "google_compute_http_health_check" "default" {
@@ -350,7 +350,7 @@ func testAccIapWebBackendServiceIamBinding_basicGenerated(context map[string]int
350350
return Nprintf(`
351351
resource "google_compute_backend_service" "default" {
352352
name = "tf-test-backend-service%{random_suffix}"
353-
health_checks = [google_compute_http_health_check.default.self_link]
353+
health_checks = [google_compute_http_health_check.default.id]
354354
}
355355
356356
resource "google_compute_http_health_check" "default" {
@@ -373,7 +373,7 @@ func testAccIapWebBackendServiceIamBinding_updateGenerated(context map[string]in
373373
return Nprintf(`
374374
resource "google_compute_backend_service" "default" {
375375
name = "tf-test-backend-service%{random_suffix}"
376-
health_checks = [google_compute_http_health_check.default.self_link]
376+
health_checks = [google_compute_http_health_check.default.id]
377377
}
378378
379379
resource "google_compute_http_health_check" "default" {
@@ -396,7 +396,7 @@ func testAccIapWebBackendServiceIamBinding_withConditionGenerated(context map[st
396396
return Nprintf(`
397397
resource "google_compute_backend_service" "default" {
398398
name = "tf-test-backend-service%{random_suffix}"
399-
health_checks = [google_compute_http_health_check.default.self_link]
399+
health_checks = [google_compute_http_health_check.default.id]
400400
}
401401
402402
resource "google_compute_http_health_check" "default" {
@@ -424,7 +424,7 @@ func testAccIapWebBackendServiceIamBinding_withAndWithoutConditionGenerated(cont
424424
return Nprintf(`
425425
resource "google_compute_backend_service" "default" {
426426
name = "tf-test-backend-service%{random_suffix}"
427-
health_checks = [google_compute_http_health_check.default.self_link]
427+
health_checks = [google_compute_http_health_check.default.id]
428428
}
429429
430430
resource "google_compute_http_health_check" "default" {
@@ -459,7 +459,7 @@ func testAccIapWebBackendServiceIamMember_withConditionGenerated(context map[str
459459
return Nprintf(`
460460
resource "google_compute_backend_service" "default" {
461461
name = "tf-test-backend-service%{random_suffix}"
462-
health_checks = [google_compute_http_health_check.default.self_link]
462+
health_checks = [google_compute_http_health_check.default.id]
463463
}
464464
465465
resource "google_compute_http_health_check" "default" {
@@ -487,7 +487,7 @@ func testAccIapWebBackendServiceIamMember_withAndWithoutConditionGenerated(conte
487487
return Nprintf(`
488488
resource "google_compute_backend_service" "default" {
489489
name = "tf-test-backend-service%{random_suffix}"
490-
health_checks = [google_compute_http_health_check.default.self_link]
490+
health_checks = [google_compute_http_health_check.default.id]
491491
}
492492
493493
resource "google_compute_http_health_check" "default" {
@@ -522,7 +522,7 @@ func testAccIapWebBackendServiceIamPolicy_withConditionGenerated(context map[str
522522
return Nprintf(`
523523
resource "google_compute_backend_service" "default" {
524524
name = "tf-test-backend-service%{random_suffix}"
525-
health_checks = [google_compute_http_health_check.default.self_link]
525+
health_checks = [google_compute_http_health_check.default.id]
526526
}
527527
528528
resource "google_compute_http_health_check" "default" {

‎google-beta/resource_compute_backend_service_generated_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func testAccComputeBackendService_backendServiceBasicExample(context map[string]
5151
return Nprintf(`
5252
resource "google_compute_backend_service" "default" {
5353
name = "tf-test-backend-service%{random_suffix}"
54-
health_checks = [google_compute_http_health_check.default.self_link]
54+
health_checks = [google_compute_http_health_check.default.id]
5555
}
5656
5757
resource "google_compute_http_health_check" "default" {
@@ -88,7 +88,7 @@ resource "google_compute_backend_service" "default" {
8888
provider = google-beta
8989
9090
name = "tf-test-backend-service%{random_suffix}"
91-
health_checks = [google_compute_health_check.health_check.self_link]
91+
health_checks = [google_compute_health_check.health_check.id]
9292
load_balancing_scheme = "INTERNAL_SELF_MANAGED"
9393
locality_lb_policy = "ROUND_ROBIN"
9494
}
@@ -129,7 +129,7 @@ resource "google_compute_backend_service" "default" {
129129
provider = google-beta
130130
131131
name = "tf-test-backend-service%{random_suffix}"
132-
health_checks = [google_compute_health_check.health_check.self_link]
132+
health_checks = [google_compute_health_check.health_check.id]
133133
load_balancing_scheme = "INTERNAL_SELF_MANAGED"
134134
locality_lb_policy = "RING_HASH"
135135
session_affinity = "HTTP_COOKIE"

‎google-beta/resource_compute_forwarding_rule_generated_test.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ resource "google_compute_forwarding_rule" "default" {
5454
name = "tf-test-website-forwarding-rule%{random_suffix}"
5555
region = "us-central1"
5656
load_balancing_scheme = "INTERNAL"
57-
backend_service = "${google_compute_region_backend_service.backend.self_link}"
57+
backend_service = google_compute_region_backend_service.backend.id
5858
all_ports = true
5959
allow_global_access = true
60-
network = "${google_compute_network.default.name}"
61-
subnetwork = "${google_compute_subnetwork.default.name}"
60+
network = google_compute_network.default.name
61+
subnetwork = google_compute_subnetwork.default.name
6262
}
6363
resource "google_compute_region_backend_service" "backend" {
6464
name = "tf-test-website-backend%{random_suffix}"
6565
region = "us-central1"
66-
health_checks = ["${google_compute_health_check.hc.self_link}"]
66+
health_checks = [google_compute_health_check.hc.id]
6767
}
6868
resource "google_compute_health_check" "hc" {
6969
name = "check-tf-test-website-backend%{random_suffix}"
@@ -81,7 +81,7 @@ resource "google_compute_subnetwork" "default" {
8181
name = "tf-test-website-net%{random_suffix}"
8282
ip_cidr_range = "10.0.0.0/16"
8383
region = "us-central1"
84-
network = "${google_compute_network.default.self_link}"
84+
network = google_compute_network.default.id
8585
}
8686
`, context)
8787
}
@@ -114,7 +114,7 @@ func testAccComputeForwardingRule_forwardingRuleBasicExample(context map[string]
114114
return Nprintf(`
115115
resource "google_compute_forwarding_rule" "default" {
116116
name = "tf-test-website-forwarding-rule%{random_suffix}"
117-
target = google_compute_target_pool.default.self_link
117+
target = google_compute_target_pool.default.id
118118
port_range = "80"
119119
}
120120
@@ -156,7 +156,7 @@ resource "google_compute_forwarding_rule" "default" {
156156
region = "us-central1"
157157
158158
load_balancing_scheme = "INTERNAL"
159-
backend_service = google_compute_region_backend_service.backend.self_link
159+
backend_service = google_compute_region_backend_service.backend.id
160160
all_ports = true
161161
network = google_compute_network.default.name
162162
subnetwork = google_compute_subnetwork.default.name
@@ -165,7 +165,7 @@ resource "google_compute_forwarding_rule" "default" {
165165
resource "google_compute_region_backend_service" "backend" {
166166
name = "tf-test-website-backend%{random_suffix}"
167167
region = "us-central1"
168-
health_checks = [google_compute_health_check.hc.self_link]
168+
health_checks = [google_compute_health_check.hc.id]
169169
}
170170
171171
resource "google_compute_health_check" "hc" {
@@ -187,7 +187,7 @@ resource "google_compute_subnetwork" "default" {
187187
name = "tf-test-website-net%{random_suffix}"
188188
ip_cidr_range = "10.0.0.0/16"
189189
region = "us-central1"
190-
network = google_compute_network.default.self_link
190+
network = google_compute_network.default.id
191191
}
192192
`, context)
193193
}
@@ -223,9 +223,9 @@ resource "google_compute_forwarding_rule" "default" {
223223
ip_protocol = "TCP"
224224
load_balancing_scheme = "INTERNAL_MANAGED"
225225
port_range = "80"
226-
target = google_compute_region_target_http_proxy.default.self_link
227-
network = google_compute_network.default.self_link
228-
subnetwork = google_compute_subnetwork.default.self_link
226+
target = google_compute_region_target_http_proxy.default.id
227+
network = google_compute_network.default.id
228+
subnetwork = google_compute_subnetwork.default.id
229229
network_tier = "PREMIUM"
230230
}
231231
@@ -234,15 +234,15 @@ resource "google_compute_region_target_http_proxy" "default" {
234234
235235
region = "us-central1"
236236
name = "tf-test-website-proxy%{random_suffix}"
237-
url_map = google_compute_region_url_map.default.self_link
237+
url_map = google_compute_region_url_map.default.id
238238
}
239239
240240
resource "google_compute_region_url_map" "default" {
241241
provider = google-beta
242242
243243
region = "us-central1"
244244
name = "tf-test-website-map%{random_suffix}"
245-
default_service = google_compute_region_backend_service.default.self_link
245+
default_service = google_compute_region_backend_service.default.id
246246
}
247247
248248
resource "google_compute_region_backend_service" "default" {
@@ -261,7 +261,7 @@ resource "google_compute_region_backend_service" "default" {
261261
protocol = "HTTP"
262262
timeout_sec = 10
263263
264-
health_checks = [google_compute_region_health_check.default.self_link]
264+
health_checks = [google_compute_region_health_check.default.id]
265265
}
266266
267267
data "google_compute_image" "debian_image" {
@@ -288,8 +288,8 @@ resource "google_compute_instance_template" "instance_template" {
288288
machine_type = "n1-standard-1"
289289
290290
network_interface {
291-
network = google_compute_network.default.self_link
292-
subnetwork = google_compute_subnetwork.default.self_link
291+
network = google_compute_network.default.id
292+
subnetwork = google_compute_subnetwork.default.id
293293
}
294294
295295
disk {
@@ -315,7 +315,7 @@ resource "google_compute_region_health_check" "default" {
315315
resource "google_compute_firewall" "fw1" {
316316
provider = google-beta
317317
name = "tf-test-website-fw%{random_suffix}-1"
318-
network = google_compute_network.default.self_link
318+
network = google_compute_network.default.id
319319
source_ranges = ["10.1.2.0/24"]
320320
allow {
321321
protocol = "tcp"
@@ -333,7 +333,7 @@ resource "google_compute_firewall" "fw2" {
333333
depends_on = [google_compute_firewall.fw1]
334334
provider = google-beta
335335
name = "tf-test-website-fw%{random_suffix}-2"
336-
network = google_compute_network.default.self_link
336+
network = google_compute_network.default.id
337337
source_ranges = ["0.0.0.0/0"]
338338
allow {
339339
protocol = "tcp"
@@ -347,7 +347,7 @@ resource "google_compute_firewall" "fw3" {
347347
depends_on = [google_compute_firewall.fw2]
348348
provider = google-beta
349349
name = "tf-test-website-fw%{random_suffix}-3"
350-
network = google_compute_network.default.self_link
350+
network = google_compute_network.default.id
351351
source_ranges = ["130.211.0.0/22", "35.191.0.0/16"]
352352
allow {
353353
protocol = "tcp"
@@ -360,7 +360,7 @@ resource "google_compute_firewall" "fw4" {
360360
depends_on = [google_compute_firewall.fw3]
361361
provider = google-beta
362362
name = "tf-test-website-fw%{random_suffix}-4"
363-
network = google_compute_network.default.self_link
363+
network = google_compute_network.default.id
364364
source_ranges = ["10.129.0.0/26"]
365365
target_tags = ["load-balanced-backend"]
366366
allow {
@@ -390,15 +390,15 @@ resource "google_compute_subnetwork" "default" {
390390
name = "tf-test-website-net%{random_suffix}-default"
391391
ip_cidr_range = "10.1.2.0/24"
392392
region = "us-central1"
393-
network = google_compute_network.default.self_link
393+
network = google_compute_network.default.id
394394
}
395395
396396
resource "google_compute_subnetwork" "proxy" {
397397
provider = google-beta
398398
name = "tf-test-website-net%{random_suffix}-proxy"
399399
ip_cidr_range = "10.129.0.0/26"
400400
region = "us-central1"
401-
network = google_compute_network.default.self_link
401+
network = google_compute_network.default.id
402402
purpose = "INTERNAL_HTTPS_LOAD_BALANCER"
403403
role = "ACTIVE"
404404
}

‎google-beta/resource_compute_packet_mirroring_generated_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ resource "google_compute_instance" "mirror" {
5656
}
5757
5858
network_interface {
59-
network = google_compute_network.default.self_link
59+
network = google_compute_network.default.id
6060
access_config {
6161
}
6262
}
@@ -67,15 +67,15 @@ resource "google_compute_packet_mirroring" "foobar" {
6767
provider = google-beta
6868
description = "bar"
6969
network {
70-
url = google_compute_network.default.self_link
70+
url = google_compute_network.default.id
7171
}
7272
collector_ilb {
73-
url = google_compute_forwarding_rule.default.self_link
73+
url = google_compute_forwarding_rule.default.id
7474
}
7575
mirrored_resources {
7676
tags = ["foo"]
7777
instances {
78-
url = google_compute_instance.mirror.self_link
78+
url = google_compute_instance.mirror.id
7979
}
8080
}
8181
filter {
@@ -91,15 +91,15 @@ resource "google_compute_network" "default" {
9191
resource "google_compute_subnetwork" "default" {
9292
name = "tf-test-my-subnetwork%{random_suffix}"
9393
provider = google-beta
94-
network = google_compute_network.default.self_link
94+
network = google_compute_network.default.id
9595
ip_cidr_range = "10.2.0.0/16"
9696
9797
}
9898
9999
resource "google_compute_region_backend_service" "default" {
100100
name = "tf-test-my-service%{random_suffix}"
101101
provider = google-beta
102-
health_checks = ["${google_compute_health_check.default.self_link}"]
102+
health_checks = [google_compute_health_check.default.id]
103103
}
104104
105105
resource "google_compute_health_check" "default" {
@@ -120,10 +120,10 @@ resource "google_compute_forwarding_rule" "default" {
120120
is_mirroring_collector = true
121121
ip_protocol = "TCP"
122122
load_balancing_scheme = "INTERNAL"
123-
backend_service = google_compute_region_backend_service.default.self_link
123+
backend_service = google_compute_region_backend_service.default.id
124124
all_ports = true
125-
network = google_compute_network.default.self_link
126-
subnetwork = google_compute_subnetwork.default.self_link
125+
network = google_compute_network.default.id
126+
subnetwork = google_compute_subnetwork.default.id
127127
network_tier = "PREMIUM"
128128
}
129129
`, context)

‎google-beta/resource_dns_managed_zone_generated_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ resource "google_dns_managed_zone" "private-zone" {
102102
103103
private_visibility_config {
104104
networks {
105-
network_url = google_compute_network.network-1.self_link
105+
network_url = google_compute_network.network-1.id
106106
}
107107
networks {
108-
network_url = google_compute_network.network-2.self_link
108+
network_url = google_compute_network.network-2.id
109109
}
110110
}
111111
}
@@ -154,13 +154,13 @@ resource "google_dns_managed_zone" "peering-zone" {
154154
155155
private_visibility_config {
156156
networks {
157-
network_url = google_compute_network.network-source.self_link
157+
network_url = google_compute_network.network-source.id
158158
}
159159
}
160160
161161
peering_config {
162162
target_network {
163-
network_url = google_compute_network.network-target.self_link
163+
network_url = google_compute_network.network-target.id
164164
}
165165
}
166166
}

‎google-beta/resource_dns_policy_generated_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ resource "google_dns_policy" "example-policy" {
6262
}
6363
6464
networks {
65-
network_url = google_compute_network.network-1.self_link
65+
network_url = google_compute_network.network-1.id
6666
}
6767
networks {
68-
network_url = google_compute_network.network-2.self_link
68+
network_url = google_compute_network.network-2.id
6969
}
7070
}
7171

0 commit comments

Comments
 (0)