From 9d0e9edb8b1cdfe2557fa47403a90e666a82a675 Mon Sep 17 00:00:00 2001 From: Edward Sun Date: Mon, 18 May 2020 16:27:40 +0000 Subject: [PATCH 01/18] add ids to docs #5 --- .../r/compute_instance_from_template.html.markdown | 2 +- .../docs/r/compute_instance_group.html.markdown | 12 ++++++------ .../r/compute_instance_group_manager.html.markdown | 14 +++++++------- .../docs/r/compute_instance_template.html.markdown | 2 +- .../docs/r/compute_network_peering.html.markdown | 8 ++++---- ...ute_region_instance_group_manager.html.markdown | 14 +++++++------- .../website/docs/r/dns_record_set.html.markdown | 5 ++++- .../docs/r/google_kms_crypto_key_iam.html.markdown | 11 ++++++++--- .../docs/r/google_kms_key_ring_iam.html.markdown | 6 ++++++ ...gle_organization_iam_audit_config.html.markdown | 6 ++++++ .../google_organization_iam_binding.html.markdown | 2 ++ .../r/google_organization_iam_member.html.markdown | 2 ++ .../r/google_organization_iam_policy.html.markdown | 6 ++++++ .../r/google_organization_policy.html.markdown | 2 ++ .../website/docs/r/google_project.html.markdown | 2 ++ .../docs/r/google_project_iam.html.markdown | 6 ++++++ ...oogle_project_organization_policy.html.markdown | 2 ++ .../docs/r/google_project_service.html.markdown | 6 ++++++ .../docs/r/google_service_account.html.markdown | 2 ++ .../r/google_service_account_iam.html.markdown | 6 ++++++ .../r/google_service_account_key.html.markdown | 2 ++ .../r/service_networking_connection.html.markdown | 4 ++-- .../docs/r/sql_database_instance.html.markdown | 6 +++--- 23 files changed, 93 insertions(+), 35 deletions(-) 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 index 459e2e18e507..8e487842fab7 100644 --- 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 index 4407f62caeae..9751ebdde81f 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 @@ -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 index a3c6b3b51226..30cdd17dd902 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 @@ -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 } @@ -183,7 +183,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 @@ -194,7 +194,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 index d6318fad751c..52809504dbd8 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 @@ -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 index 36395fb3c07e..4c9285daa27f 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 @@ -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 index bdf7a4634f1c..3c8cac34363f 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 @@ -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 } @@ -188,7 +188,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 @@ -199,7 +199,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 index 9bf54bf116e9..3b2e1fa50bb7 100644 --- 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 index a5bf655a0cce..93a5422ed836 100644 --- 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 @@ -169,8 +169,13 @@ The `condition` block supports: ## Attributes Reference -In addition to the arguments listed above, the following computed attributes are -exported: +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource google_kms_crypto_key_iam_member with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}/roles/{{role}}/user:foo@example.com` + +* `id` - an identifier for the resource google_kms_crypto_key_iam_binding with format `projects/sunedward-1-autotest/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}/roles/{{role}}` + +* `id` - an identifier for the resource google_kms_crypto_key_iam_policy with format `projects/sunedward-1-autotest/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}` * `etag` - (Computed) The etag of the project's IAM policy. @@ -195,4 +200,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. \ No newline at end of file +as an argument so that Terraform uses the correct provider to import your resource. diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown index bed407fc272e..92a02720851e 100644 --- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown @@ -178,6 +178,12 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource google_kms_key_ring_iam_member with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}/user:foo@example.com` + +* `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` + +* `id` - an identifier for the resource google_kms_key_ring_iam_policy with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}` + * `etag` - (Computed) The etag of the key ring's IAM policy. ## Import diff --git a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown index 3dc2559f891b..0fa77a41505b 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown @@ -47,6 +47,12 @@ The `audit_log_config` block supports: * **group:{emailid}**: An email address that represents a Google group. For example, admins@example.com. * **domain:{domain}**: A G Suite domain (primary, instead of alias) name that represents all the users of that domain. For example, google.com or example.com. +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{organization}}/audit_config/{{service}}` + ## Import IAM audit config imports use the identifier of the resource in question and the service, e.g. diff --git a/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown index f00196b5b9b6..d962bcfac8be 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_binding.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 `{{organization}}/roles/{{role}}` + * `etag` - (Computed) The etag of the organization's IAM policy. ## Import diff --git a/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown index d88733f6633a..6e761365bf65 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown @@ -42,6 +42,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 `{{organization}}/roles/{{role}}/user:alice@gmail.com` + * `etag` - (Computed) The etag of the organization's IAM policy. ## Import diff --git a/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown index 1e658430d795..6b75fcbadd54 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown @@ -53,6 +53,12 @@ The following arguments are supported: the IAM policy that will be applied to the organization. This policy overrides any existing policy applied to the organization. +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are exported: + +* `id` - an identifier for the resource with format `{{organization}}` + ## Import ``` diff --git a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown index 784e3fc3cbf8..2b1ecb9f5d32 100644 --- a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown @@ -126,6 +126,8 @@ The `restore_policy` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource with format `{{organization}}/{{constraint}}` + * `etag` - (Computed) The etag of the organization policy. `etag` is used for optimistic concurrency control as a way to help prevent simultaneous updates of a policy from overwriting each other. * `update_time` - (Computed) The timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds, representing when the variable was last updated. Example: "2016-10-09T12:33:37.578138407Z". diff --git a/third_party/terraform/website/docs/r/google_project.html.markdown b/third_party/terraform/website/docs/r/google_project.html.markdown index 2fc93707cd54..7561d29f6e54 100644 --- 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 index 89ac8006ca71..2d96144f3229 100644 --- a/third_party/terraform/website/docs/r/google_project_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_iam.html.markdown @@ -207,6 +207,12 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource google_project_iam_member with format `projects/{{project}}/roles/{{role}}/user:foo@example.com` + +* `id` - an identifier for the resource google_project_iam_binding with format `projects/{{project}}//roles/{{role}}` + +* `id` - an identifier for the resource google_project_iam_policy with format `projects/{{project}}` + * `etag` - (Computed) The etag of the project's IAM policy. diff --git a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown index d211f132dc7e..6675b88892db 100644 --- a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown @@ -127,6 +127,8 @@ The `restore_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}}:constraints/{{constraint}}` + * `etag` - (Computed) The etag of the organization policy. `etag` is used for optimistic concurrency control as a way to help prevent simultaneous updates of a policy from overwriting each other. * `update_time` - (Computed) The timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds, representing when the variable was last updated. Example: "2016-10-09T12:33:37.578138407Z". 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 index 8180de1431b9..3e5a87774b2f 100644 --- 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 index 75efb5f5901a..abf4e3424b80 100644 --- 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_iam.html.markdown b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown index 8f87bd776ca7..cf943b17b89f 100644 --- a/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown @@ -175,6 +175,12 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: +* `id` - an identifier for the resource google_service_account_iam_policy with format `projects/{{project}}/serviceAccounts/{{email}}` + +* `id` - an identifier for the resource google_service_account_iam_binding with format `projects/{{project}}/serviceAccounts/{{email}}/roles/{{role}}` + +* `id` - an identifier for the resource google_service_account_iam_member with format `projects/{{project}}/serviceAccounts/{{email}}/roles/{{role}}/user:jane@example.com` + * `etag` - (Computed) The etag of the service account IAM policy. ## Import 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 index 17578bf5cce3..65613a513e61 100644 --- 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 index e201834c9315..bee2d2f3cfbf 100644 --- 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 index 726c9cd620fe..b2d0dc007601 100644 --- 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 } } } From 7fbb7f5fb685b0ad5262d7f15eba0cc5395e4868 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Tue, 19 May 2020 14:42:04 -0700 Subject: [PATCH 02/18] Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick --- .../website/docs/r/google_kms_key_ring_iam.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown index 92a02720851e..4170a4e4a253 100644 --- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown @@ -178,7 +178,7 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource google_kms_key_ring_iam_member with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}/user:foo@example.com` +* `id` - an identifier for the resource google_kms_key_ring_iam_member with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}/user:foo@example.com` * `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` From 6f5d1adf1385953fc9e817d1f7c0fe867a88ab88 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Tue, 19 May 2020 14:42:11 -0700 Subject: [PATCH 03/18] Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick --- .../website/docs/r/google_kms_key_ring_iam.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown index 4170a4e4a253..1bf0061f3963 100644 --- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown @@ -180,7 +180,7 @@ exported: * `id` - an identifier for the resource google_kms_key_ring_iam_member with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}/user:foo@example.com` -* `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` +* `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` * `id` - an identifier for the resource google_kms_key_ring_iam_policy with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}` From 3b03e3bcb7ba8275f4e8441459ebf242ae85fc9b Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Tue, 19 May 2020 14:42:19 -0700 Subject: [PATCH 04/18] Update third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown Co-authored-by: Sam Levenick --- .../website/docs/r/google_kms_key_ring_iam.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown index 1bf0061f3963..1cc0bc689236 100644 --- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown @@ -182,7 +182,7 @@ exported: * `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` -* `id` - an identifier for the resource google_kms_key_ring_iam_policy with format `projects/{{pproject}}/locations/{{location}}/keyRings/{{key-ring-name}}` +* `id` - an identifier for the resource google_kms_key_ring_iam_policy with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}` * `etag` - (Computed) The etag of the key ring's IAM policy. From 1f28ae2aa1136be81fcc2e3c9aba7fa99a2ae935 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Tue, 19 May 2020 14:42:30 -0700 Subject: [PATCH 05/18] Update third_party/terraform/website/docs/r/google_project_iam.html.markdown Co-authored-by: Sam Levenick --- .../terraform/website/docs/r/google_project_iam.html.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 2d96144f3229..d4112606edb1 100644 --- a/third_party/terraform/website/docs/r/google_project_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_iam.html.markdown @@ -209,7 +209,7 @@ exported: * `id` - an identifier for the resource google_project_iam_member with format `projects/{{project}}/roles/{{role}}/user:foo@example.com` -* `id` - an identifier for the resource google_project_iam_binding with format `projects/{{project}}//roles/{{role}}` +* `id` - an identifier for the resource google_project_iam_binding with format `projects/{{project}}/roles/{{role}}` * `id` - an identifier for the resource google_project_iam_policy with format `projects/{{project}}` @@ -244,4 +244,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`. - From 9bf99b9f8f42a971c6f2468c9c06bb96cab63860 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Tue, 19 May 2020 14:42:41 -0700 Subject: [PATCH 06/18] Update third_party/terraform/website/docs/r/google_project_service.html.markdown Co-authored-by: Sam Levenick --- .../website/docs/r/google_project_service.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 3e5a87774b2f..be377deea566 100644 --- a/third_party/terraform/website/docs/r/google_project_service.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_service.html.markdown @@ -42,7 +42,7 @@ If `false` or unset, an error will be generated if any enabled services depend o In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource with format `/{{project}}/{{service}}` +* `id` - an identifier for the resource with format `{{project}}/{{service}}` ## Import From 6e2faf616cf420c3706f8500e511550df45a13b2 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:36:31 -0700 Subject: [PATCH 07/18] Update google_kms_crypto_key_iam.html.markdown Remove ids from exported attributes for IAM resources --- .../website/docs/r/google_kms_crypto_key_iam.html.markdown | 6 ------ 1 file changed, 6 deletions(-) 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 index 93a5422ed836..fcda5f13aecb 100644 --- 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 @@ -171,12 +171,6 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource google_kms_crypto_key_iam_member with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}/roles/{{role}}/user:foo@example.com` - -* `id` - an identifier for the resource google_kms_crypto_key_iam_binding with format `projects/sunedward-1-autotest/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}/roles/{{role}}` - -* `id` - an identifier for the resource google_kms_crypto_key_iam_policy with format `projects/sunedward-1-autotest/locations/{{location}}/keyRings/{{key-ring-name}}/cryptoKeys/{{key-name}}` - * `etag` - (Computed) The etag of the project's IAM policy. ## Import From e391dbfe80377061755f30444e4a6c20157d7210 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:37:14 -0700 Subject: [PATCH 08/18] Update google_kms_key_ring_iam.html.markdown Remove ids from exported attributes for IAM resources --- .../website/docs/r/google_kms_key_ring_iam.html.markdown | 6 ------ 1 file changed, 6 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown index 1cc0bc689236..bed407fc272e 100644 --- a/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_kms_key_ring_iam.html.markdown @@ -178,12 +178,6 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource google_kms_key_ring_iam_member with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}/user:foo@example.com` - -* `id` - an identifier for the resource google_kms_key_ring_iam_binding with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}/roles/{{role}}` - -* `id` - an identifier for the resource google_kms_key_ring_iam_policy with format `projects/{{project}}/locations/{{location}}/keyRings/{{key-ring-name}}` - * `etag` - (Computed) The etag of the key ring's IAM policy. ## Import From 0c1906b027df3817e8e71ebf936244be93a35844 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:38:05 -0700 Subject: [PATCH 09/18] Update google_project_iam.html.markdown Remove ids from exported attributes for IAM resources --- .../website/docs/r/google_project_iam.html.markdown | 6 ------ 1 file changed, 6 deletions(-) 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 index d4112606edb1..b366e49d0f07 100644 --- a/third_party/terraform/website/docs/r/google_project_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_iam.html.markdown @@ -207,12 +207,6 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource google_project_iam_member with format `projects/{{project}}/roles/{{role}}/user:foo@example.com` - -* `id` - an identifier for the resource google_project_iam_binding with format `projects/{{project}}/roles/{{role}}` - -* `id` - an identifier for the resource google_project_iam_policy with format `projects/{{project}}` - * `etag` - (Computed) The etag of the project's IAM policy. From da1c0ed48623c267d6fc7d31a139ed91cd943246 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:38:55 -0700 Subject: [PATCH 10/18] Update google_service_account_iam.html.markdown Remove ids from exported attributes for IAM resources --- .../website/docs/r/google_service_account_iam.html.markdown | 6 ------ 1 file changed, 6 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown index cf943b17b89f..8f87bd776ca7 100644 --- a/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown +++ b/third_party/terraform/website/docs/r/google_service_account_iam.html.markdown @@ -175,12 +175,6 @@ The `condition` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource google_service_account_iam_policy with format `projects/{{project}}/serviceAccounts/{{email}}` - -* `id` - an identifier for the resource google_service_account_iam_binding with format `projects/{{project}}/serviceAccounts/{{email}}/roles/{{role}}` - -* `id` - an identifier for the resource google_service_account_iam_member with format `projects/{{project}}/serviceAccounts/{{email}}/roles/{{role}}/user:jane@example.com` - * `etag` - (Computed) The etag of the service account IAM policy. ## Import From 89c25f4a4c624aaa0b744c88578dc4d6eb504eee Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:42:34 -0700 Subject: [PATCH 11/18] Update google_organization_iam_audit_config.html.markdown Update the exported id from {{organization}} to {{org_id}} --- .../docs/r/google_organization_iam_audit_config.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown index 0fa77a41505b..ddb58d6dbeaa 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown @@ -51,7 +51,7 @@ The `audit_log_config` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource with format `{{organization}}/audit_config/{{service}}` +* `id` - an identifier for the resource with format `{{org_id}}/audit_config/{{service}}` ## Import IAM audit config imports use the identifier of the resource in question and the service, e.g. From 7afd8368c19eb8367f73a51429aadf7bc13a6586 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 10:49:44 -0700 Subject: [PATCH 12/18] Update google_kms_crypto_key_iam.html.markdown Updated line formatting --- .../website/docs/r/google_kms_crypto_key_iam.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index fcda5f13aecb..a233bea077d3 100644 --- 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 @@ -169,7 +169,8 @@ The `condition` block supports: ## Attributes Reference -In addition to the arguments listed above, the following computed attributes are exported: +In addition to the arguments listed above, the following computed attributes are +exported: * `etag` - (Computed) The etag of the project's IAM policy. From 3756f6399dfae79872516c7f2e9a1341caac08e5 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:01:19 -0700 Subject: [PATCH 13/18] Update google_organization_iam_member.html.markdown Remove the exported id for org related --- .../website/docs/r/google_organization_iam_member.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown index 6e761365bf65..d88733f6633a 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_member.html.markdown @@ -42,8 +42,6 @@ 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 `{{organization}}/roles/{{role}}/user:alice@gmail.com` - * `etag` - (Computed) The etag of the organization's IAM policy. ## Import From b50e81a60d1489c19fd3d27ce61c64cf22e3c1bc Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:02:36 -0700 Subject: [PATCH 14/18] Update google_organization_iam_audit_config.html.markdown Remove the exported id for org related --- .../r/google_organization_iam_audit_config.html.markdown | 6 ------ 1 file changed, 6 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown index ddb58d6dbeaa..3dc2559f891b 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_audit_config.html.markdown @@ -47,12 +47,6 @@ The `audit_log_config` block supports: * **group:{emailid}**: An email address that represents a Google group. For example, admins@example.com. * **domain:{domain}**: A G Suite domain (primary, instead of alias) name that represents all the users of that domain. For example, google.com or example.com. -## Attributes Reference - -In addition to the arguments listed above, the following computed attributes are exported: - -* `id` - an identifier for the resource with format `{{org_id}}/audit_config/{{service}}` - ## Import IAM audit config imports use the identifier of the resource in question and the service, e.g. From 6ca6abf8cfc38f9e6c6651da9a8099432c05f282 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:03:14 -0700 Subject: [PATCH 15/18] Update google_organization_iam_binding.html.markdown Remove exported id --- .../docs/r/google_organization_iam_binding.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown index d962bcfac8be..f00196b5b9b6 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_binding.html.markdown @@ -50,8 +50,6 @@ 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 `{{organization}}/roles/{{role}}` - * `etag` - (Computed) The etag of the organization's IAM policy. ## Import From 0cbe6fb61cffb6ef3f10a4c00caf2251a91d4678 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:03:54 -0700 Subject: [PATCH 16/18] Update google_organization_iam_policy.html.markdown Removed exported id --- .../docs/r/google_organization_iam_policy.html.markdown | 6 ------ 1 file changed, 6 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown b/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown index 6b75fcbadd54..1e658430d795 100644 --- a/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_iam_policy.html.markdown @@ -53,12 +53,6 @@ The following arguments are supported: the IAM policy that will be applied to the organization. This policy overrides any existing policy applied to the organization. -## Attributes Reference - -In addition to the arguments listed above, the following computed attributes are exported: - -* `id` - an identifier for the resource with format `{{organization}}` - ## Import ``` From 5e12e479784c5f5dc851ad9de567387cf6067865 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:04:44 -0700 Subject: [PATCH 17/18] Update google_organization_policy.html.markdown Removed exported id --- .../website/docs/r/google_organization_policy.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown index 2b1ecb9f5d32..784e3fc3cbf8 100644 --- a/third_party/terraform/website/docs/r/google_organization_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_organization_policy.html.markdown @@ -126,8 +126,6 @@ The `restore_policy` block supports: In addition to the arguments listed above, the following computed attributes are exported: -* `id` - an identifier for the resource with format `{{organization}}/{{constraint}}` - * `etag` - (Computed) The etag of the organization policy. `etag` is used for optimistic concurrency control as a way to help prevent simultaneous updates of a policy from overwriting each other. * `update_time` - (Computed) The timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds, representing when the variable was last updated. Example: "2016-10-09T12:33:37.578138407Z". From 445e2ade6845d6eb70891a2b1f778a285fed0018 Mon Sep 17 00:00:00 2001 From: Edward Sun <42220489+edwardmedia@users.noreply.github.com> Date: Wed, 20 May 2020 12:10:52 -0700 Subject: [PATCH 18/18] Update google_project_organization_policy.html.markdown Removed the exported id --- .../docs/r/google_project_organization_policy.html.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown index 6675b88892db..d211f132dc7e 100644 --- a/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown +++ b/third_party/terraform/website/docs/r/google_project_organization_policy.html.markdown @@ -127,8 +127,6 @@ The `restore_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}}:constraints/{{constraint}}` - * `etag` - (Computed) The etag of the organization policy. `etag` is used for optimistic concurrency control as a way to help prevent simultaneous updates of a policy from overwriting each other. * `update_time` - (Computed) The timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds, representing when the variable was last updated. Example: "2016-10-09T12:33:37.578138407Z".