From 1a509e2698d173896c52cefd7bebb6a586e98308 Mon Sep 17 00:00:00 2001 From: Ty Larrabee Date: Wed, 11 Dec 2019 15:55:39 -0800 Subject: [PATCH] Promote region health check to GA (#2825) Merged PR #2825. --- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- products/compute/api.yaml | 1 - templates/terraform/examples/region_health_check_http.tf.erb | 1 - templates/terraform/examples/region_health_check_http2.tf.erb | 1 - .../terraform/examples/region_health_check_http2_full.tf.erb | 1 - .../terraform/examples/region_health_check_http_full.tf.erb | 1 - templates/terraform/examples/region_health_check_https.tf.erb | 1 - .../terraform/examples/region_health_check_https_full.tf.erb | 1 - templates/terraform/examples/region_health_check_ssl.tf.erb | 1 - .../terraform/examples/region_health_check_ssl_full.tf.erb | 1 - templates/terraform/examples/region_health_check_tcp.tf.erb | 1 - .../terraform/examples/region_health_check_tcp_full.tf.erb | 1 - .../tests/resource_compute_region_health_check_test.go.erb | 2 -- 15 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build/terraform b/build/terraform index d5d951e87500..1c8391d1311c 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit d5d951e875004ac9aa180b54e6916b90f8e04aa6 +Subproject commit 1c8391d1311c3534b066a0c8d593694d112787fc diff --git a/build/terraform-beta b/build/terraform-beta index de9cb0f4f750..f75b5841d1d2 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit de9cb0f4f750f726789eb19a13cc17d12e842d02 +Subproject commit f75b5841d1d2a0ecb3d07f4f8c2e603a0b1b3e1a diff --git a/build/terraform-mapper b/build/terraform-mapper index 0c4c9608f849..0c5851ff55d4 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit 0c4c9608f849eea89fc80b68bccda80dff8f1bf6 +Subproject commit 0c5851ff55d469ed0c0ea7482b6dd694f1d4f375 diff --git a/products/compute/api.yaml b/products/compute/api.yaml index 2285cda7d8e7..92d0219ea924 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -9003,7 +9003,6 @@ objects: should be mapped to. - !ruby/object:Api::Resource name: 'RegionHealthCheck' - min_version: beta kind: 'compute#healthCheck' base_url: projects/{{project}}/regions/{{region}}/healthChecks collection_url_key: 'items' diff --git a/templates/terraform/examples/region_health_check_http.tf.erb b/templates/terraform/examples/region_health_check_http.tf.erb index eab516fcb12a..5bb2369cebb2 100644 --- a/templates/terraform/examples/region_health_check_http.tf.erb +++ b/templates/terraform/examples/region_health_check_http.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "http-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" timeout_sec = 1 diff --git a/templates/terraform/examples/region_health_check_http2.tf.erb b/templates/terraform/examples/region_health_check_http2.tf.erb index f82a15ed7ef3..e5399cab9971 100644 --- a/templates/terraform/examples/region_health_check_http2.tf.erb +++ b/templates/terraform/examples/region_health_check_http2.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "http2-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" timeout_sec = 1 diff --git a/templates/terraform/examples/region_health_check_http2_full.tf.erb b/templates/terraform/examples/region_health_check_http2_full.tf.erb index 4d68b92ff56b..d85e237ecc7a 100644 --- a/templates/terraform/examples/region_health_check_http2_full.tf.erb +++ b/templates/terraform/examples/region_health_check_http2_full.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "http2-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" description = "Health check via http2" diff --git a/templates/terraform/examples/region_health_check_http_full.tf.erb b/templates/terraform/examples/region_health_check_http_full.tf.erb index 3be92c4fef74..fbb286c60af6 100644 --- a/templates/terraform/examples/region_health_check_http_full.tf.erb +++ b/templates/terraform/examples/region_health_check_http_full.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "http-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" description = "Health check via http" diff --git a/templates/terraform/examples/region_health_check_https.tf.erb b/templates/terraform/examples/region_health_check_https.tf.erb index a52fc7661daf..a47f3ef19f86 100644 --- a/templates/terraform/examples/region_health_check_https.tf.erb +++ b/templates/terraform/examples/region_health_check_https.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "https-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" timeout_sec = 1 diff --git a/templates/terraform/examples/region_health_check_https_full.tf.erb b/templates/terraform/examples/region_health_check_https_full.tf.erb index 3035bfa69eef..bbd496244f2f 100644 --- a/templates/terraform/examples/region_health_check_https_full.tf.erb +++ b/templates/terraform/examples/region_health_check_https_full.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "https-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" description = "Health check via https" diff --git a/templates/terraform/examples/region_health_check_ssl.tf.erb b/templates/terraform/examples/region_health_check_ssl.tf.erb index 48cb47f4cd61..1e176c104fad 100644 --- a/templates/terraform/examples/region_health_check_ssl.tf.erb +++ b/templates/terraform/examples/region_health_check_ssl.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "ssl-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" timeout_sec = 1 diff --git a/templates/terraform/examples/region_health_check_ssl_full.tf.erb b/templates/terraform/examples/region_health_check_ssl_full.tf.erb index ce1d96551788..09591e861ae0 100644 --- a/templates/terraform/examples/region_health_check_ssl_full.tf.erb +++ b/templates/terraform/examples/region_health_check_ssl_full.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "ssl-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" description = "Health check via ssl" diff --git a/templates/terraform/examples/region_health_check_tcp.tf.erb b/templates/terraform/examples/region_health_check_tcp.tf.erb index 5f45bda63d24..737343492ec3 100644 --- a/templates/terraform/examples/region_health_check_tcp.tf.erb +++ b/templates/terraform/examples/region_health_check_tcp.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "tcp-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" timeout_sec = 1 diff --git a/templates/terraform/examples/region_health_check_tcp_full.tf.erb b/templates/terraform/examples/region_health_check_tcp_full.tf.erb index a620715d1fc6..ae11bf0f57da 100644 --- a/templates/terraform/examples/region_health_check_tcp_full.tf.erb +++ b/templates/terraform/examples/region_health_check_tcp_full.tf.erb @@ -1,5 +1,4 @@ resource "google_compute_region_health_check" "tcp-region-health-check" { - provider = google-beta name = "<%= ctx[:vars]['health_check_name'] %>" description = "Health check via tcp" diff --git a/third_party/terraform/tests/resource_compute_region_health_check_test.go.erb b/third_party/terraform/tests/resource_compute_region_health_check_test.go.erb index a547d4a6b10d..c5ddad4f5e89 100644 --- a/third_party/terraform/tests/resource_compute_region_health_check_test.go.erb +++ b/third_party/terraform/tests/resource_compute_region_health_check_test.go.erb @@ -1,7 +1,6 @@ <% autogen_exception -%> package google -<% unless version == 'ga' -%> import ( "fmt" "regexp" @@ -343,4 +342,3 @@ resource "google_compute_region_health_check" "foobar" { } `, hckName) } -<% end -%>