Skip to content

Commit

Permalink
Switched tests relying on HTTP protocol to use INTERNAL_MANAGED load …
Browse files Browse the repository at this point in the history
…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 <[email protected]>
  • Loading branch information
modular-magician authored Apr 16, 2021
1 parent 4800e69 commit e096238
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/4708.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions google/resource_compute_region_target_http_proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions google/resource_compute_region_target_https_proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down
2 changes: 2 additions & 0 deletions google/resource_compute_region_url_map_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
5 changes: 5 additions & 0 deletions google/resource_compute_region_url_map_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
Expand Down Expand Up @@ -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]
}
Expand Down Expand Up @@ -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]
}
Expand Down Expand Up @@ -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]
}
Expand Down Expand Up @@ -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]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/compute_region_url_map.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down

0 comments on commit e096238

Please sign in to comment.