feat: Add health check logging support (#98)

Dev25 · web-flow · commit f2b8f3caf49a · 2020-05-05T17:51:21.000-04:00
* Add health check logging support

Signed-off-by: Dev &lt;Dev25@users.noreply.github.com&gt;

* Set health check resource to use beta provider

Signed-off-by: Dev &lt;Dev25@users.noreply.github.com&gt;

* Remove dynamic block, bump to 3.17 min provider

Signed-off-by: Dev &lt;Dev25@users.noreply.github.com&gt;
diff --git a/README.md b/README.md
@@ -45,6 +45,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = var.service_port
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/autogen/README.md b/autogen/README.md
@@ -50,6 +50,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = var.service_port
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/autogen/main.tf.tmpl b/autogen/main.tf.tmpl
@@ -135,6 +135,7 @@ resource "google_compute_backend_service" "default" {
 }
 
 resource "google_compute_health_check" "default" {
+  provider = google-beta
   for_each = var.backends
   project  = var.project
   name     = "${var.name}-hc-${each.key}"
@@ -144,6 +145,10 @@ resource "google_compute_health_check" "default" {
   healthy_threshold   = lookup(each.value["health_check"], "healthy_threshold", 2)
   unhealthy_threshold = lookup(each.value["health_check"], "unhealthy_threshold", 2)
 
+  log_config {
+    enable = lookup(each.value["health_check"], "logging", false)
+  }
+
   dynamic "http_health_check" {
     for_each = each.value["protocol"] == "HTTP" ? [
       {
diff --git a/autogen/variables.tf.tmpl b/autogen/variables.tf.tmpl
@@ -86,6 +86,7 @@ variable "backends" {
       request_path        = string
       port                = number
       host                = string
+      logging             = bool
     })
     log_config = object({
       enable      = bool
diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -17,7 +17,7 @@
 terraform {
   required_version = "~> 0.12.6"
   required_providers {
-    google      = ">= 2.15, <4.0.0"
-    google-beta = ">= 2.15, <4.0.0"
+    google      = ">= 3.17, <4.0.0"
+    google-beta = ">= 3.17, <4.0.0"
   }
 }
diff --git a/examples/https-gke/main.tf b/examples/https-gke/main.tf
@@ -66,6 +66,7 @@ module "gce-lb-https" {
         request_path        = "/"
         port                = var.service_port
         host                = null
+        logging             = true
       }
 
       log_config = {
diff --git a/examples/mig-nat-http-lb/main.tf b/examples/mig-nat-http-lb/main.tf
@@ -115,6 +115,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = 80
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/examples/multi-backend-multi-mig-bucket-https-lb/main.tf b/examples/multi-backend-multi-mig-bucket-https-lb/main.tf
@@ -113,6 +113,7 @@ locals {
     request_path        = "/"
     port                = 80
     host                = null
+    logging             = null
   }
 }
 
diff --git a/examples/multi-mig-http-lb/main.tf b/examples/multi-mig-http-lb/main.tf
@@ -100,6 +100,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = 80
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/examples/multiple-certs/main.tf b/examples/multiple-certs/main.tf
@@ -113,6 +113,7 @@ locals {
     request_path        = "/"
     port                = 80
     host                = null
+    logging             = null
   }
 }
 
diff --git a/examples/shared-vpc/main.tf b/examples/shared-vpc/main.tf
@@ -52,6 +52,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = 80
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/main.tf b/main.tf
@@ -130,6 +130,7 @@ resource "google_compute_backend_service" "default" {
 }
 
 resource "google_compute_health_check" "default" {
+  provider = google-beta
   for_each = var.backends
   project  = var.project
   name     = "${var.name}-hc-${each.key}"
@@ -139,6 +140,10 @@ resource "google_compute_health_check" "default" {
   healthy_threshold   = lookup(each.value["health_check"], "healthy_threshold", 2)
   unhealthy_threshold = lookup(each.value["health_check"], "unhealthy_threshold", 2)
 
+  log_config {
+    enable = lookup(each.value["health_check"], "logging", false)
+  }
+
   dynamic "http_health_check" {
     for_each = each.value["protocol"] == "HTTP" ? [
       {
diff --git a/modules/dynamic_backends/README.md b/modules/dynamic_backends/README.md
@@ -46,6 +46,7 @@ module "gce-lb-http" {
         request_path        = "/"
         port                = var.service_port
         host                = null
+        logging             = null
       }
 
       log_config = {
diff --git a/modules/dynamic_backends/main.tf b/modules/dynamic_backends/main.tf
@@ -133,6 +133,7 @@ resource "google_compute_backend_service" "default" {
 }
 
 resource "google_compute_health_check" "default" {
+  provider = google-beta
   for_each = var.backends
   project  = var.project
   name     = "${var.name}-hc-${each.key}"
@@ -142,6 +143,10 @@ resource "google_compute_health_check" "default" {
   healthy_threshold   = lookup(each.value["health_check"], "healthy_threshold", 2)
   unhealthy_threshold = lookup(each.value["health_check"], "unhealthy_threshold", 2)
 
+  log_config {
+    enable = lookup(each.value["health_check"], "logging", false)
+  }
+
   dynamic "http_health_check" {
     for_each = each.value["protocol"] == "HTTP" ? [
       {
diff --git a/modules/dynamic_backends/variables.tf b/modules/dynamic_backends/variables.tf
@@ -86,6 +86,7 @@ variable "backends" {
       request_path        = string
       port                = number
       host                = string
+      logging             = bool
     })
     log_config = object({
       enable      = bool
diff --git a/modules/dynamic_backends/versions.tf b/modules/dynamic_backends/versions.tf
@@ -17,7 +17,7 @@
 terraform {
   required_version = "~> 0.12.6"
   required_providers {
-    google      = ">= 2.15, <4.0.0"
-    google-beta = ">= 2.15, <4.0.0"
+    google      = ">= 3.17, <4.0.0"
+    google-beta = ">= 3.17, <4.0.0"
   }
 }
diff --git a/test/fixtures/mig_nat/main.tf b/test/fixtures/mig_nat/main.tf
@@ -19,7 +19,7 @@ resource "random_id" "random_net" {
 }
 
 provider "google" {
-  version = "~> 3.5.0"
+  version = "~> 3.17.0"
 }
 
 module "example" {
diff --git a/test/fixtures/multi_certs/main.tf b/test/fixtures/multi_certs/main.tf
@@ -19,7 +19,7 @@ resource "random_id" "random_net" {
 }
 
 provider "google" {
-  version = "~> 3.5.0"
+  version = "~> 3.17.0"
 }
 
 module "example" {
diff --git a/test/fixtures/multi_mig/main.tf b/test/fixtures/multi_mig/main.tf
@@ -19,7 +19,7 @@ resource "random_id" "random_net" {
 }
 
 provider "google" {
-  version = "~> 3.5.0"
+  version = "~> 3.17.0"
 }
 
 module "example" {
diff --git a/variables.tf b/variables.tf
@@ -86,6 +86,7 @@ variable "backends" {
       request_path        = string
       port                = number
       host                = string
+      logging             = bool
     })
     log_config = object({
       enable      = bool
diff --git a/versions.tf b/versions.tf
@@ -17,7 +17,7 @@
 terraform {
   required_version = "~> 0.12.6"
   required_providers {
-    google      = ">= 2.15, <4.0.0"
-    google-beta = ">= 2.15, <4.0.0"
+    google      = ">= 3.17, <4.0.0"
+    google-beta = ">= 3.17, <4.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ module "gce-lb-http" {`
`45`	`45`	`request_path = "/"`
`46`	`46`	`port = var.service_port`
`47`	`47`	`host = null`
	`48`	`+ logging = null`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`log_config = {`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ module "gce-lb-http" {`
`50`	`50`	`request_path = "/"`
`51`	`51`	`port = var.service_port`
`52`	`52`	`host = null`
	`53`	`+ logging = null`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`log_config = {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`terraform {`
`18`	`18`	`required_version = "~> 0.12.6"`
`19`	`19`	`required_providers {`
`20`		`- google = ">= 2.15, <4.0.0"`
`21`		`- google-beta = ">= 2.15, <4.0.0"`
	`20`	`+ google = ">= 3.17, <4.0.0"`
	`21`	`+ google-beta = ">= 3.17, <4.0.0"`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ module "gce-lb-https" {`
`66`	`66`	`request_path = "/"`
`67`	`67`	`port = var.service_port`
`68`	`68`	`host = null`
	`69`	`+ logging = true`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`log_config = {`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ module "gce-lb-http" {`
`115`	`115`	`request_path = "/"`
`116`	`116`	`port = 80`
`117`	`117`	`host = null`
	`118`	`+ logging = null`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`log_config = {`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ locals {`
`113`	`113`	`request_path = "/"`
`114`	`114`	`port = 80`
`115`	`115`	`host = null`
	`116`	`+ logging = null`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ module "gce-lb-http" {`
`100`	`100`	`request_path = "/"`
`101`	`101`	`port = 80`
`102`	`102`	`host = null`
	`103`	`+ logging = null`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`log_config = {`