Merge branch 'master' into apigee-hybrid-gke

blueprints/apigee/bigquery-analytics/README.md

@@ -19,7 +19,7 @@ Note: This setup only works if you are not using custom analytics.
 
 ## Running the blueprint
 
-1. Clone this repository or [open it in cloud shell](https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fcloud-foundation-fabric&cloudshell_print=cloud-shell-readme.txt&cloudshell_working_dir=blueprints%2Fcloud-operations%apigee), then go through the following steps to create resources:
+1. Clone this repository or [open it in cloud shell](https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fcloud-foundation-fabric&cloudshell_print=cloud-shell-readme.txt&cloudshell_working_dir=blueprints%2Fapigee%2Fbigquery-analytics), then go through the following steps to create resources:
 
 2. Copy the file [terraform.tfvars.sample](./terraform.tfvars.sample) to a file called ```terraform.tfvars``` and update the values if required.
 

blueprints/apigee/bigquery-analytics/main.tf

@@ -94,8 +94,9 @@ module "glb" {
   use_classic_version = false
   backend_service_configs = {
     default = {
-      backends = [for k, v in var.instances : { backend = k }]
-      protocol = "HTTPS"
+      backends      = [for k, v in var.instances : { backend = k }]
+      protocol      = "HTTPS"
+      health_checks = []
     }
   }
   health_check_configs = {
@@ -116,8 +117,10 @@ module "glb" {
     }
   }
   ssl_certificates = {
-    managed_config = {
-      for k, v in var.envgroups : k => { domains = [v] }
+    managed_configs = {
+      default = {
+        domains = flatten([for k, v in var.envgroups : v])
+      }
     }
   }
 }

tests/blueprints/apigee/bigquery-analytics/basic.yaml

@@ -14,4 +14,4 @@
 
 counts:
   modules: 9
-  resources: 59
+  resources: 60