From c18009f37b36303d74fabf9640d42b84112e9e93 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Mon, 11 May 2020 14:13:23 -0700 Subject: [PATCH] Add ids #1 in manual docs (part 4 of #5542) (#3489) --- .../examples/bigquery_dataset_cmek.tf.erb | 4 ++-- .../examples/bigquery_job_copy.tf.erb | 8 ++++---- ...egion_backend_service_balancing_mode.tf.erb | 8 ++++---- .../region_backend_service_basic.tf.erb | 2 +- ...region_backend_service_ilb_ring_hash.tf.erb | 2 +- ...gion_backend_service_ilb_round_robin.tf.erb | 2 +- .../examples/region_disk_basic.tf.erb | 2 +- ...isk_resource_policy_attachment_basic.tf.erb | 2 +- ...ssl_certificate_target_https_proxies.tf.erb | 12 ++++++------ .../region_target_http_proxy_basic.tf.erb | 10 +++++----- .../region_target_https_proxy_basic.tf.erb | 12 ++++++------ .../examples/region_url_map_basic.tf.erb | 14 +++++++------- .../examples/region_url_map_l7_ilb_path.tf.erb | 12 ++++++------ .../region_url_map_l7_ilb_path_partial.tf.erb | 10 +++++----- .../region_url_map_l7_ilb_route.tf.erb | 8 ++++---- .../region_url_map_l7_ilb_route_partial.tf.erb | 10 +++++----- templates/terraform/examples/route_ilb.tf.erb | 8 ++++---- .../terraform/examples/router_nat_basic.tf.erb | 4 ++-- .../examples/router_nat_manual_ips.tf.erb | 8 ++++---- ...ssl_certificate_target_https_proxies.tf.erb | 12 ++++++------ .../terraform/examples/subnetwork_basic.tf.erb | 2 +- .../examples/subnetwork_internal_l7lb.tf.erb | 2 +- .../examples/subnetwork_logging_config.tf.erb | 2 +- .../examples/target_http_proxy_basic.tf.erb | 10 +++++----- .../examples/target_https_proxy_basic.tf.erb | 12 ++++++------ .../examples/target_instance_basic.tf.erb | 2 +- .../examples/target_ssl_proxy_basic.tf.erb | 6 +++--- .../examples/target_tcp_proxy_basic.tf.erb | 4 ++-- .../examples/target_vpn_gateway_basic.tf.erb | 12 ++++++------ .../terraform/examples/url_map_basic.tf.erb | 18 +++++++++--------- .../url_map_traffic_director_path.tf.erb | 12 ++++++------ ...rl_map_traffic_director_path_partial.tf.erb | 10 +++++----- .../url_map_traffic_director_route.tf.erb | 8 ++++---- ...l_map_traffic_director_route_partial.tf.erb | 8 ++++---- .../terraform/examples/vpn_tunnel_basic.tf.erb | 12 ++++++------ .../terraform/examples/vpn_tunnel_beta.tf.erb | 12 ++++++------ .../docs/r/bigquery_table.html.markdown | 2 ++ .../docs/r/bigtable_instance.html.markdown | 4 +++- .../docs/r/bigtable_table.html.markdown | 6 +++++- .../docs/r/compute_instance.html.markdown | 2 ++ .../r/compute_instance_group.html.markdown | 2 ++ ...ompute_instance_group_manager.html.markdown | 2 ++ .../r/compute_instance_template.html.markdown | 2 ++ .../r/compute_network_peering.html.markdown | 2 ++ ..._project_default_network_tier.html.markdown | 4 +++- .../r/compute_project_metadata.html.markdown | 4 +++- ...compute_project_metadata_item.html.markdown | 4 +++- ...region_instance_group_manager.html.markdown | 2 ++ .../r/compute_router_interface.html.markdown | 4 +++- .../r/compute_security_policy.html.markdown | 2 ++ ...mpute_shared_vpc_host_project.html.markdown | 6 ++++++ ...te_shared_vpc_service_project.html.markdown | 6 ++++++ .../docs/r/compute_target_pool.html.markdown | 2 ++ .../docs/r/container_cluster.html.markdown | 2 ++ .../docs/r/container_node_pool.html.markdown | 2 ++ 55 files changed, 195 insertions(+), 147 deletions(-) diff --git a/templates/terraform/examples/bigquery_dataset_cmek.tf.erb b/templates/terraform/examples/bigquery_dataset_cmek.tf.erb index 5bec43c07e05..589c400ba84b 100644 --- a/templates/terraform/examples/bigquery_dataset_cmek.tf.erb +++ b/templates/terraform/examples/bigquery_dataset_cmek.tf.erb @@ -6,13 +6,13 @@ resource "google_bigquery_dataset" "<%= ctx[:primary_resource_id] %>" { default_table_expiration_ms = 3600000 default_encryption_configuration { - kms_key_name = google_kms_crypto_key.crypto_key.self_link + kms_key_name = google_kms_crypto_key.crypto_key.id } } resource "google_kms_crypto_key" "crypto_key" { name = "<%= ctx[:vars]['key_name'] %>" - 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" { diff --git a/templates/terraform/examples/bigquery_job_copy.tf.erb b/templates/terraform/examples/bigquery_job_copy.tf.erb index f2088c355238..a827a1bf6c36 100644 --- a/templates/terraform/examples/bigquery_job_copy.tf.erb +++ b/templates/terraform/examples/bigquery_job_copy.tf.erb @@ -59,7 +59,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"] @@ -74,7 +74,7 @@ resource "google_bigquery_dataset" "dest" { resource "google_kms_crypto_key" "crypto_key" { name = "<%= ctx[:vars]['key_name'] %>" - 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" { @@ -114,9 +114,9 @@ resource "google_bigquery_job" "<%= ctx[:primary_resource_id] %>" { } destination_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"] -} \ No newline at end of file +} diff --git a/templates/terraform/examples/region_backend_service_balancing_mode.tf.erb b/templates/terraform/examples/region_backend_service_balancing_mode.tf.erb index 0e8f7c464093..5be5f52ee78e 100644 --- a/templates/terraform/examples/region_backend_service_balancing_mode.tf.erb +++ b/templates/terraform/examples/region_backend_service_balancing_mode.tf.erb @@ -12,7 +12,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" { @@ -36,8 +36,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 { @@ -67,5 +67,5 @@ resource "google_compute_subnetwork" "default" { name = "<%= ctx[:vars]['network_name'] %>-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 } diff --git a/templates/terraform/examples/region_backend_service_basic.tf.erb b/templates/terraform/examples/region_backend_service_basic.tf.erb index b7a04720e926..acbc9a75e482 100644 --- a/templates/terraform/examples/region_backend_service_basic.tf.erb +++ b/templates/terraform/examples/region_backend_service_basic.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_backend_service" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_backend_service_name'] %>" 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" } diff --git a/templates/terraform/examples/region_backend_service_ilb_ring_hash.tf.erb b/templates/terraform/examples/region_backend_service_ilb_ring_hash.tf.erb index 557ef5ee221f..cce5eb0ae5c3 100644 --- a/templates/terraform/examples/region_backend_service_ilb_ring_hash.tf.erb +++ b/templates/terraform/examples/region_backend_service_ilb_ring_hash.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_backend_service" "<%= ctx[:primary_resource_id] %>" { region = "us-central1" name = "<%= ctx[:vars]['region_backend_service_name'] %>" - 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" diff --git a/templates/terraform/examples/region_backend_service_ilb_round_robin.tf.erb b/templates/terraform/examples/region_backend_service_ilb_round_robin.tf.erb index 80c2c95adcf7..2d93c3b2c2f3 100644 --- a/templates/terraform/examples/region_backend_service_ilb_round_robin.tf.erb +++ b/templates/terraform/examples/region_backend_service_ilb_round_robin.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_backend_service" "<%= ctx[:primary_resource_id] %>" { region = "us-central1" name = "<%= ctx[:vars]['region_backend_service_name'] %>" - 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" diff --git a/templates/terraform/examples/region_disk_basic.tf.erb b/templates/terraform/examples/region_disk_basic.tf.erb index 52726d6d9277..4945baa0a3b0 100644 --- a/templates/terraform/examples/region_disk_basic.tf.erb +++ b/templates/terraform/examples/region_disk_basic.tf.erb @@ -1,6 +1,6 @@ resource "google_compute_region_disk" "regiondisk" { name = "<%= ctx[:vars]['region_disk_name'] %>" - snapshot = google_compute_snapshot.snapdisk.self_link + snapshot = google_compute_snapshot.snapdisk.id type = "pd-ssd" region = "us-central1" physical_block_size_bytes = 4096 diff --git a/templates/terraform/examples/region_disk_resource_policy_attachment_basic.tf.erb b/templates/terraform/examples/region_disk_resource_policy_attachment_basic.tf.erb index aae4fa46e7dc..d7fea5727985 100644 --- a/templates/terraform/examples/region_disk_resource_policy_attachment_basic.tf.erb +++ b/templates/terraform/examples/region_disk_resource_policy_attachment_basic.tf.erb @@ -21,7 +21,7 @@ resource "google_compute_snapshot" "snapdisk" { resource "google_compute_region_disk" "ssd" { name = "<%= ctx[:vars]['disk_name'] %>" 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" diff --git a/templates/terraform/examples/region_ssl_certificate_target_https_proxies.tf.erb b/templates/terraform/examples/region_ssl_certificate_target_https_proxies.tf.erb index d1fff9316e4d..9be83a3f210c 100644 --- a/templates/terraform/examples/region_ssl_certificate_target_https_proxies.tf.erb +++ b/templates/terraform/examples/region_ssl_certificate_target_https_proxies.tf.erb @@ -22,8 +22,8 @@ resource "google_compute_region_ssl_certificate" "default" { resource "google_compute_region_target_https_proxy" "default" { region = "us-central1" name = "<%= ctx[:vars]['region_target_https_proxy_name'] %>" - 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" { @@ -31,7 +31,7 @@ resource "google_compute_region_url_map" "default" { name = "<%= ctx[:vars]['region_url_map_name'] %>" 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"] @@ -40,11 +40,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 } } } @@ -55,7 +55,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" { diff --git a/templates/terraform/examples/region_target_http_proxy_basic.tf.erb b/templates/terraform/examples/region_target_http_proxy_basic.tf.erb index fff0520e1ef2..ca44fc4f296f 100644 --- a/templates/terraform/examples/region_target_http_proxy_basic.tf.erb +++ b/templates/terraform/examples/region_target_http_proxy_basic.tf.erb @@ -1,13 +1,13 @@ resource "google_compute_region_target_http_proxy" "default" { region = "us-central1" name = "<%= ctx[:vars]['region_target_http_proxy_name'] %>" - 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 = "<%= ctx[:vars]['region_url_map_name'] %>" - default_service = google_compute_region_backend_service.default.self_link + default_service = google_compute_region_backend_service.default.id host_rule { hosts = ["mysite.com"] @@ -16,11 +16,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 } } } @@ -31,7 +31,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" { diff --git a/templates/terraform/examples/region_target_https_proxy_basic.tf.erb b/templates/terraform/examples/region_target_https_proxy_basic.tf.erb index a37f3dcbb909..3924678ac3c5 100644 --- a/templates/terraform/examples/region_target_https_proxy_basic.tf.erb +++ b/templates/terraform/examples/region_target_https_proxy_basic.tf.erb @@ -1,8 +1,8 @@ resource "google_compute_region_target_https_proxy" "default" { region = "us-central1" name = "<%= ctx[:vars]['region_target_https_proxy_name'] %>" - 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" { @@ -17,7 +17,7 @@ resource "google_compute_region_url_map" "default" { name = "<%= ctx[:vars]['region_url_map_name'] %>" 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"] @@ -26,11 +26,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 } } } @@ -41,7 +41,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" { diff --git a/templates/terraform/examples/region_url_map_basic.tf.erb b/templates/terraform/examples/region_url_map_basic.tf.erb index 0c7f842ff777..01b4b5a18958 100644 --- a/templates/terraform/examples/region_url_map_basic.tf.erb +++ b/templates/terraform/examples/region_url_map_basic.tf.erb @@ -4,7 +4,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -13,21 +13,21 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id path_rule { paths = ["/home"] - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id } path_rule { paths = ["/login"] - service = google_compute_region_backend_service.login.self_link + service = google_compute_region_backend_service.login.id } } test { - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id host = "hi.com" path = "/home" } @@ -40,7 +40,7 @@ resource "google_compute_region_backend_service" "login" { 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_backend_service" "home" { @@ -50,7 +50,7 @@ resource "google_compute_region_backend_service" "home" { 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" { diff --git a/templates/terraform/examples/region_url_map_l7_ilb_path.tf.erb b/templates/terraform/examples/region_url_map_l7_ilb_path.tf.erb index ae37a5086483..43523de9f88e 100644 --- a/templates/terraform/examples/region_url_map_l7_ilb_path.tf.erb +++ b/templates/terraform/examples/region_url_map_l7_ilb_path.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id path_rule { paths = ["/home"] @@ -38,7 +38,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } } request_mirror_policy { - backend_service = google_compute_region_backend_service.home.self_link + backend_service = google_compute_region_backend_service.home.id } retry_policy { num_retries = 4 @@ -56,7 +56,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_prefix_rewrite = "A replacement path" } weighted_backend_services { - backend_service = google_compute_region_backend_service.home.self_link + backend_service = google_compute_region_backend_service.home.id weight = 400 header_action { request_headers_to_remove = ["RemoveMe"] @@ -78,7 +78,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id host = "hi.com" path = "/home" } @@ -89,7 +89,7 @@ resource "google_compute_region_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_region_health_check.default.self_link] + health_checks = [google_compute_region_health_check.default.id] load_balancing_scheme = "INTERNAL_MANAGED" } diff --git a/templates/terraform/examples/region_url_map_l7_ilb_path_partial.tf.erb b/templates/terraform/examples/region_url_map_l7_ilb_path_partial.tf.erb index f9463b754600..48eebdab4d3e 100644 --- a/templates/terraform/examples/region_url_map_l7_ilb_path_partial.tf.erb +++ b/templates/terraform/examples/region_url_map_l7_ilb_path_partial.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id path_rule { paths = ["/home"] @@ -31,7 +31,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_prefix_rewrite = "A replacement path" } weighted_backend_services { - backend_service = google_compute_region_backend_service.home.self_link + backend_service = google_compute_region_backend_service.home.id weight = 400 header_action { response_headers_to_add { @@ -46,7 +46,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id host = "hi.com" path = "/home" } @@ -57,7 +57,7 @@ resource "google_compute_region_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_region_health_check.default.self_link] + health_checks = [google_compute_region_health_check.default.id] load_balancing_scheme = "INTERNAL_MANAGED" } diff --git a/templates/terraform/examples/region_url_map_l7_ilb_route.tf.erb b/templates/terraform/examples/region_url_map_l7_ilb_route.tf.erb index 89d150ebccd5..017cea1c1095 100644 --- a/templates/terraform/examples/region_url_map_l7_ilb_route.tf.erb +++ b/templates/terraform/examples/region_url_map_l7_ilb_route.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id route_rules { priority = 1 @@ -59,7 +59,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id host = "hi.com" path = "/home" } @@ -70,7 +70,7 @@ resource "google_compute_region_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_region_health_check.default.self_link] + health_checks = [google_compute_region_health_check.default.id] load_balancing_scheme = "INTERNAL_MANAGED" } diff --git a/templates/terraform/examples/region_url_map_l7_ilb_route_partial.tf.erb b/templates/terraform/examples/region_url_map_l7_ilb_route_partial.tf.erb index 4a54727cc67f..a15b770a5a8d 100644 --- a/templates/terraform/examples/region_url_map_l7_ilb_route_partial.tf.erb +++ b/templates/terraform/examples/region_url_map_l7_ilb_route_partial.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['region_url_map_name'] %>" description = "a description" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,11 +10,11 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_region_backend_service.home.self_link + default_service = google_compute_region_backend_service.home.id route_rules { priority = 1 - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id header_action { request_headers_to_remove = ["RemoveMe2"] } @@ -34,7 +34,7 @@ resource "google_compute_region_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_region_backend_service.home.self_link + service = google_compute_region_backend_service.home.id host = "hi.com" path = "/home" } @@ -45,7 +45,7 @@ resource "google_compute_region_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_region_health_check.default.self_link] + health_checks = [google_compute_region_health_check.default.id] load_balancing_scheme = "INTERNAL_MANAGED" } diff --git a/templates/terraform/examples/route_ilb.tf.erb b/templates/terraform/examples/route_ilb.tf.erb index 8d9ba6902f22..8a6376c32031 100644 --- a/templates/terraform/examples/route_ilb.tf.erb +++ b/templates/terraform/examples/route_ilb.tf.erb @@ -7,7 +7,7 @@ resource "google_compute_subnetwork" "default" { name = "<%= ctx[:vars]['subnet_name'] %>" ip_cidr_range = "10.0.1.0/24" region = "us-central1" - network = google_compute_network.default.self_link + network = google_compute_network.default.id } resource "google_compute_health_check" "hc" { @@ -23,7 +23,7 @@ resource "google_compute_health_check" "hc" { resource "google_compute_region_backend_service" "backend" { name = "<%= ctx[:vars]['backend_name'] %>" region = "us-central1" - health_checks = [google_compute_health_check.hc.self_link] + health_checks = [google_compute_health_check.hc.id] } resource "google_compute_forwarding_rule" "default" { @@ -31,7 +31,7 @@ resource "google_compute_forwarding_rule" "default" { region = "us-central1" load_balancing_scheme = "INTERNAL" - backend_service = google_compute_region_backend_service.backend.self_link + backend_service = google_compute_region_backend_service.backend.id all_ports = true network = google_compute_network.default.name subnetwork = google_compute_subnetwork.default.name @@ -41,6 +41,6 @@ resource "google_compute_route" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['route_name'] %>" dest_range = "0.0.0.0/0" network = google_compute_network.default.name - next_hop_ilb = google_compute_forwarding_rule.default.self_link + next_hop_ilb = google_compute_forwarding_rule.default.id priority = 2000 } diff --git a/templates/terraform/examples/router_nat_basic.tf.erb b/templates/terraform/examples/router_nat_basic.tf.erb index 8dfb43925135..7bb8629a90c1 100644 --- a/templates/terraform/examples/router_nat_basic.tf.erb +++ b/templates/terraform/examples/router_nat_basic.tf.erb @@ -4,7 +4,7 @@ resource "google_compute_network" "net" { resource "google_compute_subnetwork" "subnet" { name = "<%= ctx[:vars]['subnet_name'] %>" - network = google_compute_network.net.self_link + network = google_compute_network.net.id ip_cidr_range = "10.0.0.0/16" region = "us-central1" } @@ -12,7 +12,7 @@ resource "google_compute_subnetwork" "subnet" { resource "google_compute_router" "router" { name = "<%= ctx[:vars]['router_name'] %>" region = google_compute_subnetwork.subnet.region - network = google_compute_network.net.self_link + network = google_compute_network.net.id bgp { asn = 64514 diff --git a/templates/terraform/examples/router_nat_manual_ips.tf.erb b/templates/terraform/examples/router_nat_manual_ips.tf.erb index 231ee13a102c..5a56c73f093e 100644 --- a/templates/terraform/examples/router_nat_manual_ips.tf.erb +++ b/templates/terraform/examples/router_nat_manual_ips.tf.erb @@ -4,7 +4,7 @@ resource "google_compute_network" "net" { resource "google_compute_subnetwork" "subnet" { name = "<%= ctx[:vars]['subnet_name'] %>" - network = google_compute_network.net.self_link + network = google_compute_network.net.id ip_cidr_range = "10.0.0.0/16" region = "us-central1" } @@ -12,7 +12,7 @@ resource "google_compute_subnetwork" "subnet" { resource "google_compute_router" "router" { name = "<%= ctx[:vars]['router_name'] %>" region = google_compute_subnetwork.subnet.region - network = google_compute_network.net.self_link + network = google_compute_network.net.id } resource "google_compute_address" "address" { @@ -27,11 +27,11 @@ resource "google_compute_router_nat" "<%= ctx[:primary_resource_id] %>" { region = google_compute_router.router.region nat_ip_allocate_option = "MANUAL_ONLY" - nat_ips = google_compute_address.address.*.self_link + nat_ips = google_compute_address.address.*.id source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS" subnetwork { - name = google_compute_subnetwork.default.self_link + name = google_compute_subnetwork.default.id source_ip_ranges_to_nat = ["ALL_IP_RANGES"] } } diff --git a/templates/terraform/examples/ssl_certificate_target_https_proxies.tf.erb b/templates/terraform/examples/ssl_certificate_target_https_proxies.tf.erb index 85f0644444dd..62b3082dabd0 100644 --- a/templates/terraform/examples/ssl_certificate_target_https_proxies.tf.erb +++ b/templates/terraform/examples/ssl_certificate_target_https_proxies.tf.erb @@ -20,15 +20,15 @@ resource "google_compute_ssl_certificate" "default" { resource "google_compute_target_https_proxy" "default" { name = "<%= ctx[:vars]['target_https_proxy_name'] %>" - url_map = google_compute_url_map.default.self_link - ssl_certificates = [google_compute_ssl_certificate.default.self_link] + url_map = google_compute_url_map.default.id + ssl_certificates = [google_compute_ssl_certificate.default.id] } resource "google_compute_url_map" "default" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id host_rule { hosts = ["mysite.com"] @@ -37,11 +37,11 @@ resource "google_compute_url_map" "default" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id path_rule { paths = ["/*"] - service = google_compute_backend_service.default.self_link + service = google_compute_backend_service.default.id } } } @@ -52,7 +52,7 @@ resource "google_compute_backend_service" "default" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_http_health_check.default.self_link] + health_checks = [google_compute_http_health_check.default.id] } resource "google_compute_http_health_check" "default" { diff --git a/templates/terraform/examples/subnetwork_basic.tf.erb b/templates/terraform/examples/subnetwork_basic.tf.erb index 4cd85ab1e126..f5e224b07d2e 100644 --- a/templates/terraform/examples/subnetwork_basic.tf.erb +++ b/templates/terraform/examples/subnetwork_basic.tf.erb @@ -2,7 +2,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" name = "<%= ctx[:vars]['subnetwork_name'] %>" 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" diff --git a/templates/terraform/examples/subnetwork_internal_l7lb.tf.erb b/templates/terraform/examples/subnetwork_internal_l7lb.tf.erb index 12bf8b878ecb..a59d00fcd673 100644 --- a/templates/terraform/examples/subnetwork_internal_l7lb.tf.erb +++ b/templates/terraform/examples/subnetwork_internal_l7lb.tf.erb @@ -6,7 +6,7 @@ resource "google_compute_subnetwork" "network-for-l7lb" { region = "us-central1" purpose = "INTERNAL_HTTPS_LOAD_BALANCER" role = "ACTIVE" - network = google_compute_network.custom-test.self_link + network = google_compute_network.custom-test.id } resource "google_compute_network" "custom-test" { diff --git a/templates/terraform/examples/subnetwork_logging_config.tf.erb b/templates/terraform/examples/subnetwork_logging_config.tf.erb index 048a98af49a5..159c6df99094 100644 --- a/templates/terraform/examples/subnetwork_logging_config.tf.erb +++ b/templates/terraform/examples/subnetwork_logging_config.tf.erb @@ -2,7 +2,7 @@ resource "google_compute_subnetwork" "subnet-with-logging" { name = "<%= ctx[:vars]['subnetwork_name'] %>" 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 log_config { aggregation_interval = "INTERVAL_10_MIN" diff --git a/templates/terraform/examples/target_http_proxy_basic.tf.erb b/templates/terraform/examples/target_http_proxy_basic.tf.erb index a3e099b98fca..86877bfe8c86 100644 --- a/templates/terraform/examples/target_http_proxy_basic.tf.erb +++ b/templates/terraform/examples/target_http_proxy_basic.tf.erb @@ -1,11 +1,11 @@ resource "google_compute_target_http_proxy" "default" { name = "<%= ctx[:vars]['target_http_proxy_name'] %>" - url_map = google_compute_url_map.default.self_link + url_map = google_compute_url_map.default.id } resource "google_compute_url_map" "default" { name = "<%= ctx[:vars]['url_map_name'] %>" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id host_rule { hosts = ["mysite.com"] @@ -14,11 +14,11 @@ resource "google_compute_url_map" "default" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id path_rule { paths = ["/*"] - service = google_compute_backend_service.default.self_link + service = google_compute_backend_service.default.id } } } @@ -29,7 +29,7 @@ resource "google_compute_backend_service" "default" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_http_health_check.default.self_link] + health_checks = [google_compute_http_health_check.default.id] } resource "google_compute_http_health_check" "default" { diff --git a/templates/terraform/examples/target_https_proxy_basic.tf.erb b/templates/terraform/examples/target_https_proxy_basic.tf.erb index d8de469b10c1..bf515488eeab 100644 --- a/templates/terraform/examples/target_https_proxy_basic.tf.erb +++ b/templates/terraform/examples/target_https_proxy_basic.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_target_https_proxy" "default" { name = "<%= ctx[:vars]['target_https_proxy_name'] %>" - url_map = google_compute_url_map.default.self_link - ssl_certificates = [google_compute_ssl_certificate.default.self_link] + url_map = google_compute_url_map.default.id + ssl_certificates = [google_compute_ssl_certificate.default.id] } resource "google_compute_ssl_certificate" "default" { @@ -14,7 +14,7 @@ resource "google_compute_url_map" "default" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id host_rule { hosts = ["mysite.com"] @@ -23,11 +23,11 @@ resource "google_compute_url_map" "default" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.default.self_link + default_service = google_compute_backend_service.default.id path_rule { paths = ["/*"] - service = google_compute_backend_service.default.self_link + service = google_compute_backend_service.default.id } } } @@ -38,7 +38,7 @@ resource "google_compute_backend_service" "default" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_http_health_check.default.self_link] + health_checks = [google_compute_http_health_check.default.id] } resource "google_compute_http_health_check" "default" { diff --git a/templates/terraform/examples/target_instance_basic.tf.erb b/templates/terraform/examples/target_instance_basic.tf.erb index c1ea4e2daacb..2a83b88b2c9e 100644 --- a/templates/terraform/examples/target_instance_basic.tf.erb +++ b/templates/terraform/examples/target_instance_basic.tf.erb @@ -1,6 +1,6 @@ resource "google_compute_target_instance" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['target_name'] %>" - instance = google_compute_instance.target-vm.self_link + instance = google_compute_instance.target-vm.id } data "google_compute_image" "vmimage" { diff --git a/templates/terraform/examples/target_ssl_proxy_basic.tf.erb b/templates/terraform/examples/target_ssl_proxy_basic.tf.erb index cd1207a9cc69..8bbfcf259643 100644 --- a/templates/terraform/examples/target_ssl_proxy_basic.tf.erb +++ b/templates/terraform/examples/target_ssl_proxy_basic.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_target_ssl_proxy" "default" { name = "<%= ctx[:vars]['target_ssl_proxy_name'] %>" - backend_service = google_compute_backend_service.default.self_link - ssl_certificates = [google_compute_ssl_certificate.default.self_link] + backend_service = google_compute_backend_service.default.id + ssl_certificates = [google_compute_ssl_certificate.default.id] } resource "google_compute_ssl_certificate" "default" { @@ -13,7 +13,7 @@ resource "google_compute_ssl_certificate" "default" { resource "google_compute_backend_service" "default" { name = "<%= ctx[:vars]['backend_service_name'] %>" protocol = "SSL" - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] } resource "google_compute_health_check" "default" { diff --git a/templates/terraform/examples/target_tcp_proxy_basic.tf.erb b/templates/terraform/examples/target_tcp_proxy_basic.tf.erb index fd9c04fc5346..69ad592fdeb0 100644 --- a/templates/terraform/examples/target_tcp_proxy_basic.tf.erb +++ b/templates/terraform/examples/target_tcp_proxy_basic.tf.erb @@ -1,6 +1,6 @@ resource "google_compute_target_tcp_proxy" "default" { name = "<%= ctx[:vars]['target_tcp_proxy_name'] %>" - backend_service = google_compute_backend_service.default.self_link + backend_service = google_compute_backend_service.default.id } resource "google_compute_backend_service" "default" { @@ -8,7 +8,7 @@ resource "google_compute_backend_service" "default" { protocol = "TCP" timeout_sec = 10 - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] } resource "google_compute_health_check" "default" { diff --git a/templates/terraform/examples/target_vpn_gateway_basic.tf.erb b/templates/terraform/examples/target_vpn_gateway_basic.tf.erb index 824ce65f7772..0b57481df59d 100644 --- a/templates/terraform/examples/target_vpn_gateway_basic.tf.erb +++ b/templates/terraform/examples/target_vpn_gateway_basic.tf.erb @@ -1,6 +1,6 @@ resource "google_compute_vpn_gateway" "target_gateway" { name = "<%= ctx[:vars]['target_vpn_gateway_name'] %>" - network = google_compute_network.network1.self_link + network = google_compute_network.network1.id } resource "google_compute_network" "network1" { @@ -15,7 +15,7 @@ resource "google_compute_forwarding_rule" "fr_esp" { name = "<%= ctx[:vars]['esp_forwarding_rule_name'] %>" ip_protocol = "ESP" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp500" { @@ -23,7 +23,7 @@ resource "google_compute_forwarding_rule" "fr_udp500" { ip_protocol = "UDP" port_range = "500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp4500" { @@ -31,7 +31,7 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { ip_protocol = "UDP" port_range = "4500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_vpn_tunnel" "tunnel1" { @@ -39,7 +39,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { peer_ip = "15.0.0.120" shared_secret = "a secret message" - target_vpn_gateway = google_compute_vpn_gateway.target_gateway.self_link + target_vpn_gateway = google_compute_vpn_gateway.target_gateway.id depends_on = [ google_compute_forwarding_rule.fr_esp, @@ -54,5 +54,5 @@ resource "google_compute_route" "route1" { dest_range = "15.0.0.0/24" priority = 1000 - next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.self_link + next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.id } diff --git a/templates/terraform/examples/url_map_basic.tf.erb b/templates/terraform/examples/url_map_basic.tf.erb index 5d870c445cf2..586ad7593ad2 100644 --- a/templates/terraform/examples/url_map_basic.tf.erb +++ b/templates/terraform/examples/url_map_basic.tf.erb @@ -2,7 +2,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -16,31 +16,31 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "mysite" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id path_rule { paths = ["/home"] - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id } path_rule { paths = ["/login"] - service = google_compute_backend_service.login.self_link + service = google_compute_backend_service.login.id } path_rule { paths = ["/static"] - service = google_compute_backend_bucket.static.self_link + service = google_compute_backend_bucket.static.id } } path_matcher { name = "otherpaths" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id } test { - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id host = "hi.com" path = "/home" } @@ -52,7 +52,7 @@ resource "google_compute_backend_service" "login" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_http_health_check.default.self_link] + health_checks = [google_compute_http_health_check.default.id] } resource "google_compute_backend_service" "home" { @@ -61,7 +61,7 @@ resource "google_compute_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_http_health_check.default.self_link] + health_checks = [google_compute_http_health_check.default.id] } resource "google_compute_http_health_check" "default" { diff --git a/templates/terraform/examples/url_map_traffic_director_path.tf.erb b/templates/terraform/examples/url_map_traffic_director_path.tf.erb index d20634c96738..d61fbc0d7989 100644 --- a/templates/terraform/examples/url_map_traffic_director_path.tf.erb +++ b/templates/terraform/examples/url_map_traffic_director_path.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id path_rule { paths = ["/home"] @@ -39,7 +39,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { } } request_mirror_policy { - backend_service = google_compute_backend_service.home.self_link + backend_service = google_compute_backend_service.home.id } retry_policy { num_retries = 4 @@ -57,7 +57,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_prefix_rewrite = "A replacement path" } weighted_backend_services { - backend_service = google_compute_backend_service.home.self_link + backend_service = google_compute_backend_service.home.id weight = 400 header_action { request_headers_to_remove = ["RemoveMe"] @@ -79,7 +79,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id host = "hi.com" path = "/home" } @@ -91,7 +91,7 @@ resource "google_compute_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] load_balancing_scheme = "INTERNAL_SELF_MANAGED" } diff --git a/templates/terraform/examples/url_map_traffic_director_path_partial.tf.erb b/templates/terraform/examples/url_map_traffic_director_path_partial.tf.erb index 97b40b773645..aea9bc2f8333 100644 --- a/templates/terraform/examples/url_map_traffic_director_path_partial.tf.erb +++ b/templates/terraform/examples/url_map_traffic_director_path_partial.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id path_rule { paths = ["/home"] @@ -26,7 +26,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { disabled = false } weighted_backend_services { - backend_service = google_compute_backend_service.home.self_link + backend_service = google_compute_backend_service.home.id weight = 400 header_action { request_headers_to_remove = ["RemoveMe"] @@ -48,7 +48,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id host = "hi.com" path = "/home" } @@ -60,7 +60,7 @@ resource "google_compute_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] load_balancing_scheme = "INTERNAL_SELF_MANAGED" } diff --git a/templates/terraform/examples/url_map_traffic_director_route.tf.erb b/templates/terraform/examples/url_map_traffic_director_route.tf.erb index 2f4cb7f4f0cc..e959621a45e1 100644 --- a/templates/terraform/examples/url_map_traffic_director_route.tf.erb +++ b/templates/terraform/examples/url_map_traffic_director_route.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id route_rules { priority = 1 @@ -59,7 +59,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id host = "hi.com" path = "/home" } @@ -71,7 +71,7 @@ resource "google_compute_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] load_balancing_scheme = "INTERNAL_SELF_MANAGED" } diff --git a/templates/terraform/examples/url_map_traffic_director_route_partial.tf.erb b/templates/terraform/examples/url_map_traffic_director_route_partial.tf.erb index cfa07f561772..c0c8777ee9f6 100644 --- a/templates/terraform/examples/url_map_traffic_director_route_partial.tf.erb +++ b/templates/terraform/examples/url_map_traffic_director_route_partial.tf.erb @@ -1,7 +1,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]['url_map_name'] %>" description = "a description" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id host_rule { hosts = ["mysite.com"] @@ -10,7 +10,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { path_matcher { name = "allpaths" - default_service = google_compute_backend_service.home.self_link + default_service = google_compute_backend_service.home.id route_rules { priority = 1 @@ -30,7 +30,7 @@ resource "google_compute_url_map" "<%= ctx[:primary_resource_id] %>" { } test { - service = google_compute_backend_service.home.self_link + service = google_compute_backend_service.home.id host = "hi.com" path = "/home" } @@ -42,7 +42,7 @@ resource "google_compute_backend_service" "home" { protocol = "HTTP" timeout_sec = 10 - health_checks = [google_compute_health_check.default.self_link] + health_checks = [google_compute_health_check.default.id] load_balancing_scheme = "INTERNAL_SELF_MANAGED" } diff --git a/templates/terraform/examples/vpn_tunnel_basic.tf.erb b/templates/terraform/examples/vpn_tunnel_basic.tf.erb index 4991d0d0234b..6ee49cb02c60 100644 --- a/templates/terraform/examples/vpn_tunnel_basic.tf.erb +++ b/templates/terraform/examples/vpn_tunnel_basic.tf.erb @@ -3,7 +3,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { peer_ip = "15.0.0.120" shared_secret = "a secret message" - target_vpn_gateway = google_compute_vpn_gateway.target_gateway.self_link + target_vpn_gateway = google_compute_vpn_gateway.target_gateway.id depends_on = [ google_compute_forwarding_rule.fr_esp, @@ -14,7 +14,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { resource "google_compute_vpn_gateway" "target_gateway" { name = "<%= ctx[:vars]['target_vpn_gateway_name'] %>" - network = google_compute_network.network1.self_link + network = google_compute_network.network1.id } resource "google_compute_network" "network1" { @@ -29,7 +29,7 @@ resource "google_compute_forwarding_rule" "fr_esp" { name = "<%= ctx[:vars]['esp_forwarding_rule_name'] %>" ip_protocol = "ESP" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp500" { @@ -37,7 +37,7 @@ resource "google_compute_forwarding_rule" "fr_udp500" { ip_protocol = "UDP" port_range = "500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp4500" { @@ -45,7 +45,7 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { ip_protocol = "UDP" port_range = "4500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_route" "route1" { @@ -54,5 +54,5 @@ resource "google_compute_route" "route1" { dest_range = "15.0.0.0/24" priority = 1000 - next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.self_link + next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.id } diff --git a/templates/terraform/examples/vpn_tunnel_beta.tf.erb b/templates/terraform/examples/vpn_tunnel_beta.tf.erb index a363eb6b5da0..0b2415d4e1df 100644 --- a/templates/terraform/examples/vpn_tunnel_beta.tf.erb +++ b/templates/terraform/examples/vpn_tunnel_beta.tf.erb @@ -4,7 +4,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { peer_ip = "15.0.0.120" shared_secret = "a secret message" - target_vpn_gateway = google_compute_vpn_gateway.target_gateway.self_link + target_vpn_gateway = google_compute_vpn_gateway.target_gateway.id depends_on = [ google_compute_forwarding_rule.fr_esp, @@ -20,7 +20,7 @@ resource "google_compute_vpn_tunnel" "tunnel1" { resource "google_compute_vpn_gateway" "target_gateway" { provider = google-beta name = "<%= ctx[:vars]['target_vpn_gateway_name'] %>" - network = google_compute_network.network1.self_link + network = google_compute_network.network1.id } resource "google_compute_network" "network1" { @@ -38,7 +38,7 @@ resource "google_compute_forwarding_rule" "fr_esp" { name = "<%= ctx[:vars]['esp_forwarding_rule_name'] %>" ip_protocol = "ESP" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp500" { @@ -47,7 +47,7 @@ resource "google_compute_forwarding_rule" "fr_udp500" { ip_protocol = "UDP" port_range = "500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_forwarding_rule" "fr_udp4500" { @@ -56,7 +56,7 @@ resource "google_compute_forwarding_rule" "fr_udp4500" { ip_protocol = "UDP" port_range = "4500" ip_address = google_compute_address.vpn_static_ip.address - target = google_compute_vpn_gateway.target_gateway.self_link + target = google_compute_vpn_gateway.target_gateway.id } resource "google_compute_route" "route1" { @@ -66,7 +66,7 @@ resource "google_compute_route" "route1" { dest_range = "15.0.0.0/24" priority = 1000 - next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.self_link + next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel1.id } provider "google-beta" { diff --git a/third_party/terraform/website/docs/r/bigquery_table.html.markdown b/third_party/terraform/website/docs/r/bigquery_table.html.markdown index ec2c9289e4d5..54654a9e0f56 100644 --- a/third_party/terraform/website/docs/r/bigquery_table.html.markdown +++ b/third_party/terraform/website/docs/r/bigquery_table.html.markdown @@ -259,6 +259,8 @@ The `encryption_configuration` block supports the following arguments: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/datasets/{{dataset}}/tables/{{name}}` + * `creation_time` - The time when this table was created, in milliseconds since the epoch. * `etag` - A hash of the resource. diff --git a/third_party/terraform/website/docs/r/bigtable_instance.html.markdown b/third_party/terraform/website/docs/r/bigtable_instance.html.markdown index 724989800831..a7a1269b56e4 100644 --- a/third_party/terraform/website/docs/r/bigtable_instance.html.markdown +++ b/third_party/terraform/website/docs/r/bigtable_instance.html.markdown @@ -99,7 +99,9 @@ for a `DEVELOPMENT` instance. ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `projects/{{project}}/instances/{{name}}` ## Import diff --git a/third_party/terraform/website/docs/r/bigtable_table.html.markdown b/third_party/terraform/website/docs/r/bigtable_table.html.markdown index 24c46ae06400..b2fb3a1e0da1 100644 --- a/third_party/terraform/website/docs/r/bigtable_table.html.markdown +++ b/third_party/terraform/website/docs/r/bigtable_table.html.markdown @@ -73,7 +73,11 @@ to delete/recreate the entire `google_bigtable_table` resource. ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are +exported: + +* `id` - an identifier for the resource with format `projects/{{project}}/instances/{{instance_name}}/tables/{{name}}` + ## Import diff --git a/third_party/terraform/website/docs/r/compute_instance.html.markdown b/third_party/terraform/website/docs/r/compute_instance.html.markdown index ea7ce4099284..3ae9187152ad 100644 --- a/third_party/terraform/website/docs/r/compute_instance.html.markdown +++ b/third_party/terraform/website/docs/r/compute_instance.html.markdown @@ -352,6 +352,8 @@ The `shielded_instance_config` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/zones/{{zone}}/instances/{{name}}` + * `instance_id` - The server-assigned unique identifier of this instance. * `metadata_fingerprint` - The unique fingerprint of the metadata. diff --git a/third_party/terraform/website/docs/r/compute_instance_group.html.markdown b/third_party/terraform/website/docs/r/compute_instance_group.html.markdown index 4407f62caeae..8ca1512780b6 100644 --- a/third_party/terraform/website/docs/r/compute_instance_group.html.markdown +++ b/third_party/terraform/website/docs/r/compute_instance_group.html.markdown @@ -161,6 +161,8 @@ The `named_port` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}/zones/{{zone}}/instanceGroups/{{name}}` + * `self_link` - The URI of the created resource. * `size` - The number of instances in the group. diff --git a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown index 45945f95a441..fa2552741869 100644 --- a/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown +++ b/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown @@ -235,6 +235,8 @@ The `stateful_disk` block supports: (Include a `stateful_disk` block for each st In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/zones/{{zone}}/instanceGroupManagers/{{name}}` + * `fingerprint` - The fingerprint of the instance group manager. * `instance_group` - The full URL of the instance group created by the manager. diff --git a/third_party/terraform/website/docs/r/compute_instance_template.html.markdown b/third_party/terraform/website/docs/r/compute_instance_template.html.markdown index 0199e7aa9fef..bf7a56235804 100644 --- a/third_party/terraform/website/docs/r/compute_instance_template.html.markdown +++ b/third_party/terraform/website/docs/r/compute_instance_template.html.markdown @@ -413,6 +413,8 @@ The `shielded_instance_config` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/global/instanceTemplates/{{name}}` + * `metadata_fingerprint` - The unique fingerprint of the metadata. * `self_link` - The URI of the created resource. diff --git a/third_party/terraform/website/docs/r/compute_network_peering.html.markdown b/third_party/terraform/website/docs/r/compute_network_peering.html.markdown index 1f2521161c76..f2fa7b24ddf9 100644 --- a/third_party/terraform/website/docs/r/compute_network_peering.html.markdown +++ b/third_party/terraform/website/docs/r/compute_network_peering.html.markdown @@ -67,6 +67,8 @@ Whether to export the custom routes from the peer network. Defaults to `false`. In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `{{network}}/{{name}}` + * `state` - State for the peering, either `ACTIVE` or `INACTIVE`. The peering is `ACTIVE` when there's a matching configuration in the peer network. diff --git a/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown b/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown index ff43279935ce..8cd53fca302e 100644 --- a/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown +++ b/third_party/terraform/website/docs/r/compute_project_default_network_tier.html.markdown @@ -38,7 +38,9 @@ The following arguments are supported: ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{project}}` ## Timeouts diff --git a/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown b/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown index 3dbde26a07b4..b0f3adbb31ee 100644 --- a/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown +++ b/third_party/terraform/website/docs/r/compute_project_metadata.html.markdown @@ -44,7 +44,9 @@ The following arguments are supported: ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{project}}` ## Timeouts diff --git a/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown b/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown index b82d909e5521..37135fdd2d60 100644 --- a/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown +++ b/third_party/terraform/website/docs/r/compute_project_metadata_item.html.markdown @@ -38,7 +38,9 @@ The following arguments are supported: ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{key}}`` ## Import diff --git a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown index f6c9d453bb46..d37e0a0bb7b3 100644 --- a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown +++ b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown @@ -238,6 +238,8 @@ The `stateful_disk` block supports: (Include a `stateful_disk` block for each st In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `{{disk.name}}` + * `fingerprint` - The fingerprint of the instance group manager. * `instance_group` - The full URL of the instance group created by the manager. diff --git a/third_party/terraform/website/docs/r/compute_router_interface.html.markdown b/third_party/terraform/website/docs/r/compute_router_interface.html.markdown index e60baca81830..d9925792e7ae 100644 --- a/third_party/terraform/website/docs/r/compute_router_interface.html.markdown +++ b/third_party/terraform/website/docs/r/compute_router_interface.html.markdown @@ -63,7 +63,9 @@ or both. ## Attributes Reference -Only the arguments listed above are exposed as attributes. +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{region}}/{{router}}/{{name}}` ## Timeouts diff --git a/third_party/terraform/website/docs/r/compute_security_policy.html.markdown b/third_party/terraform/website/docs/r/compute_security_policy.html.markdown index 0e3f1e411e5e..fb47cd2dd9b3 100644 --- a/third_party/terraform/website/docs/r/compute_security_policy.html.markdown +++ b/third_party/terraform/website/docs/r/compute_security_policy.html.markdown @@ -111,6 +111,8 @@ The `expr` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/global/securityPolicies/{{name}}` + * `fingerprint` - Fingerprint of this resource. * `self_link` - The URI of the created resource. diff --git a/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown b/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown index 7efe3827eafe..6b4441a0604e 100644 --- a/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown +++ b/third_party/terraform/website/docs/r/compute_shared_vpc_host_project.html.markdown @@ -44,6 +44,12 @@ The following arguments are expected: * `project` - (Required) The ID of the project that will serve as a Shared VPC host project +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{project}}` + ## Timeouts This resource provides the following diff --git a/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown b/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown index 522c0d8a505b..2bbe46b2f30e 100644 --- a/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown +++ b/third_party/terraform/website/docs/r/compute_shared_vpc_service_project.html.markdown @@ -38,6 +38,12 @@ The following arguments are expected: * `service_project` - (Required) The ID of the project that will serve as a Shared VPC service project. +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{host_project}}/{{service_project}}` + ## Timeouts This resource provides the following diff --git a/third_party/terraform/website/docs/r/compute_target_pool.html.markdown b/third_party/terraform/website/docs/r/compute_target_pool.html.markdown index d1cbd844c9b0..d5bb492169ae 100644 --- a/third_party/terraform/website/docs/r/compute_target_pool.html.markdown +++ b/third_party/terraform/website/docs/r/compute_target_pool.html.markdown @@ -81,6 +81,8 @@ The following arguments are supported: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/regions/{{region}}/targetPools/{{name}}` + * `self_link` - The URI of the created resource. ## Timeouts diff --git a/third_party/terraform/website/docs/r/container_cluster.html.markdown b/third_party/terraform/website/docs/r/container_cluster.html.markdown index dca9dd75721a..255f81e41659 100644 --- a/third_party/terraform/website/docs/r/container_cluster.html.markdown +++ b/third_party/terraform/website/docs/r/container_cluster.html.markdown @@ -730,6 +730,8 @@ The `vertical_pod_autoscaling` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `projects/{{project}}/locations/{{zone}}/clusters/{{name}}` + * `endpoint` - The IP address of this cluster's Kubernetes master. * `instance_group_urls` - List of instance group URLs which have been assigned diff --git a/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/third_party/terraform/website/docs/r/container_node_pool.html.markdown index 7b569c8078e9..299783871f00 100644 --- a/third_party/terraform/website/docs/r/container_node_pool.html.markdown +++ b/third_party/terraform/website/docs/r/container_node_pool.html.markdown @@ -190,6 +190,8 @@ The `upgrade_settings` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `{{project}}/{{zone}}/{{cluster}}/{{name}}` + * `instance_group_urls` - The resource URLs of the managed instance groups associated with this node pool.