From e0962381982b27970b152ca8d9fc8661144d9b5e Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 16 Apr 2021 16:18:56 -0700 Subject: [PATCH] Switched tests relying on HTTP protocol to use INTERNAL_MANAGED load balancing (#4708) (#8941) * Fixed compute region url map tests * Made tests relying on HTTP use INTERNAL_MANAGED load balancing scheme Signed-off-by: Modular Magician --- .changelog/4708.txt | 3 +++ ...resource_compute_region_ssl_certificate_generated_test.go | 1 + google/resource_compute_region_target_http_proxy_test.go | 2 ++ ...ource_compute_region_target_https_proxy_generated_test.go | 1 + google/resource_compute_region_target_https_proxy_test.go | 4 ++++ google/resource_compute_region_url_map_generated_test.go | 2 ++ google/resource_compute_region_url_map_test.go | 5 +++++ website/docs/r/compute_region_ssl_certificate.html.markdown | 1 + .../docs/r/compute_region_target_https_proxy.html.markdown | 1 + website/docs/r/compute_region_url_map.html.markdown | 2 ++ 10 files changed, 22 insertions(+) create mode 100644 .changelog/4708.txt diff --git a/.changelog/4708.txt b/.changelog/4708.txt new file mode 100644 index 00000000000..8ec013c0699 --- /dev/null +++ b/.changelog/4708.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` diff --git a/google/resource_compute_region_ssl_certificate_generated_test.go b/google/resource_compute_region_ssl_certificate_generated_test.go index f7ce365a7a2..9813e05ac9e 100644 --- a/google/resource_compute_region_ssl_certificate_generated_test.go +++ b/google/resource_compute_region_ssl_certificate_generated_test.go @@ -207,6 +207,7 @@ resource "google_compute_region_backend_service" "default" { region = "us-central1" name = "tf-test-backend-service%{random_suffix}" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] diff --git a/google/resource_compute_region_target_http_proxy_test.go b/google/resource_compute_region_target_http_proxy_test.go index bf339bf28c4..b7f605fd63c 100644 --- a/google/resource_compute_region_target_http_proxy_test.go +++ b/google/resource_compute_region_target_http_proxy_test.go @@ -53,6 +53,7 @@ resource "google_compute_region_backend_service" "foobar" { name = "%s" health_checks = [google_compute_region_health_check.zero.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_health_check" "zero" { @@ -120,6 +121,7 @@ resource "google_compute_region_backend_service" "foobar" { name = "%s" health_checks = [google_compute_region_health_check.zero.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_health_check" "zero" { diff --git a/google/resource_compute_region_target_https_proxy_generated_test.go b/google/resource_compute_region_target_https_proxy_generated_test.go index ab96f9d98ad..ad657022955 100644 --- a/google/resource_compute_region_target_https_proxy_generated_test.go +++ b/google/resource_compute_region_target_https_proxy_generated_test.go @@ -91,6 +91,7 @@ resource "google_compute_region_backend_service" "default" { region = "us-central1" name = "tf-test-backend-service%{random_suffix}" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] diff --git a/google/resource_compute_region_target_https_proxy_test.go b/google/resource_compute_region_target_https_proxy_test.go index 6a5856a46ba..a73c4c2d9fb 100644 --- a/google/resource_compute_region_target_https_proxy_test.go +++ b/google/resource_compute_region_target_https_proxy_test.go @@ -50,12 +50,14 @@ resource "google_compute_region_backend_service" "foobar1" { name = "httpsproxy-test-backend1-%s" health_checks = [google_compute_region_health_check.zero.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_backend_service" "foobar2" { name = "httpsproxy-test-backend2-%s" health_checks = [google_compute_region_health_check.one.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_health_check" "zero" { @@ -148,12 +150,14 @@ resource "google_compute_region_backend_service" "foobar1" { name = "httpsproxy-test-backend1-%s" health_checks = [google_compute_region_health_check.zero.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_backend_service" "foobar2" { name = "httpsproxy-test-backend2-%s" health_checks = [google_compute_region_health_check.one.self_link] protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" } resource "google_compute_region_health_check" "zero" { diff --git a/google/resource_compute_region_url_map_generated_test.go b/google/resource_compute_region_url_map_generated_test.go index 4eca4f6cee3..06bcdd2225b 100644 --- a/google/resource_compute_region_url_map_generated_test.go +++ b/google/resource_compute_region_url_map_generated_test.go @@ -90,6 +90,7 @@ resource "google_compute_region_backend_service" "login" { name = "login%{random_suffix}" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] @@ -100,6 +101,7 @@ resource "google_compute_region_backend_service" "home" { name = "home%{random_suffix}" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] diff --git a/google/resource_compute_region_url_map_test.go b/google/resource_compute_region_url_map_test.go index 559686b7f44..9c89e9e81f9 100644 --- a/google/resource_compute_region_url_map_test.go +++ b/google/resource_compute_region_url_map_test.go @@ -207,6 +207,7 @@ resource "google_compute_region_backend_service" "foobar" { region = "us-central1" name = "regionurlmap-test-%s" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" health_checks = [google_compute_region_health_check.zero.self_link] } @@ -253,6 +254,7 @@ resource "google_compute_region_backend_service" "foobar" { region = "us-central1" name = "regionurlmap-test-%s" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" health_checks = [google_compute_region_health_check.zero.self_link] } @@ -299,6 +301,7 @@ resource "google_compute_region_backend_service" "foobar" { region = "us-central1" name = "regionurlmap-test-%s" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" health_checks = [google_compute_region_health_check.zero.self_link] } @@ -354,6 +357,7 @@ resource "google_compute_region_backend_service" "foobar" { region = "us-central1" name = "regionurlmap-test-%s" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" health_checks = [google_compute_region_health_check.zero.self_link] } @@ -429,6 +433,7 @@ resource "google_compute_region_backend_service" "foobar" { region = "us-central1" name = "regionurlmap-test-%s" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" health_checks = [google_compute_region_health_check.zero.self_link] } diff --git a/website/docs/r/compute_region_ssl_certificate.html.markdown b/website/docs/r/compute_region_ssl_certificate.html.markdown index 88c74fe23f8..fe0ac60dba3 100644 --- a/website/docs/r/compute_region_ssl_certificate.html.markdown +++ b/website/docs/r/compute_region_ssl_certificate.html.markdown @@ -156,6 +156,7 @@ resource "google_compute_region_backend_service" "default" { region = "us-central1" name = "backend-service" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] diff --git a/website/docs/r/compute_region_target_https_proxy.html.markdown b/website/docs/r/compute_region_target_https_proxy.html.markdown index 135cb02af12..7a710d3ee9e 100644 --- a/website/docs/r/compute_region_target_https_proxy.html.markdown +++ b/website/docs/r/compute_region_target_https_proxy.html.markdown @@ -83,6 +83,7 @@ resource "google_compute_region_backend_service" "default" { region = "us-central1" name = "backend-service" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] diff --git a/website/docs/r/compute_region_url_map.html.markdown b/website/docs/r/compute_region_url_map.html.markdown index e7470ee4bb1..a122d5314bd 100644 --- a/website/docs/r/compute_region_url_map.html.markdown +++ b/website/docs/r/compute_region_url_map.html.markdown @@ -77,6 +77,7 @@ resource "google_compute_region_backend_service" "login" { name = "login" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id] @@ -87,6 +88,7 @@ resource "google_compute_region_backend_service" "home" { name = "home" protocol = "HTTP" + load_balancing_scheme = "INTERNAL_MANAGED" timeout_sec = 10 health_checks = [google_compute_region_health_check.default.id]