Skip to content

Commit

Permalink
Add ids #1 in manual docs (part 4 of #5542) (#3489) (#6350)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored May 11, 2020
1 parent 2ae02a4 commit 29e5531
Show file tree
Hide file tree
Showing 61 changed files with 327 additions and 276 deletions.
3 changes: 3 additions & 0 deletions .changelog/3489.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
10 changes: 5 additions & 5 deletions google/iam_compute_subnetwork_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
name = "tf-test-test-subnetwork%{random_suffix}"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
network = google_compute_network.custom-test.self_link
network = google_compute_network.custom-test.id
secondary_ip_range {
range_name = "tf-test-secondary-range-update1"
ip_cidr_range = "192.168.10.0/24"
Expand Down Expand Up @@ -150,7 +150,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
name = "tf-test-test-subnetwork%{random_suffix}"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
network = google_compute_network.custom-test.self_link
network = google_compute_network.custom-test.id
secondary_ip_range {
range_name = "tf-test-secondary-range-update1"
ip_cidr_range = "192.168.10.0/24"
Expand Down Expand Up @@ -184,7 +184,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
name = "tf-test-test-subnetwork%{random_suffix}"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
network = google_compute_network.custom-test.self_link
network = google_compute_network.custom-test.id
secondary_ip_range {
range_name = "tf-test-secondary-range-update1"
ip_cidr_range = "192.168.10.0/24"
Expand Down Expand Up @@ -214,7 +214,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
name = "tf-test-test-subnetwork%{random_suffix}"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
network = google_compute_network.custom-test.self_link
network = google_compute_network.custom-test.id
secondary_ip_range {
range_name = "tf-test-secondary-range-update1"
ip_cidr_range = "192.168.10.0/24"
Expand Down Expand Up @@ -242,7 +242,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
name = "tf-test-test-subnetwork%{random_suffix}"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
network = google_compute_network.custom-test.self_link
network = google_compute_network.custom-test.id
secondary_ip_range {
range_name = "tf-test-secondary-range-update1"
ip_cidr_range = "192.168.10.0/24"
Expand Down
6 changes: 3 additions & 3 deletions google/resource_big_query_job_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ resource "google_bigquery_table" "dest" {
EOF
encryption_configuration {
kms_key_name = google_kms_crypto_key.crypto_key.self_link
kms_key_name = google_kms_crypto_key.crypto_key.id
}
depends_on = ["google_project_iam_member.encrypt_role"]
Expand All @@ -254,7 +254,7 @@ resource "google_bigquery_dataset" "dest" {
resource "google_kms_crypto_key" "crypto_key" {
name = "tf-test-example-key%{random_suffix}"
key_ring = google_kms_key_ring.key_ring.self_link
key_ring = google_kms_key_ring.key_ring.id
}
resource "google_kms_key_ring" "key_ring" {
Expand Down Expand Up @@ -294,7 +294,7 @@ resource "google_bigquery_job" "job" {
}
destination_encryption_configuration {
kms_key_name = google_kms_crypto_key.crypto_key.self_link
kms_key_name = google_kms_crypto_key.crypto_key.id
}
}
Expand Down
14 changes: 7 additions & 7 deletions google/resource_compute_region_backend_service_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func testAccComputeRegionBackendService_regionBackendServiceBasicExample(context
resource "google_compute_region_backend_service" "default" {
name = "tf-test-region-service%{random_suffix}"
region = "us-central1"
health_checks = [google_compute_health_check.default.self_link]
health_checks = [google_compute_health_check.default.id]
connection_draining_timeout_sec = 10
session_affinity = "CLIENT_IP"
}
Expand Down Expand Up @@ -98,7 +98,7 @@ func testAccComputeRegionBackendService_regionBackendServiceIlbRoundRobinExample
resource "google_compute_region_backend_service" "default" {
region = "us-central1"
name = "tf-test-region-service%{random_suffix}"
health_checks = ["${google_compute_health_check.health_check.self_link}"]
health_checks = [google_compute_health_check.health_check.id]
protocol = "HTTP"
load_balancing_scheme = "INTERNAL_MANAGED"
locality_lb_policy = "ROUND_ROBIN"
Expand Down Expand Up @@ -142,7 +142,7 @@ func testAccComputeRegionBackendService_regionBackendServiceIlbRingHashExample(c
resource "google_compute_region_backend_service" "default" {
region = "us-central1"
name = "tf-test-region-service%{random_suffix}"
health_checks = ["${google_compute_health_check.health_check.self_link}"]
health_checks = [google_compute_health_check.health_check.id]
load_balancing_scheme = "INTERNAL_MANAGED"
locality_lb_policy = "RING_HASH"
session_affinity = "HTTP_COOKIE"
Expand Down Expand Up @@ -213,7 +213,7 @@ resource "google_compute_region_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10
health_checks = [google_compute_region_health_check.default.self_link]
health_checks = [google_compute_region_health_check.default.id]
}
data "google_compute_image" "debian_image" {
Expand All @@ -237,8 +237,8 @@ resource "google_compute_instance_template" "instance_template" {
machine_type = "n1-standard-1"
network_interface {
network = google_compute_network.default.self_link
subnetwork = google_compute_subnetwork.default.self_link
network = google_compute_network.default.id
subnetwork = google_compute_subnetwork.default.id
}
disk {
Expand Down Expand Up @@ -268,7 +268,7 @@ resource "google_compute_subnetwork" "default" {
name = "tf-test-rbs-net%{random_suffix}-default"
ip_cidr_range = "10.1.2.0/24"
region = "us-central1"
network = google_compute_network.default.self_link
network = google_compute_network.default.id
}
`, context)
}
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_region_disk_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func testAccComputeRegionDisk_regionDiskBasicExample(context map[string]interfac
return Nprintf(`
resource "google_compute_region_disk" "regiondisk" {
name = "tf-test-my-region-disk%{random_suffix}"
snapshot = google_compute_snapshot.snapdisk.self_link
snapshot = google_compute_snapshot.snapdisk.id
type = "pd-ssd"
region = "us-central1"
physical_block_size_bytes = 4096
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ resource "google_compute_snapshot" "snapdisk" {
resource "google_compute_region_disk" "ssd" {
name = "tf-test-my-disk%{random_suffix}"
replica_zones = ["us-central1-a", "us-central1-f"]
snapshot = google_compute_snapshot.snapdisk.self_link
snapshot = google_compute_snapshot.snapdisk.id
size = 50
type = "pd-ssd"
region = "us-central1"
Expand Down
12 changes: 6 additions & 6 deletions google/resource_compute_region_ssl_certificate_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,16 @@ resource "google_compute_region_ssl_certificate" "default" {
resource "google_compute_region_target_https_proxy" "default" {
region = "us-central1"
name = "tf-test-test-proxy%{random_suffix}"
url_map = google_compute_region_url_map.default.self_link
ssl_certificates = [google_compute_region_ssl_certificate.default.self_link]
url_map = google_compute_region_url_map.default.id
ssl_certificates = [google_compute_region_ssl_certificate.default.id]
}
resource "google_compute_region_url_map" "default" {
region = "us-central1"
name = "tf-test-url-map%{random_suffix}"
description = "a description"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
host_rule {
hosts = ["mysite.com"]
Expand All @@ -188,11 +188,11 @@ resource "google_compute_region_url_map" "default" {
path_matcher {
name = "allpaths"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
path_rule {
paths = ["/*"]
service = google_compute_region_backend_service.default.self_link
service = google_compute_region_backend_service.default.id
}
}
}
Expand All @@ -203,7 +203,7 @@ resource "google_compute_region_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10
health_checks = [google_compute_region_health_check.default.self_link]
health_checks = [google_compute_region_health_check.default.id]
}
resource "google_compute_region_health_check" "default" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ func testAccComputeRegionTargetHttpProxy_regionTargetHttpProxyBasicExample(conte
resource "google_compute_region_target_http_proxy" "default" {
region = "us-central1"
name = "tf-test-test-proxy%{random_suffix}"
url_map = google_compute_region_url_map.default.self_link
url_map = google_compute_region_url_map.default.id
}
resource "google_compute_region_url_map" "default" {
region = "us-central1"
name = "tf-test-url-map%{random_suffix}"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
host_rule {
hosts = ["mysite.com"]
Expand All @@ -67,11 +67,11 @@ resource "google_compute_region_url_map" "default" {
path_matcher {
name = "allpaths"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
path_rule {
paths = ["/*"]
service = google_compute_region_backend_service.default.self_link
service = google_compute_region_backend_service.default.id
}
}
}
Expand All @@ -82,7 +82,7 @@ resource "google_compute_region_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10
health_checks = [google_compute_region_health_check.default.self_link]
health_checks = [google_compute_region_health_check.default.id]
}
resource "google_compute_region_health_check" "default" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func testAccComputeRegionTargetHttpsProxy_regionTargetHttpsProxyBasicExample(con
resource "google_compute_region_target_https_proxy" "default" {
region = "us-central1"
name = "tf-test-test-proxy%{random_suffix}"
url_map = google_compute_region_url_map.default.self_link
ssl_certificates = [google_compute_region_ssl_certificate.default.self_link]
url_map = google_compute_region_url_map.default.id
ssl_certificates = [google_compute_region_ssl_certificate.default.id]
}
resource "google_compute_region_ssl_certificate" "default" {
Expand All @@ -68,7 +68,7 @@ resource "google_compute_region_url_map" "default" {
name = "tf-test-url-map%{random_suffix}"
description = "a description"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
host_rule {
hosts = ["mysite.com"]
Expand All @@ -77,11 +77,11 @@ resource "google_compute_region_url_map" "default" {
path_matcher {
name = "allpaths"
default_service = google_compute_region_backend_service.default.self_link
default_service = google_compute_region_backend_service.default.id
path_rule {
paths = ["/*"]
service = google_compute_region_backend_service.default.self_link
service = google_compute_region_backend_service.default.id
}
}
}
Expand All @@ -92,7 +92,7 @@ resource "google_compute_region_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10
health_checks = [google_compute_region_health_check.default.self_link]
health_checks = [google_compute_region_health_check.default.id]
}
resource "google_compute_region_health_check" "default" {
Expand Down
Loading

0 comments on commit 29e5531

Please sign in to comment.