change default load balancing scheme for EXTERNAL_MANAGED for global …

mmv1/products/compute/BackendService.yaml

@@ -67,7 +67,7 @@ samples:
       - name: 'backend_service_basic'
         resource_id_vars:
           backend_service_name: 'backend-service'
-          http_health_check_name: 'health-check'
+          health_check_name: 'health-check'
   - name: 'backend_service_external_iap'
     primary_resource_id: 'default'
     steps:
@@ -80,7 +80,7 @@ samples:
       - name: 'backend_service_cache_simple'
         resource_id_vars:
           backend_service_name: 'backend-service'
-          http_health_check_name: 'health-check'
+          health_check_name: 'health-check'
   - name: 'backend_service_cache_include_http_headers'
     primary_resource_id: 'default'
     steps:
@@ -99,14 +99,14 @@ samples:
       - name: 'backend_service_cache'
         resource_id_vars:
           backend_service_name: 'backend-service'
-          http_health_check_name: 'health-check'
+          health_check_name: 'health-check'
   - name: 'backend_service_cache_bypass_cache_on_request_headers'
     primary_resource_id: 'default'
     steps:
       - name: 'backend_service_cache_bypass_cache_on_request_headers'
         resource_id_vars:
           backend_service_name: 'backend-service'
-          http_health_check_name: 'health-check'
+          health_check_name: 'health-check'
   - name: 'backend_service_traffic_director_round_robin'
     primary_resource_id: 'default'
     min_version: 'beta'
@@ -961,7 +961,7 @@ properties:
       external load balancing. A backend service created for one type of
       load balancing cannot be used with the other. For more information, refer to
       [Choosing a load balancer](https://cloud.google.com/load-balancing/docs/backend-service).
-    default_value: "EXTERNAL"
+    default_value: "EXTERNAL_MANAGED"
     # If you're modifying this value, it probably means Global ILB is now
     # an option. If that's the case, all of the documentation is based on
     # this resource supporting external load balancing only.

mmv1/products/compute/GlobalForwardingRule.yaml

@@ -353,7 +353,7 @@ properties:
 
       For more information about forwarding rules, refer to
       [Forwarding rule concepts](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts).
-    default_value: "EXTERNAL"
+    default_value: "EXTERNAL_MANAGED"
     enum_values:
       - 'EXTERNAL'
       - 'EXTERNAL_MANAGED'

mmv1/products/iap/WebBackendService.yaml

@@ -45,7 +45,7 @@ samples:
         config_path: templates/terraform/samples/services/compute/backend_service_basic.tf.tmpl
         resource_id_vars:
           backend_service_name: 'backend-service'
-          http_health_check_name: 'health-check'
+          health_check_name: 'health-check'
 parameters:
 properties:
   - name: 'name'

mmv1/templates/terraform/samples/services/compute/backend_service_basic.tf.tmpl

@@ -1,11 +1,14 @@
 resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   name          = "{{index $.ResourceIdVars "backend_service_name"}}"
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
 }
 
-resource "google_compute_http_health_check" "default" {
-  name               = "{{index $.ResourceIdVars "http_health_check_name"}}"
-  request_path       = "/"
+resource "google_compute_health_check" "default" {
+  name               = "{{index $.ResourceIdVars "health_check_name"}}"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/backend_service_cache.tf.tmpl

@@ -1,6 +1,6 @@
 resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   name          = "{{index $.ResourceIdVars "backend_service_name"}}"
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
   enable_cdn  = true
   cdn_policy {
     cache_mode = "CACHE_ALL_STATIC"
@@ -12,9 +12,12 @@ resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   }
 }
 
-resource "google_compute_http_health_check" "default" {
-  name               = "{{index $.ResourceIdVars "http_health_check_name"}}"
-  request_path       = "/"
+resource "google_compute_health_check" "default" {
+  name               = "{{index $.ResourceIdVars "health_check_name"}}"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/backend_service_cache_bypass_cache_on_request_headers.tf.tmpl

@@ -1,6 +1,6 @@
 resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   name          = "{{index $.ResourceIdVars "backend_service_name"}}"
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
   enable_cdn  = true
   cdn_policy {
     cache_mode = "CACHE_ALL_STATIC"
@@ -20,9 +20,12 @@ resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   }
 }
 
-resource "google_compute_http_health_check" "default" {
-  name               = "{{index $.ResourceIdVars "http_health_check_name"}}"
-  request_path       = "/"
+resource "google_compute_health_check" "default" {
+  name               = "{{index $.ResourceIdVars "health_check_name"}}"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/backend_service_cache_simple.tf.tmpl

@@ -1,15 +1,18 @@
 resource "google_compute_backend_service" "{{$.PrimaryResourceId}}" {
   name          = "{{index $.ResourceIdVars "backend_service_name"}}"
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
   enable_cdn  = true
   cdn_policy {
     signed_url_cache_max_age_sec = 7200
   }
 }
 
-resource "google_compute_http_health_check" "default" {
-  name               = "{{index $.ResourceIdVars "http_health_check_name"}}"
-  request_path       = "/"
+resource "google_compute_health_check" "default" {
+  name               = "{{index $.ResourceIdVars "health_check_name"}}"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/backend_service_dynamic_backends.tf.tmpl

@@ -69,16 +69,19 @@ resource "google_compute_backend_service" "default" {
     group = google_compute_instance_group.default[each.key].self_link
   }
 
-  health_checks = [google_compute_http_health_check.default[each.key].self_link]
+  health_checks = [google_compute_health_check.default[each.key].self_link]
   port_name     = "http"
 }
 
-resource "google_compute_http_health_check" "default" {
+resource "google_compute_health_check" "default" {
   for_each           = local.instances
   name               = "${each.key}-hc"
-  request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }
 
 

mmv1/templates/terraform/samples/services/compute/backend_service_signed_url_key.tf.tmpl

@@ -20,7 +20,7 @@ resource "google_compute_backend_service" "example_backend" {
     group = google_compute_instance_group_manager.webservers.instance_group
   }
 
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
 }
 
 resource "google_compute_instance_group_manager" "webservers" {
@@ -51,9 +51,12 @@ resource "google_compute_instance_template" "webserver" {
   }
 }
 
-resource "google_compute_http_health_check" "default" {
+resource "google_compute_health_check" "default" {
   name               = "test"
-  request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/global_forwarding_rule_http.tf.tmpl

@@ -37,12 +37,15 @@ resource "google_compute_backend_service" "default" {
   protocol    = "HTTP"
   timeout_sec = 10
 
-  health_checks = [google_compute_http_health_check.default.id]
+  health_checks = [google_compute_health_check.default.id]
 }
 
-resource "google_compute_http_health_check" "default" {
+resource "google_compute_health_check" "default" {
   name               = "check-{{index $.ResourceIdVars "backend_service_name"}}"
-  request_path       = "/"
   check_interval_sec = 1
   timeout_sec        = 1
+  http_health_check {
+    port         = 80
+    request_path = "/"
+  }
 }

mmv1/templates/terraform/samples/services/compute/managed_ssl_certificate_basic.tf.tmpl

@@ -35,10 +35,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }
@@ -51,7 +52,8 @@ resource "google_compute_http_health_check" "default" {
 }
 
 resource "google_compute_global_forwarding_rule" "default" {
-  name       = "{{index $.ResourceIdVars "forwarding_rule_name"}}"
-  target     = google_compute_target_https_proxy.default.id
-  port_range = 443
+  name                  = "{{index $.ResourceIdVars "forwarding_rule_name"}}"
+  target                = google_compute_target_https_proxy.default.id
+  port_range            = 443
+  load_balancing_scheme = "EXTERNAL"
 }

mmv1/templates/terraform/samples/services/compute/managed_ssl_certificate_recreation.tf.tmpl

@@ -51,11 +51,12 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name          = "backend-service"
-  port_name     = "http"
-  protocol      = "HTTP"
-  timeout_sec   = 10
-  health_checks = [google_compute_http_health_check.default.id]
+  name                  = "backend-service"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
+  health_checks         = [google_compute_http_health_check.default.id]
 }
 
 resource "google_compute_http_health_check" "default" {

mmv1/templates/terraform/samples/services/compute/ssl_certificate_target_https_proxies.tf.tmpl

@@ -47,10 +47,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_http_proxy_basic.tf.tmpl

@@ -24,10 +24,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_http_proxy_fingerprint.tf.tmpl

@@ -24,10 +24,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_https_proxy_basic.tf.tmpl

@@ -33,10 +33,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_https_proxy_fingerprint.tf.tmpl

@@ -33,10 +33,11 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_https_proxy_mtls.tf.tmpl

@@ -73,11 +73,12 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  provider    = google-beta
-  name        = "{{index $.ResourceIdVars "backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  provider              = google-beta
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }

mmv1/templates/terraform/samples/services/compute/target_ssl_proxy_basic.tf.tmpl

@@ -12,9 +12,10 @@ resource "google_compute_ssl_certificate" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
-  name          = "{{index $.ResourceIdVars "backend_service_name"}}"
-  protocol      = "SSL"
-  health_checks = [google_compute_health_check.default.id]
+  name                  = "{{index $.ResourceIdVars "backend_service_name"}}"
+  protocol              = "SSL"
+  load_balancing_scheme = "EXTERNAL"
+  health_checks         = [google_compute_health_check.default.id]
 }
 
 resource "google_compute_health_check" "default" {

mmv1/templates/terraform/samples/services/compute/url_map_bucket_and_service.tf.tmpl

@@ -47,10 +47,11 @@ resource "google_compute_url_map" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_compute_backend_service" "login" {
-  name        = "{{index $.ResourceIdVars "login_backend_service_name"}}"
-  port_name   = "http"
-  protocol    = "HTTP"
-  timeout_sec = 10
+  name                  = "{{index $.ResourceIdVars "login_backend_service_name"}}"
+  port_name             = "http"
+  protocol              = "HTTP"
+  timeout_sec           = 10
+  load_balancing_scheme = "EXTERNAL"
 
   health_checks = [google_compute_http_health_check.default.id]
 }