Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ids #1 in manual docs (part 4 of #5542) #3489

Merged
merged 28 commits into from
May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
abbbd7b
fixing https://github.com/terraform-providers/terraform-provider-goog…
Feb 19, 2020
376db9f
fixed ids for #5542
Mar 3, 2020
859c989
fixed ids for #5542 and replacing self_links
Mar 3, 2020
bc91dfe
fixed ids for #5542
Mar 3, 2020
7badfe8
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Mar 11, 2020
cf52467
Update datasource_google_compute_backend_service.html.markdown
emilymye Mar 17, 2020
4a405a4
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Mar 17, 2020
6987306
Merge branch '5542' of github.com:edwardmedia/magic-modules
Mar 17, 2020
467dd95
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Mar 17, 2020
6c2fb52
Merge remote-tracking branch 'upstream/master'
Mar 18, 2020
a1ef181
resolve conflict
Mar 18, 2020
c88fd20
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Mar 19, 2020
d436046
fixed an example
Mar 19, 2020
86cceea
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Apr 8, 2020
f022166
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Apr 14, 2020
ebfcf1e
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
Apr 29, 2020
ec6ccca
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 1, 2020
f3c97db
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 2, 2020
19fa28b
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 3, 2020
4687d13
replaced self_link 1
May 4, 2020
2e0b2bd
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 6, 2020
4adff35
Fixed selk_links
May 6, 2020
0f4b15f
Fixed selk_links
May 6, 2020
7cac49e
Merge branch 'replace-self_link2' of github.com:edwardmedia/magic-mod…
May 6, 2020
d3ce192
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 7, 2020
22ac377
Replace self_link (part 3 of #5542)
May 7, 2020
1929567
Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…
May 8, 2020
b5fb3bc
add ids for manual docs (part 4 of #5542)
May 8, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/terraform/examples/bigquery_dataset_cmek.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
8 changes: 4 additions & 4 deletions templates/terraform/examples/bigquery_job_copy.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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" {
Expand Down Expand Up @@ -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"]
}
}
12 changes: 6 additions & 6 deletions templates/terraform/examples/global_forwarding_rule_http.tf.erb
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
resource "google_compute_global_forwarding_rule" "default" {
name = "<%= ctx[:vars]['forwarding_rule_name'] %>"
target = google_compute_target_http_proxy.default.self_link
target = google_compute_target_http_proxy.default.id
port_range = "80"
}

resource "google_compute_target_http_proxy" "default" {
name = "<%= ctx[:vars]['http_proxy_name'] %>"
description = "a description"
url_map = google_compute_url_map.default.self_link
url_map = google_compute_url_map.default.id
}

resource "google_compute_url_map" "default" {
name = "url-map-<%= ctx[:vars]['http_proxy_name'] %>"
description = "a description"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

host_rule {
hosts = ["mysite.com"]
Expand All @@ -22,11 +22,11 @@ resource "google_compute_url_map" "default" {

path_matcher {
name = "allpaths"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

path_rule {
paths = ["/*"]
service = google_compute_backend_service.default.self_link
service = google_compute_backend_service.default.id
}
}
}
Expand All @@ -37,7 +37,7 @@ resource "google_compute_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10

health_checks = [google_compute_http_health_check.default.self_link]
health_checks = [google_compute_http_health_check.default.id]
}

resource "google_compute_http_health_check" "default" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "google_compute_global_forwarding_rule" "default" {
provider = google-beta
name = "<%= ctx[:vars]['forwarding_rule_name'] %>"
target = google_compute_target_http_proxy.default.self_link
target = google_compute_target_http_proxy.default.id
port_range = "80"
load_balancing_scheme = "INTERNAL_SELF_MANAGED"
ip_address = "0.0.0.0"
Expand All @@ -18,14 +18,14 @@ resource "google_compute_target_http_proxy" "default" {
provider = google-beta
name = "<%= ctx[:vars]['http_proxy_name'] %>"
description = "a description"
url_map = google_compute_url_map.default.self_link
url_map = google_compute_url_map.default.id
}

resource "google_compute_url_map" "default" {
provider = google-beta
name = "url-map-<%= ctx[:vars]['http_proxy_name'] %>"
description = "a description"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

host_rule {
hosts = ["mysite.com"]
Expand All @@ -34,11 +34,11 @@ resource "google_compute_url_map" "default" {

path_matcher {
name = "allpaths"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

path_rule {
paths = ["/*"]
service = google_compute_backend_service.default.self_link
service = google_compute_backend_service.default.id
}
}
}
Expand All @@ -58,7 +58,7 @@ resource "google_compute_backend_service" "default" {
max_rate_per_instance = 50
}

health_checks = [google_compute_health_check.default.self_link]
health_checks = [google_compute_health_check.default.id]
}

data "google_compute_image" "debian_image" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "google_compute_global_network_endpoint" "<%= ctx[:primary_resource_id]

resource "google_compute_global_network_endpoint_group" "group" {
name = "<%= ctx[:vars]['neg_name'] %>"
network = google_compute_network.default.self_link
network = google_compute_network.default.id
default_port = "90"
}

Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/examples/ha_vpn_gateway_basic.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ resource "google_compute_ha_vpn_gateway" "ha_gateway1" {
provider = google-beta
region = "us-central1"
name = "<%= ctx[:vars]['ha_vpn_gateway1_name'] %>"
network = google_compute_network.network1.self_link
network = google_compute_network.network1.id
}

resource "google_compute_network" "network1" {
Expand Down
36 changes: 18 additions & 18 deletions templates/terraform/examples/ha_vpn_gateway_gcp_to_gcp.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ resource "google_compute_ha_vpn_gateway" "ha_gateway1" {
provider = google-beta
region = "us-central1"
name = "<%= ctx[:vars]['ha_vpn_gateway1_name'] %>"
network = google_compute_network.network1.self_link
network = google_compute_network.network1.id
}

resource "google_compute_ha_vpn_gateway" "ha_gateway2" {
provider = google-beta
region = "us-central1"
name = "<%= ctx[:vars]['ha_vpn_gateway2_name'] %>"
network = google_compute_network.network2.self_link
network = google_compute_network.network2.id
}

resource "google_compute_network" "network1" {
Expand All @@ -31,31 +31,31 @@ resource "google_compute_subnetwork" "network1_subnet1" {
name = "ha-vpn-subnet-1"
ip_cidr_range = "10.0.1.0/24"
region = "us-central1"
network = google_compute_network.network1.self_link
network = google_compute_network.network1.id
}

resource "google_compute_subnetwork" "network1_subnet2" {
provider = google-beta
name = "ha-vpn-subnet-2"
ip_cidr_range = "10.0.2.0/24"
region = "us-west1"
network = google_compute_network.network1.self_link
network = google_compute_network.network1.id
}

resource "google_compute_subnetwork" "network2_subnet1" {
provider = google-beta
name = "ha-vpn-subnet-3"
ip_cidr_range = "192.168.1.0/24"
region = "us-central1"
network = google_compute_network.network2.self_link
network = google_compute_network.network2.id
}

resource "google_compute_subnetwork" "network2_subnet2" {
provider = google-beta
name = "ha-vpn-subnet-4"
ip_cidr_range = "192.168.2.0/24"
region = "us-east1"
network = google_compute_network.network2.self_link
network = google_compute_network.network2.id
}

resource "google_compute_router" "router1" {
Expand All @@ -80,43 +80,43 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
provider = google-beta
name = "ha-vpn-tunnel1"
region = "us-central1"
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
shared_secret = "a secret message"
router = google_compute_router.router1.self_link
router = google_compute_router.router1.id
vpn_gateway_interface = 0
}

resource "google_compute_vpn_tunnel" "tunnel2" {
provider = google-beta
name = "ha-vpn-tunnel2"
region = "us-central1"
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
shared_secret = "a secret message"
router = google_compute_router.router1.self_link
router = google_compute_router.router1.id
vpn_gateway_interface = 1
}

resource "google_compute_vpn_tunnel" "tunnel3" {
provider = google-beta
name = "ha-vpn-tunnel3"
region = "us-central1"
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
shared_secret = "a secret message"
router = google_compute_router.router2.self_link
router = google_compute_router.router2.id
vpn_gateway_interface = 0
}

resource "google_compute_vpn_tunnel" "tunnel4" {
provider = google-beta
name = "ha-vpn-tunnel4"
region = "us-central1"
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.self_link
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.self_link
vpn_gateway = google_compute_ha_vpn_gateway.ha_gateway2.id
peer_gcp_gateway = google_compute_ha_vpn_gateway.ha_gateway1.id
shared_secret = "a secret message"
router = google_compute_router.router2.self_link
router = google_compute_router.router2.id
vpn_gateway_interface = 1
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resource "google_compute_interconnect_attachment" "<%= ctx[:primary_resource_id] %>" {
name = "<%= ctx[:vars]['interconnect_attachment_name'] %>"
interconnect = "my-interconnect-id"
router = google_compute_router.foobar.self_link
router = google_compute_router.foobar.id
}

resource "google_compute_router" "foobar" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "google_kms_key_ring" "keyring" {

resource "google_kms_crypto_key" "<%= ctx[:primary_resource_id] %>" {
name = "crypto-key-example"
key_ring = google_kms_key_ring.keyring.self_link
key_ring = google_kms_key_ring.keyring.id
purpose = "ASYMMETRIC_SIGN"

version_template {
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/examples/kms_crypto_key_basic.tf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "google_kms_key_ring" "keyring" {

resource "google_kms_crypto_key" "<%= ctx[:primary_resource_id] %>" {
name = "crypto-key-example"
key_ring = google_kms_key_ring.keyring.self_link
key_ring = google_kms_key_ring.keyring.id
rotation_period = "100000s"

lifecycle {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ resource "google_compute_target_https_proxy" "default" {
provider = google-beta

name = "<%= ctx[:vars]['proxy_name'] %>"
url_map = google_compute_url_map.default.self_link
ssl_certificates = [google_compute_managed_ssl_certificate.default.self_link]
url_map = google_compute_url_map.default.id
ssl_certificates = [google_compute_managed_ssl_certificate.default.id]
}

resource "google_compute_url_map" "default" {
Expand All @@ -22,7 +22,7 @@ resource "google_compute_url_map" "default" {
name = "<%= ctx[:vars]['url_map_name'] %>"
description = "a description"

default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

host_rule {
hosts = ["sslcert.tf-test.club"]
Expand All @@ -31,11 +31,11 @@ resource "google_compute_url_map" "default" {

path_matcher {
name = "allpaths"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id

path_rule {
paths = ["/*"]
service = google_compute_backend_service.default.self_link
service = google_compute_backend_service.default.id
}
}
}
Expand All @@ -48,7 +48,7 @@ resource "google_compute_backend_service" "default" {
protocol = "HTTP"
timeout_sec = 10

health_checks = [google_compute_http_health_check.default.self_link]
health_checks = [google_compute_http_health_check.default.id]
}

resource "google_compute_http_health_check" "default" {
Expand All @@ -71,7 +71,7 @@ resource "google_compute_global_forwarding_rule" "default" {
provider = google-beta

name = "<%= ctx[:vars]['forwarding_rule_name'] %>"
target = google_compute_target_https_proxy.default.self_link
target = google_compute_target_https_proxy.default.id
port_range = 443
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
resource "google_compute_target_https_proxy" "default" {
provider = google-beta
name = "test-proxy"
url_map = google_compute_url_map.default.self_link
ssl_certificates = [google_compute_managed_ssl_certificate.cert.self_link]
url_map = google_compute_url_map.default.id
ssl_certificates = [google_compute_managed_ssl_certificate.cert.id]
}

locals {
Expand Down Expand Up @@ -38,17 +38,17 @@ resource "google_compute_url_map" "default" {
provider = google-beta
name = "url-map"
description = "a description"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id
host_rule {
hosts = ["mysite.com"]
path_matcher = "allpaths"
}
path_matcher {
name = "allpaths"
default_service = google_compute_backend_service.default.self_link
default_service = google_compute_backend_service.default.id
path_rule {
paths = ["/*"]
service = google_compute_backend_service.default.self_link
service = google_compute_backend_service.default.id
}
}
}
Expand All @@ -59,7 +59,7 @@ resource "google_compute_backend_service" "default" {
port_name = "http"
protocol = "HTTP"
timeout_sec = 10
health_checks = [google_compute_http_health_check.default.self_link]
health_checks = [google_compute_http_health_check.default.id]
}

resource "google_compute_http_health_check" "default" {
Expand Down
Loading