add id and replace self_link in docs (part 5 of GoogleCloudPlatform#5542) (GoogleCloudPlatform#3535)

edwardmedia · Edward Sun · slevenick · web-flow · commit 260505024685 · 2020-05-20T15:48:20.000-07:00
* add ids to docs #5 * Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick <slevenick@google.com> * Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick <slevenick@google.com> * Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick <slevenick@google.com> * Update third_party/terraform/website/docs/r/google_project_iam.html.markdown Co-authored-by: Sam Levenick <slevenick@google.com> * Update third_party/terraform/website/docs/r/google_project_service.html.markdown Co-authored-by: Sam Levenick <slevenick@google.com> * Update google_kms_crypto_key_iam.html.markdown Remove ids from exported attributes for IAM resources * Update google_kms_key_ring_iam.html.markdown Remove ids from exported attributes for IAM resources * Update google_project_iam.html.markdown Remove ids from exported attributes for IAM resources * Update google_service_account_iam.html.markdown Remove ids from exported attributes for IAM resources * Update google_organization_iam_audit_config.html.markdown Update the exported id from {{organization}} to {{org_id}} * Update google_kms_crypto_key_iam.html.markdown Updated line formatting * Update google_organization_iam_member.html.markdown Remove the exported id for org related * Update google_organization_iam_audit_config.html.markdown Remove the exported id for org related * Update google_organization_iam_binding.html.markdown Remove exported id * Update google_organization_iam_policy.html.markdown Removed exported id * Update google_organization_policy.html.markdown Removed exported id * Update google_project_organization_policy.html.markdown Removed the exported id Co-authored-by: Edward Sun <sunedward@google.com> Co-authored-by: Sam Levenick <slevenick@google.com>
diff --git a/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown b/third_party/terraform/website/docs/r/compute_instance_from_template.html.markdown
@@ -48,7 +48,7 @@ resource "google_compute_instance_from_template" "tpl" {
   name = "instance-from-template"
   zone = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.tpl.self_link
+  source_instance_template = google_compute_instance_template.tpl.id
 
   // Override fields from instance template
   can_ip_forward = false
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
@@ -24,7 +24,7 @@ resource "google_compute_instance_group" "test" {
   name        = "terraform-test"
   description = "Terraform test instance group"
   zone        = "us-central1-a"
-  network     = google_compute_network.default.self_link
+  network     = google_compute_network.default.id
 }
 ```
 
@@ -36,8 +36,8 @@ resource "google_compute_instance_group" "webservers" {
   description = "Terraform test instance group"
 
   instances = [
-    google_compute_instance.test.self_link,
-    google_compute_instance.test2.self_link,
+    google_compute_instance.test.id,
+    google_compute_instance.test2.id,
   ]
 
   named_port {
@@ -63,7 +63,7 @@ as shown in this example to avoid this type of error.
 resource "google_compute_instance_group" "staging_group" {
   name      = "staging-instance-group"
   zone      = "us-central1-c"
-  instances = [google_compute_instance.staging_vm.self_link]
+  instances = [google_compute_instance.staging_vm.id]
   named_port {
     name = "http"
     port = "8080"
@@ -105,11 +105,11 @@ resource "google_compute_backend_service" "staging_service" {
   protocol  = "HTTPS"
 
   backend {
-    group = google_compute_instance_group.staging_group.self_link
+    group = google_compute_instance_group.staging_group.id
   }
 
   health_checks = [
-    google_compute_https_health_check.staging_health.self_link,
+    google_compute_https_health_check.staging_health.id,
   ]
 }
 
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
@@ -39,10 +39,10 @@ resource "google_compute_instance_group_manager" "appserver" {
   zone               = "us-central1-a"
 
   version {
-    instance_template  = google_compute_instance_template.appserver.self_link
+    instance_template  = google_compute_instance_template.appserver.id
   }
 
-  target_pools = [google_compute_target_pool.appserver.self_link]
+  target_pools = [google_compute_target_pool.appserver.id]
   target_size  = 2
 
   named_port {
@@ -51,7 +51,7 @@ resource "google_compute_instance_group_manager" "appserver" {
   }
 
   auto_healing_policies {
-    health_check      = google_compute_health_check.autohealing.self_link
+    health_check      = google_compute_health_check.autohealing.id
     initial_delay_sec = 300
   }
 }
@@ -70,12 +70,12 @@ resource "google_compute_instance_group_manager" "appserver" {
 
   version {
     name              = "appserver"
-    instance_template = google_compute_instance_template.appserver.self_link
+    instance_template = google_compute_instance_template.appserver.id
   }
 
   version {
     name              = "appserver-canary"
-    instance_template = google_compute_instance_template.appserver-canary.self_link
+    instance_template = google_compute_instance_template.appserver-canary.id
     target_size {
       fixed = 1
     }
@@ -186,7 +186,7 @@ The `version` block supports:
 ```hcl
 version {
   name              = "appserver-canary"
-  instance_template = google_compute_instance_template.appserver-canary.self_link
+  instance_template = google_compute_instance_template.appserver-canary.id
 
   target_size {
     fixed = 1
@@ -197,7 +197,7 @@ version {
 ```hcl
 version {
   name              = "appserver-canary"
-  instance_template = google_compute_instance_template.appserver-canary.self_link
+  instance_template = google_compute_instance_template.appserver-canary.id
 
   target_size {
     percent = 20
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
@@ -112,7 +112,7 @@ resource "google_compute_instance_template" "instance_template" {
 
 resource "google_compute_instance_group_manager" "instance_group_manager" {
   name               = "instance-group-manager"
-  instance_template  = google_compute_instance_template.instance_template.self_link
+  instance_template  = google_compute_instance_template.instance_template.id
   base_instance_name = "instance-group-manager"
   zone               = "us-central1-f"
   target_size        = "1"
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
@@ -24,14 +24,14 @@ to be functional.
 ```hcl
 resource "google_compute_network_peering" "peering1" {
   name         = "peering1"
-  network      = google_compute_network.default.self_link
-  peer_network = google_compute_network.other.self_link
+  network      = google_compute_network.default.id
+  peer_network = google_compute_network.other.id
 }
 
 resource "google_compute_network_peering" "peering2" {
   name         = "peering2"
-  network      = google_compute_network.other.self_link
-  peer_network = google_compute_network.default.self_link
+  network      = google_compute_network.other.id
+  peer_network = google_compute_network.default.id
 }
 
 resource "google_compute_network" "default" {
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
@@ -40,10 +40,10 @@ resource "google_compute_region_instance_group_manager" "appserver" {
   distribution_policy_zones  = ["us-central1-a", "us-central1-f"]
 
   version {
-    instance_template = google_compute_instance_template.appserver.self_link
+    instance_template = google_compute_instance_template.appserver.id
   }
 
-  target_pools = [google_compute_target_pool.appserver.self_link]
+  target_pools = [google_compute_target_pool.appserver.id]
   target_size  = 2
 
   named_port {
@@ -52,7 +52,7 @@ resource "google_compute_region_instance_group_manager" "appserver" {
   }
 
   auto_healing_policies {
-    health_check      = google_compute_health_check.autohealing.self_link
+    health_check      = google_compute_health_check.autohealing.id
     initial_delay_sec = 300
   }
 }
@@ -69,11 +69,11 @@ resource "google_compute_region_instance_group_manager" "appserver" {
   target_size = 5
 
   version {
-    instance_template = google_compute_instance_template.appserver.self_link
+    instance_template = google_compute_instance_template.appserver.id
   }
 
   version {
-    instance_template = google_compute_instance_template.appserver-canary.self_link
+    instance_template = google_compute_instance_template.appserver-canary.id
     target_size {
       fixed = 1
     }
@@ -191,7 +191,7 @@ The `version` block supports:
 ```hcl
 version {
   name              = "appserver-canary"
-  instance_template = google_compute_instance_template.appserver-canary.self_link
+  instance_template = google_compute_instance_template.appserver-canary.id
 
   target_size {
     fixed = 1
@@ -202,7 +202,7 @@ version {
 ```hcl
 version {
   name              = "appserver-canary"
-  instance_template = google_compute_instance_template.appserver-canary.self_link
+  instance_template = google_compute_instance_template.appserver-canary.id
 
   target_size {
     percent = 20
diff --git a/third_party/terraform/website/docs/r/dns_record_set.html.markdown b/third_party/terraform/website/docs/r/dns_record_set.html.markdown
@@ -157,7 +157,10 @@ 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}}/{{zone}}/{{name}}/{{type}}`
 
 ## Import
 
diff --git a/third_party/terraform/website/docs/r/google_kms_crypto_key_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_crypto_key_iam.html.markdown
@@ -198,4 +198,4 @@ $ terraform import google_kms_crypto_key_iam_policy.crypto_key your-project-id/l
 ```
 
 -> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
-as an argument so that Terraform uses the correct provider to import your resource.
+as an argument so that Terraform uses the correct provider to import your resource.
diff --git a/third_party/terraform/website/docs/r/google_project.html.markdown b/third_party/terraform/website/docs/r/google_project.html.markdown
@@ -104,6 +104,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}}`
+
 * `number` - The numeric identifier of the project.
 
 ## Import
diff --git a/third_party/terraform/website/docs/r/google_project_iam.html.markdown b/third_party/terraform/website/docs/r/google_project_iam.html.markdown
@@ -242,4 +242,3 @@ terraform import google_project_iam_audit_config.my_project "your-project-id foo
 
 -> **Custom Roles**: If you're importing a IAM resource with a custom role, make sure to use the
  full name of the custom role, e.g. `[projects/my-project|organizations/my-org]/roles/my-custom-role`.
-
diff --git a/third_party/terraform/website/docs/r/google_project_service.html.markdown b/third_party/terraform/website/docs/r/google_project_service.html.markdown
@@ -38,6 +38,12 @@ If `false` or unset, an error will be generated if any enabled services depend o
 
 * `disable_on_destroy` - (Optional) If true, disable the service when the terraform resource is destroyed.  Defaults to true.  May be useful in the event that a project is long-lived but the infrastructure running in that project changes frequently.
 
+## Attributes Reference
+
+In addition to the arguments listed above, the following computed attributes are exported:
+
+* `id` - an identifier for the resource with format `{{project}}/{{service}}`
+
 ## Import
 
 Project services can be imported using the `project_id` and `service`, e.g.
diff --git a/third_party/terraform/website/docs/r/google_service_account.html.markdown b/third_party/terraform/website/docs/r/google_service_account.html.markdown
@@ -50,6 +50,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}}/serviceAccounts/{{email}}`
+
 * `email` - The e-mail address of the service account. This value
     should be referenced from any `google_iam_policy` data sources
     that would grant the service account privileges.
diff --git a/third_party/terraform/website/docs/r/google_service_account_key.html.markdown b/third_party/terraform/website/docs/r/google_service_account_key.html.markdown
@@ -69,6 +69,8 @@ Valid values are listed at
 
 The following attributes are exported in addition to the arguments listed above:
 
+* `id` - an identifier for the resource with format `projects/{{project}}/serviceAccounts/{{account}}/keys/{{key}}`
+
 * `name` - The name used for this key pair
 
 * `public_key` - The public key, base64 encoded
diff --git a/third_party/terraform/website/docs/r/service_networking_connection.html.markdown b/third_party/terraform/website/docs/r/service_networking_connection.html.markdown
@@ -26,11 +26,11 @@ resource "google_compute_global_address" "private_ip_alloc" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = google_compute_network.peering_network.self_link
+  network       = google_compute_network.peering_network.id
 }
 
 resource "google_service_networking_connection" "foobar" {
-  network                 = google_compute_network.peering_network.self_link
+  network                 = google_compute_network.peering_network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
 }
diff --git a/third_party/terraform/website/docs/r/sql_database_instance.html.markdown b/third_party/terraform/website/docs/r/sql_database_instance.html.markdown
@@ -138,13 +138,13 @@ resource "google_compute_global_address" "private_ip_address" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = google_compute_network.private_network.self_link
+  network       = google_compute_network.private_network.id
 }
 
 resource "google_service_networking_connection" "private_vpc_connection" {
   provider = google-beta
 
-  network                 = google_compute_network.private_network.self_link
+  network                 = google_compute_network.private_network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_address.name]
 }
@@ -165,7 +165,7 @@ resource "google_sql_database_instance" "instance" {
     tier = "db-f1-micro"
     ip_configuration {
       ipv4_enabled    = false
-      private_network = google_compute_network.private_network.self_link
+      private_network = google_compute_network.private_network.id
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -242,4 +242,3 @@ terraform import google_project_iam_audit_config.my_project "your-project-id foo`
`242`	`242`
`243`	`243`	`-> Custom Roles: If you're importing a IAM resource with a custom role, make sure to use the`
`244`	`244`	full name of the custom role, e.g. `[projects/my-project\|organizations/my-org]/roles/my-custom-role`.
`245`		`-`