fixed ids for #5542 (#3205) (#5915)

* fixed ids for #5542 * fixed ids for #5542 and replacing self_links * fixed ids for #5542 * Update datasource_google_compute_backend_service.html.markdown (forcing update to build) * Updated id value Co-authored-by: edward <[email protected]> Co-authored-by: emily <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: edward <[email protected]> Co-authored-by: emily <[email protected]>
hashicorp · Mar 18, 2020 · 1d84144 · 1d84144
1 parent cfb63ee
commit 1d84144
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 36 deletions.
diff --git a/.changelog/3205.txt b/.changelog/3205.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/resource_compute_address_generated_test.go b/google/resource_compute_address_generated_test.go
@@ -90,12 +90,12 @@ resource "google_compute_subnetwork" "default" {
   name          = "tf-test-my-subnet%{random_suffix}"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
-  network       = google_compute_network.default.self_link
+  network       = google_compute_network.default.id
 }
 
 resource "google_compute_address" "internal_with_subnet_and_address" {
   name         = "tf-test-my-internal-address%{random_suffix}"
-  subnetwork   = google_compute_subnetwork.default.self_link
+  subnetwork   = google_compute_subnetwork.default.id
   address_type = "INTERNAL"
   address      = "10.0.42.42"
   region       = "us-central1"
@@ -179,7 +179,7 @@ resource "google_compute_instance" "instance_with_ip" {
 
   boot_disk {
     initialize_params {
-      image = data.google_compute_image.debian_image.self_link
+      image = data.google_compute_image.debian_image.id
     }
   }
 

diff --git a/google/resource_compute_autoscaler_generated_test.go b/google/resource_compute_autoscaler_generated_test.go
@@ -53,7 +53,7 @@ func testAccComputeAutoscaler_autoscalerBasicExample(context map[string]interfac
 resource "google_compute_autoscaler" "foobar" {
   name   = "tf-test-my-autoscaler%{random_suffix}"
   zone   = "us-central1-f"
-  target = google_compute_instance_group_manager.foobar.self_link
+  target = google_compute_instance_group_manager.foobar.id
 
   autoscaling_policy {
     max_replicas    = 5
@@ -74,7 +74,7 @@ resource "google_compute_instance_template" "foobar" {
   tags = ["foo", "bar"]
 
   disk {
-    source_image = data.google_compute_image.debian_9.self_link
+    source_image = data.google_compute_image.debian_9.id
   }
 
   network_interface {
@@ -99,11 +99,11 @@ resource "google_compute_instance_group_manager" "foobar" {
   zone = "us-central1-f"
 
   version {
-    instance_template  = google_compute_instance_template.foobar.self_link
+    instance_template  = google_compute_instance_template.foobar.id
     name               = "primary"
   }
 
-  target_pools       = [google_compute_target_pool.foobar.self_link]
+  target_pools       = [google_compute_target_pool.foobar.id]
   base_instance_name = "foobar"
 }
 

diff --git a/google/resource_compute_region_autoscaler_generated_test.go b/google/resource_compute_region_autoscaler_generated_test.go
@@ -53,7 +53,7 @@ func testAccComputeRegionAutoscaler_regionAutoscalerBasicExample(context map[str
 resource "google_compute_region_autoscaler" "foobar" {
   name   = "tf-test-my-region-autoscaler%{random_suffix}"
   region = "us-central1"
-  target = google_compute_region_instance_group_manager.foobar.self_link
+  target = google_compute_region_instance_group_manager.foobar.id
 
   autoscaling_policy {
     max_replicas    = 5
@@ -74,7 +74,7 @@ resource "google_compute_instance_template" "foobar" {
   tags = ["foo", "bar"]
 
   disk {
-    source_image = data.google_compute_image.debian_9.self_link
+    source_image = data.google_compute_image.debian_9.id
   }
 
   network_interface {
@@ -99,11 +99,11 @@ resource "google_compute_region_instance_group_manager" "foobar" {
   region = "us-central1"
 
   version {
-    instance_template  = google_compute_instance_template.foobar.self_link
+    instance_template  = google_compute_instance_template.foobar.id
     name               = "primary"
   }
 
-  target_pools       = [google_compute_target_pool.foobar.self_link]
+  target_pools       = [google_compute_target_pool.foobar.id]
   base_instance_name = "foobar"
 }
 

diff --git a/website/docs/d/datasource_google_compute_backend_service.html.markdown b/website/docs/d/datasource_google_compute_backend_service.html.markdown
@@ -48,6 +48,8 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `fingerprint` - The fingerprint of the Backend Service.
 
+* `id` - an identifier for the resource with format `projects/{{project}}/global/backendServices/{{name}}`
+
 * `port_name` - The name of a service that has been added to an instance group in this backend.
 
 * `protocol` - The protocol for incoming requests.

diff --git a/website/docs/r/binary_authorization_attestor.html.markdown b/website/docs/r/binary_authorization_attestor.html.markdown
@@ -95,7 +95,7 @@ resource "google_binary_authorization_attestor" "attestor" {
 }
 
 data "google_kms_crypto_key_version" "version" {
-  crypto_key = google_kms_crypto_key.crypto-key.self_link
+  crypto_key = google_kms_crypto_key.crypto-key.id
 }
 
 resource "google_container_analysis_note" "note" {
@@ -109,7 +109,7 @@ resource "google_container_analysis_note" "note" {
 
 resource "google_kms_crypto_key" "crypto-key" {
   name     = "test-attestor-key"
-  key_ring = google_kms_key_ring.keyring.self_link
+  key_ring = google_kms_key_ring.keyring.id
   purpose  = "ASYMMETRIC_SIGN"
 
   version_template {

diff --git a/website/docs/r/cloudfunctions_function.html.markdown b/website/docs/r/cloudfunctions_function.html.markdown
@@ -168,6 +168,8 @@ The `source_repository` block supports:
 In addition to the arguments listed above, the following computed attributes are
 exported:
 
+* `id` - an identifier for the resource with format `{{name}}`
+
 * `https_trigger_url` - URL which triggers function execution. Returned only if `trigger_http` is used.
 
 * `source_repository.0.deployed_url` - The URL pointing to the hosted repository where the function was defined at the time of deployment.

diff --git a/website/docs/r/cloudiot_registry.html.markdown b/website/docs/r/cloudiot_registry.html.markdown
@@ -110,7 +110,9 @@ The `public_key_certificate` block supports:
 
 ## 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}}/locations/{{region}}/registries/{{name}}`
 
 ## Import
 

diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
@@ -50,7 +50,7 @@ on the IAM policy binding (see `google_project_iam_member` below).
 
 ```hcl
 resource "google_composer_environment" "test" {
-  name   = "%s"
+  name   = "mycomposer"
   region = "us-central1"
   config {
     node_count = 4
@@ -59,8 +59,8 @@ resource "google_composer_environment" "test" {
       zone         = "us-central1-a"
       machine_type = "n1-standard-1"
 
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
+      network    = google_compute_network.test.id
+      subnetwork = google_compute_subnetwork.test.id
 
       service_account = google_service_account.test.name
     }
@@ -78,7 +78,7 @@ resource "google_compute_subnetwork" "test" {
   name          = "composer-test-subnetwork"
   ip_cidr_range = "10.2.0.0/16"
   region        = "us-central1"
-  network       = google_compute_network.test.self_link
+  network       = google_compute_network.test.id
 }
 
 resource "google_service_account" "test" {
@@ -95,7 +95,7 @@ resource "google_project_iam_member" "composer-worker" {
 ### With Software (Airflow) Config
 ```hcl
 resource "google_composer_environment" "test" {
-  name   = "%s"
+  name   = "mycomposer"
   region = "us-central1"
 
   config {
@@ -345,6 +345,8 @@ The `ip_allocation_policy` 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/{{region}}/environments/{{name}}`
+
 * `config.0.gke_cluster` -
   The Kubernetes Engine cluster used to run this environment.
 

diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown
@@ -74,12 +74,12 @@ resource "google_compute_subnetwork" "default" {
   name          = "my-subnet"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
-  network       = google_compute_network.default.self_link
+  network       = google_compute_network.default.id
 }
 
 resource "google_compute_address" "internal_with_subnet_and_address" {
   name         = "my-internal-address"
-  subnetwork   = google_compute_subnetwork.default.self_link
+  subnetwork   = google_compute_subnetwork.default.id
   address_type = "INTERNAL"
   address      = "10.0.42.42"
   region       = "us-central1"
@@ -125,7 +125,7 @@ resource "google_compute_instance" "instance_with_ip" {
 
   boot_disk {
     initialize_params {
-      image = data.google_compute_image.debian_image.self_link
+      image = data.google_compute_image.debian_image.id
     }
   }
 

diff --git a/website/docs/r/compute_attached_disk.html.markdown b/website/docs/r/compute_attached_disk.html.markdown
@@ -28,8 +28,8 @@ To get more information about attaching disks, see:
 ## Example Usage
 ```hcl
 resource "google_compute_attached_disk" "default" {
-  disk     = google_compute_disk.default.self_link
-  instance = google_compute_instance.default.self_link
+  disk     = google_compute_disk.default.id
+  instance = google_compute_instance.default.id
 }
 
 resource "google_compute_instance" "default" {
@@ -104,6 +104,12 @@ The following arguments are supported:
 	  "READ_ONLY"
 	  "READ_WRITE"
 
+## Attributes Reference
+
+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}}/disks/{{disk.name}}`
+
 ## Timeouts
 
 This resource provides the following

diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown
@@ -49,7 +49,7 @@ resource "google_compute_autoscaler" "default" {
 
   name   = "my-autoscaler"
   zone   = "us-central1-f"
-  target = google_compute_instance_group_manager.default.self_link
+  target = google_compute_instance_group_manager.default.id
 
   autoscaling_policy {
     max_replicas    = 5
@@ -74,7 +74,7 @@ resource "google_compute_instance_template" "default" {
   tags = ["foo", "bar"]
 
   disk {
-    source_image = data.google_compute_image.debian_9.self_link
+    source_image = data.google_compute_image.debian_9.id
   }
 
   network_interface {
@@ -103,11 +103,11 @@ resource "google_compute_instance_group_manager" "default" {
   zone = "us-central1-f"
 
   version {
-    instance_template = google_compute_instance_template.default.self_link
+    instance_template = google_compute_instance_template.default.id
     name              = "primary"
   }
 
-  target_pools       = [google_compute_target_pool.default.self_link]
+  target_pools       = [google_compute_target_pool.default.id]
   base_instance_name = "autoscaler-sample"
 }
 
@@ -135,7 +135,7 @@ provider "google-beta" {
 resource "google_compute_autoscaler" "foobar" {
   name   = "my-autoscaler"
   zone   = "us-central1-f"
-  target = google_compute_instance_group_manager.foobar.self_link
+  target = google_compute_instance_group_manager.foobar.id
 
   autoscaling_policy {
     max_replicas    = 5
@@ -156,7 +156,7 @@ resource "google_compute_instance_template" "foobar" {
   tags = ["foo", "bar"]
 
   disk {
-    source_image = data.google_compute_image.debian_9.self_link
+    source_image = data.google_compute_image.debian_9.id
   }
 
   network_interface {
@@ -181,11 +181,11 @@ resource "google_compute_instance_group_manager" "foobar" {
   zone = "us-central1-f"
 
   version {
-    instance_template  = google_compute_instance_template.foobar.self_link
+    instance_template  = google_compute_instance_template.foobar.id
     name               = "primary"
   }
 
-  target_pools       = [google_compute_target_pool.foobar.self_link]
+  target_pools       = [google_compute_target_pool.foobar.id]
   base_instance_name = "foobar"
 }
 

diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown
@@ -47,7 +47,7 @@ To get more information about RegionAutoscaler, see:
 resource "google_compute_region_autoscaler" "foobar" {
   name   = "my-region-autoscaler"
   region = "us-central1"
-  target = google_compute_region_instance_group_manager.foobar.self_link
+  target = google_compute_region_instance_group_manager.foobar.id
 
   autoscaling_policy {
     max_replicas    = 5
@@ -68,7 +68,7 @@ resource "google_compute_instance_template" "foobar" {
   tags = ["foo", "bar"]
 
   disk {
-    source_image = data.google_compute_image.debian_9.self_link
+    source_image = data.google_compute_image.debian_9.id
   }
 
   network_interface {
@@ -93,11 +93,11 @@ resource "google_compute_region_instance_group_manager" "foobar" {
   region = "us-central1"
 
   version {
-    instance_template  = google_compute_instance_template.foobar.self_link
+    instance_template  = google_compute_instance_template.foobar.id
     name               = "primary"
   }
 
-  target_pools       = [google_compute_target_pool.foobar.self_link]
+  target_pools       = [google_compute_target_pool.foobar.id]
   base_instance_name = "foobar"
 }