Add ids GoogleCloudPlatform#1 in manual docs (part 4 of GoogleCloudPl…

…atform#5542) (GoogleCloudPlatform#3489)
nathkn · May 18, 2020 · c18009f · c18009f
1 parent 52c2022
commit c18009f
Show file tree

Hide file tree

Showing 55 changed files with 195 additions and 147 deletions.
diff --git 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
@@ -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"]
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -22,16 +22,16 @@ 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" {
   region      = "us-central1"
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }