Skip to content

Commit 5274197

Browse files
modular-magicianmodular-magician
authored
Replace self_link (part 2 of #5542) (#3478) (#2056)
Signed-off-by: Modular Magician <[email protected]>
1 parent b2ec306 commit 5274197

20 files changed

+127
-124
lines changed

‎.changelog/3478.txt‎

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

‎google-beta/resource_compute_global_forwarding_rule_generated_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ func testAccComputeGlobalForwardingRule_globalForwardingRuleHttpExample(context
5151
return Nprintf(`
5252
resource "google_compute_global_forwarding_rule" "default" {
5353
name = "tf-test-global-rule%{random_suffix}"
54-
target = google_compute_target_http_proxy.default.self_link
54+
target = google_compute_target_http_proxy.default.id
5555
port_range = "80"
5656
}
5757
5858
resource "google_compute_target_http_proxy" "default" {
5959
name = "tf-test-target-proxy%{random_suffix}"
6060
description = "a description"
61-
url_map = google_compute_url_map.default.self_link
61+
url_map = google_compute_url_map.default.id
6262
}
6363
6464
resource "google_compute_url_map" "default" {
6565
name = "url-map-tf-test-target-proxy%{random_suffix}"
6666
description = "a description"
67-
default_service = google_compute_backend_service.default.self_link
67+
default_service = google_compute_backend_service.default.id
6868
6969
host_rule {
7070
hosts = ["mysite.com"]
@@ -73,11 +73,11 @@ resource "google_compute_url_map" "default" {
7373
7474
path_matcher {
7575
name = "allpaths"
76-
default_service = google_compute_backend_service.default.self_link
76+
default_service = google_compute_backend_service.default.id
7777
7878
path_rule {
7979
paths = ["/*"]
80-
service = google_compute_backend_service.default.self_link
80+
service = google_compute_backend_service.default.id
8181
}
8282
}
8383
}
@@ -88,7 +88,7 @@ resource "google_compute_backend_service" "default" {
8888
protocol = "HTTP"
8989
timeout_sec = 10
9090
91-
health_checks = [google_compute_http_health_check.default.self_link]
91+
health_checks = [google_compute_http_health_check.default.id]
9292
}
9393
9494
resource "google_compute_http_health_check" "default" {
@@ -124,7 +124,7 @@ func testAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample(cont
124124
resource "google_compute_global_forwarding_rule" "default" {
125125
provider = google-beta
126126
name = "tf-test-global-rule%{random_suffix}"
127-
target = google_compute_target_http_proxy.default.self_link
127+
target = google_compute_target_http_proxy.default.id
128128
port_range = "80"
129129
load_balancing_scheme = "INTERNAL_SELF_MANAGED"
130130
ip_address = "0.0.0.0"
@@ -141,14 +141,14 @@ resource "google_compute_target_http_proxy" "default" {
141141
provider = google-beta
142142
name = "tf-test-target-proxy%{random_suffix}"
143143
description = "a description"
144-
url_map = google_compute_url_map.default.self_link
144+
url_map = google_compute_url_map.default.id
145145
}
146146
147147
resource "google_compute_url_map" "default" {
148148
provider = google-beta
149149
name = "url-map-tf-test-target-proxy%{random_suffix}"
150150
description = "a description"
151-
default_service = google_compute_backend_service.default.self_link
151+
default_service = google_compute_backend_service.default.id
152152
153153
host_rule {
154154
hosts = ["mysite.com"]
@@ -157,11 +157,11 @@ resource "google_compute_url_map" "default" {
157157
158158
path_matcher {
159159
name = "allpaths"
160-
default_service = google_compute_backend_service.default.self_link
160+
default_service = google_compute_backend_service.default.id
161161
162162
path_rule {
163163
paths = ["/*"]
164-
service = google_compute_backend_service.default.self_link
164+
service = google_compute_backend_service.default.id
165165
}
166166
}
167167
}
@@ -181,7 +181,7 @@ resource "google_compute_backend_service" "default" {
181181
max_rate_per_instance = 50
182182
}
183183
184-
health_checks = [google_compute_health_check.default.self_link]
184+
health_checks = [google_compute_health_check.default.id]
185185
}
186186
187187
data "google_compute_image" "debian_image" {

‎google-beta/resource_compute_ha_vpn_gateway_generated_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "google_compute_ha_vpn_gateway" "ha_gateway1" {
4848
provider = google-beta
4949
region = "us-central1"
5050
name = "tf-test-ha-vpn-1%{random_suffix}"
51-
network = google_compute_network.network1.self_link
51+
network = google_compute_network.network1.id
5252
}
5353
5454
resource "google_compute_network" "network1" {
@@ -84,14 +84,14 @@ resource "google_compute_ha_vpn_gateway" "ha_gateway1" {
8484
provider = google-beta
8585
region = "us-central1"
8686
name = "tf-test-ha-vpn-1%{random_suffix}"
87-
network = google_compute_network.network1.self_link
87+
network = google_compute_network.network1.id
8888
}
8989
9090
resource "google_compute_ha_vpn_gateway" "ha_gateway2" {
9191
provider = google-beta
9292
region = "us-central1"
9393
name = "tf-test-ha-vpn-2%{random_suffix}"
94-
network = google_compute_network.network2.self_link
94+
network = google_compute_network.network2.id
9595
}
9696
9797
resource "google_compute_network" "network1" {
@@ -113,31 +113,31 @@ resource "google_compute_subnetwork" "network1_subnet1" {
113113
name = "ha-vpn-subnet-1"
114114
ip_cidr_range = "10.0.1.0/24"
115115
region = "us-central1"
116-
network = google_compute_network.network1.self_link
116+
network = google_compute_network.network1.id
117117
}
118118
119119
resource "google_compute_subnetwork" "network1_subnet2" {
120120
provider = google-beta
121121
name = "ha-vpn-subnet-2"
122122
ip_cidr_range = "10.0.2.0/24"
123123
region = "us-west1"
124-
network = google_compute_network.network1.self_link
124+
network = google_compute_network.network1.id
125125
}
126126
127127
resource "google_compute_subnetwork" "network2_subnet1" {
128128
provider = google-beta
129129
name = "ha-vpn-subnet-3"
130130
ip_cidr_range = "192.168.1.0/24"
131131
region = "us-central1"
132-
network = google_compute_network.network2.self_link
132+
network = google_compute_network.network2.id
133133
}
134134
135135
resource "google_compute_subnetwork" "network2_subnet2" {
136136
provider = google-beta
137137
name = "ha-vpn-subnet-4"
138138
ip_cidr_range = "192.168.2.0/24"
139139
region = "us-east1"
140-
network = google_compute_network.network2.self_link
140+
network = google_compute_network.network2.id
141141
}
142142
143143
resource "google_compute_router" "router1" {
@@ -162,43 +162,43 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
162162
provider = google-beta
163163
name = "ha-vpn-tunnel1"
164164
region = "us-central1"
165-
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
166-
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
165+
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
166+
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
167167
shared_secret = "a secret message"
168-
router = google_compute_router.router1.self_link
168+
router = google_compute_router.router1.id
169169
vpn_gateway_interface = 0
170170
}
171171
172172
resource "google_compute_vpn_tunnel" "tunnel2" {
173173
provider = google-beta
174174
name = "ha-vpn-tunnel2"
175175
region = "us-central1"
176-
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
177-
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
176+
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
177+
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
178178
shared_secret = "a secret message"
179-
router = google_compute_router.router1.self_link
179+
router = google_compute_router.router1.id
180180
vpn_gateway_interface = 1
181181
}
182182
183183
resource "google_compute_vpn_tunnel" "tunnel3" {
184184
provider = google-beta
185185
name = "ha-vpn-tunnel3"
186186
region = "us-central1"
187-
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
188-
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
187+
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
188+
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
189189
shared_secret = "a secret message"
190-
router = google_compute_router.router2.self_link
190+
router = google_compute_router.router2.id
191191
vpn_gateway_interface = 0
192192
}
193193
194194
resource "google_compute_vpn_tunnel" "tunnel4" {
195195
provider = google-beta
196196
name = "ha-vpn-tunnel4"
197197
region = "us-central1"
198-
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
199-
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
198+
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
199+
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
200200
shared_secret = "a secret message"
201-
router = google_compute_router.router2.self_link
201+
router = google_compute_router.router2.id
202202
vpn_gateway_interface = 1
203203
}
204204

‎google-beta/resource_compute_managed_ssl_certificate_generated_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ resource "google_compute_target_https_proxy" "default" {
5858
provider = google-beta
5959
6060
name = "tf-test-test-proxy%{random_suffix}"
61-
url_map = google_compute_url_map.default.self_link
62-
ssl_certificates = [google_compute_managed_ssl_certificate.default.self_link]
61+
url_map = google_compute_url_map.default.id
62+
ssl_certificates = [google_compute_managed_ssl_certificate.default.id]
6363
}
6464
6565
resource "google_compute_url_map" "default" {
@@ -68,7 +68,7 @@ resource "google_compute_url_map" "default" {
6868
name = "tf-test-url-map%{random_suffix}"
6969
description = "a description"
7070
71-
default_service = google_compute_backend_service.default.self_link
71+
default_service = google_compute_backend_service.default.id
7272
7373
host_rule {
7474
hosts = ["sslcert.tf-test.club"]
@@ -77,11 +77,11 @@ resource "google_compute_url_map" "default" {
7777
7878
path_matcher {
7979
name = "allpaths"
80-
default_service = google_compute_backend_service.default.self_link
80+
default_service = google_compute_backend_service.default.id
8181
8282
path_rule {
8383
paths = ["/*"]
84-
service = google_compute_backend_service.default.self_link
84+
service = google_compute_backend_service.default.id
8585
}
8686
}
8787
}
@@ -94,7 +94,7 @@ resource "google_compute_backend_service" "default" {
9494
protocol = "HTTP"
9595
timeout_sec = 10
9696
97-
health_checks = [google_compute_http_health_check.default.self_link]
97+
health_checks = [google_compute_http_health_check.default.id]
9898
}
9999
100100
resource "google_compute_http_health_check" "default" {
@@ -117,7 +117,7 @@ resource "google_compute_global_forwarding_rule" "default" {
117117
provider = google-beta
118118
119119
name = "tf-test-forwarding-rule%{random_suffix}"
120-
target = google_compute_target_https_proxy.default.self_link
120+
target = google_compute_target_https_proxy.default.id
121121
port_range = 443
122122
}
123123
@@ -165,8 +165,8 @@ func testAccComputeManagedSslCertificate_managedSslCertificateRecreationExample(
165165
resource "google_compute_target_https_proxy" "default" {
166166
provider = google-beta
167167
name = "test-proxy"
168-
url_map = google_compute_url_map.default.self_link
169-
ssl_certificates = [google_compute_managed_ssl_certificate.cert.self_link]
168+
url_map = google_compute_url_map.default.id
169+
ssl_certificates = [google_compute_managed_ssl_certificate.cert.id]
170170
}
171171
172172
locals {
@@ -199,17 +199,17 @@ resource "google_compute_url_map" "default" {
199199
provider = google-beta
200200
name = "url-map"
201201
description = "a description"
202-
default_service = google_compute_backend_service.default.self_link
202+
default_service = google_compute_backend_service.default.id
203203
host_rule {
204204
hosts = ["mysite.com"]
205205
path_matcher = "allpaths"
206206
}
207207
path_matcher {
208208
name = "allpaths"
209-
default_service = google_compute_backend_service.default.self_link
209+
default_service = google_compute_backend_service.default.id
210210
path_rule {
211211
paths = ["/*"]
212-
service = google_compute_backend_service.default.self_link
212+
service = google_compute_backend_service.default.id
213213
}
214214
}
215215
}
@@ -220,7 +220,7 @@ resource "google_compute_backend_service" "default" {
220220
port_name = "http"
221221
protocol = "HTTP"
222222
timeout_sec = 10
223-
health_checks = [google_compute_http_health_check.default.self_link]
223+
health_checks = [google_compute_http_health_check.default.id]
224224
}
225225
226226
resource "google_compute_http_health_check" "default" {

‎google-beta/resource_compute_network_endpoint_group_generated_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ func testAccComputeNetworkEndpointGroup_networkEndpointGroupExample(context map[
5151
return Nprintf(`
5252
resource "google_compute_network_endpoint_group" "neg" {
5353
name = "tf-test-my-lb-neg%{random_suffix}"
54-
network = google_compute_network.default.self_link
55-
subnetwork = google_compute_subnetwork.default.self_link
54+
network = google_compute_network.default.id
55+
subnetwork = google_compute_subnetwork.default.id
5656
default_port = "90"
5757
zone = "us-central1-a"
5858
}
@@ -66,7 +66,7 @@ resource "google_compute_subnetwork" "default" {
6666
name = "tf-test-neg-subnetwork%{random_suffix}"
6767
ip_cidr_range = "10.0.0.0/16"
6868
region = "us-central1"
69-
network = google_compute_network.default.self_link
69+
network = google_compute_network.default.id
7070
}
7171
`, context)
7272
}

‎google-beta/resource_compute_network_peering_routes_config_generated_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ resource "google_compute_network_peering_routes_config" "peering_primary_routes"
6060
6161
resource "google_compute_network_peering" "peering_primary" {
6262
name = "tf-test-primary-peering%{random_suffix}"
63-
network = google_compute_network.network_primary.self_link
64-
peer_network = google_compute_network.network_secondary.self_link
63+
network = google_compute_network.network_primary.id
64+
peer_network = google_compute_network.network_secondary.id
6565
6666
import_custom_routes = true
6767
export_custom_routes = true
6868
}
6969
7070
resource "google_compute_network_peering" "peering_secondary" {
7171
name = "tf-test-secondary-peering%{random_suffix}"
72-
network = google_compute_network.network_secondary.self_link
73-
peer_network = google_compute_network.network_primary.self_link
72+
network = google_compute_network.network_secondary.id
73+
peer_network = google_compute_network.network_primary.id
7474
}
7575
7676
resource "google_compute_network" "network_primary" {

‎google-beta/resource_compute_node_group_generated_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ resource "google_compute_node_group" "nodes" {
6565
description = "example google_compute_node_group for Terraform Google Provider"
6666
6767
size = 1
68-
node_template = google_compute_node_template.soletenant-tmpl.self_link
68+
node_template = google_compute_node_template.soletenant-tmpl.id
6969
}
7070
`, context)
7171
}
@@ -110,7 +110,7 @@ resource "google_compute_node_group" "nodes" {
110110
description = "example google_compute_node_group for Terraform Google Provider"
111111
112112
size = 1
113-
node_template = google_compute_node_template.soletenant-tmpl.self_link
113+
node_template = google_compute_node_template.soletenant-tmpl.id
114114
autoscaling_policy {
115115
mode = "ON"
116116
min_nodes = 1

0 commit comments

Comments
 (0)