feat: Add support for log_config in google_compute_backend_service. (#88)

xingao267 · web-flow · commit f5129ef91fdc · 2020-03-10T15:53:37.000-04:00
BREAKING CHANGE: You must now specify log_config for each backend service. Use `log_config = null` to use the default.
diff --git a/README.md b/README.md
@@ -45,6 +45,11 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable = true
+        sample_rate = 1.0
+      }
+
       groups = [
         {
           # Each node pool instance group should be added to the backend.
diff --git a/autogen/README.md b/autogen/README.md
@@ -50,6 +50,11 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable = true
+        sample_rate = 1.0
+      }
+
       groups = [
         {
           # Each node pool instance group should be added to the backend.
diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -86,6 +86,7 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
+  provider = google-beta
   for_each = var.backends
 
   project = var.project
@@ -117,6 +118,11 @@ resource "google_compute_backend_service" "default" {
     }
   }
 
+  log_config {
+    enable      = lookup(lookup(each.value, "log_config", {}), "enable", true)
+    sample_rate = lookup(lookup(each.value, "log_config", {}), "sample_rate", "1.0")
+  }
+
   depends_on = [google_compute_health_check.default]
 
   {% if dynamic_backends %}
diff --git a/autogen/variables.tf.tmpl b/autogen/variables.tf.tmpl
@@ -85,6 +85,10 @@ variable "backends" {
       port                = number
       host                = string
     })
+    log_config = object({
+      enable      = bool
+      sample_rate = number
+    })
     groups = list(object({
       group                        = string
       balancing_mode               = string
diff --git a/examples/https-gke/main.tf b/examples/https-gke/main.tf
@@ -66,6 +66,11 @@ module "gce-lb-https" {
         host                = null
       }
 
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
+
       groups = [
         {
           # Each node pool instance group should be added to the backend.
diff --git a/examples/mig-nat-http-lb/main.tf b/examples/mig-nat-http-lb/main.tf
@@ -115,6 +115,11 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable      = false
+        sample_rate = null
+      }
+
       groups = [
         {
           group                        = module.mig.instance_group
diff --git a/examples/multi-backend-multi-mig-bucket-https-lb/main.tf b/examples/multi-backend-multi-mig-bucket-https-lb/main.tf
@@ -145,6 +145,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig1.instance_group
@@ -197,6 +201,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig1.instance_group
@@ -223,6 +231,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig2.instance_group
@@ -249,6 +261,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig3.instance_group
diff --git a/examples/multi-mig-http-lb/main.tf b/examples/multi-mig-http-lb/main.tf
@@ -101,6 +101,10 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
 
       groups = [
         {
diff --git a/examples/multiple-certs/main.tf b/examples/multiple-certs/main.tf
@@ -145,6 +145,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig1.instance_group
@@ -197,6 +201,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig1.instance_group
@@ -223,6 +231,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig2.instance_group
@@ -249,6 +261,10 @@ module "gce-lb-https" {
       connection_draining_timeout_sec = null
       enable_cdn                      = false
       health_check                    = local.health_check
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
       groups = [
         {
           group                        = module.mig3.instance_group
diff --git a/examples/shared-vpc/main.tf b/examples/shared-vpc/main.tf
@@ -52,6 +52,11 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable      = true
+        sample_rate = 1.0
+      }
+
       groups = [
         {
           group                        = module.mig.instance_group
diff --git a/main.tf b/main.tf
@@ -86,6 +86,7 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
+  provider = google-beta
   for_each = var.backends
 
   project = var.project
@@ -117,6 +118,11 @@ resource "google_compute_backend_service" "default" {
     }
   }
 
+  log_config {
+    enable      = lookup(lookup(each.value, "log_config", {}), "enable", true)
+    sample_rate = lookup(lookup(each.value, "log_config", {}), "sample_rate", "1.0")
+  }
+
   depends_on = [google_compute_health_check.default]
 
 }
diff --git a/modules/dynamic_backends/README.md b/modules/dynamic_backends/README.md
@@ -46,6 +46,11 @@ module "gce-lb-http" {
         host                = null
       }
 
+      log_config = {
+        enable = true
+        sample_rate = 1.0
+      }
+
       groups = [
         {
           # Each node pool instance group should be added to the backend.
diff --git a/modules/dynamic_backends/main.tf b/modules/dynamic_backends/main.tf
@@ -86,6 +86,7 @@ resource "google_compute_url_map" "default" {
 }
 
 resource "google_compute_backend_service" "default" {
+  provider = google-beta
   for_each = var.backends
 
   project = var.project
@@ -117,6 +118,11 @@ resource "google_compute_backend_service" "default" {
     }
   }
 
+  log_config {
+    enable      = lookup(lookup(each.value, "log_config", {}), "enable", true)
+    sample_rate = lookup(lookup(each.value, "log_config", {}), "sample_rate", "1.0")
+  }
+
   depends_on = [google_compute_health_check.default]
 
   lifecycle {
diff --git a/modules/dynamic_backends/variables.tf b/modules/dynamic_backends/variables.tf
@@ -85,6 +85,10 @@ variable "backends" {
       port                = number
       host                = string
     })
+    log_config = object({
+      enable      = bool
+      sample_rate = number
+    })
     groups = list(object({
       group                        = string
       balancing_mode               = string
diff --git a/variables.tf b/variables.tf
@@ -85,6 +85,10 @@ variable "backends" {
       port                = number
       host                = string
     })
+    log_config = object({
+      enable      = bool
+      sample_rate = number
+    })
     groups = list(object({
       group                        = string
       balancing_mode               = string

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ module "gce-lb-http" {`
`45`	`45`	`host = null`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ log_config = {`
	`49`	`+ enable = true`
	`50`	`+ sample_rate = 1.0`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`groups = [`
`49`	`54`	`{`
`50`	`55`	`# Each node pool instance group should be added to the backend.`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ module "gce-lb-http" {`
`50`	`50`	`host = null`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ log_config = {`
	`54`	`+ enable = true`
	`55`	`+ sample_rate = 1.0`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`groups = [`
`54`	`59`	`{`
`55`	`60`	`# Each node pool instance group should be added to the backend.`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ resource "google_compute_url_map" "default" {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`resource "google_compute_backend_service" "default" {`
	`89`	`+ provider = google-beta`
`89`	`90`	`for_each = var.backends`
`90`	`91`
`91`	`92`	`project = var.project`
`@@ -117,6 +118,11 @@ resource "google_compute_backend_service" "default" {`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`
	`121`	`+ log_config {`
	`122`	`+ enable = lookup(lookup(each.value, "log_config", {}), "enable", true)`
	`123`	`+ sample_rate = lookup(lookup(each.value, "log_config", {}), "sample_rate", "1.0")`
	`124`	`+ }`
	`125`	`+`
`120`	`126`	`depends_on = [google_compute_health_check.default]`
`121`	`127`
`122`	`128`	`{% if dynamic_backends %}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ module "gce-lb-https" {`
`66`	`66`	`host = null`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ log_config = {`
	`70`	`+ enable = true`
	`71`	`+ sample_rate = 1.0`
	`72`	`+ }`
	`73`	`+`
`69`	`74`	`groups = [`
`70`	`75`	`{`
`71`	`76`	`# Each node pool instance group should be added to the backend.`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,11 @@ module "gce-lb-http" {`
`115`	`115`	`host = null`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ log_config = {`
	`119`	`+ enable = false`
	`120`	`+ sample_rate = null`
	`121`	`+ }`
	`122`	`+`
`118`	`123`	`groups = [`
`119`	`124`	`{`
`120`	`125`	`group = module.mig.instance_group`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,10 @@ module "gce-lb-http" {`
`101`	`101`	`host = null`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ log_config = {`
	`105`	`+ enable = true`
	`106`	`+ sample_rate = 1.0`
	`107`	`+ }`
`104`	`108`
`105`	`109`	`groups = [`
`106`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ module "gce-lb-http" {`
`52`	`52`	`host = null`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ log_config = {`
	`56`	`+ enable = true`
	`57`	`+ sample_rate = 1.0`
	`58`	`+ }`
	`59`	`+`
`55`	`60`	`groups = [`
`56`	`61`	`{`
`57`	`62`	`group = module.mig.instance_group`