Add all provider defaults (#4)

Author: Evy Bongers

.gitignore

@@ -0,0 +1,2 @@
+.terraform.lock.hcl
+.terraform/

database.tf

@@ -3,4 +3,7 @@ resource "google_sql_database" "database" {
 
   instance = google_sql_database_instance.instance.name
   name     = each.value
+
+  charset   = "UTF8"
+  collation = "en_US.UTF8"
 }

instance.tf

@@ -3,45 +3,77 @@ resource "google_sql_database_instance" "instance" {
   name                 = var.instance_name
   deletion_protection  = var.deletion_protection
   master_instance_name = var.primary_instance_name
+
   settings {
+    activation_policy     = "ALWAYS"
     availability_type     = var.highly_available == true ? "REGIONAL" : "ZONAL"
     disk_autoresize       = var.storage_autoresize
     disk_autoresize_limit = var.storage_limit
     disk_size             = local.storage_size
     disk_type             = "PD_SSD"
+    pricing_plan          = "PER_USE"
     tier                  = local.tier
     user_labels           = local.labels
+
     backup_configuration {
-      enabled  = local.backup_config.enabled
-      location = local.backup_config.location
+      enabled                        = local.backup_config.enabled
+      start_time                     = local.backup_config.start_time
+      point_in_time_recovery_enabled = local.backup_config.point_in_time_recovery_enabled
+      location                       = local.backup_config.location
+      transaction_log_retention_days = local.backup_config.transaction_log_retention_days
+      backup_retention_settings {
+        retained_backups = local.backup_config.retained_backups
+        retention_unit   = "COUNT"
+      }
     }
+
     dynamic "database_flags" {
       for_each = var.flags
       iterator = flag
+
       content {
         name  = flag.key
         value = flag.value
       }
     }
+
+    insights_config {
+      query_insights_enabled  = local.insights_config.query_insights_enabled
+      query_string_length     = local.insights_config.query_string_length
+      record_application_tags = local.insights_config.record_application_tags
+      record_client_address   = local.insights_config.record_client_address
+    }
+
     ip_configuration {
-      ipv4_enabled = true
-      require_ssl  = true
+      ipv4_enabled    = var.ipv4_enabled
+      private_network = var.private_network
+
+      require_ssl = true
 
       dynamic "authorized_networks" {
         for_each = var.authorized_networks
         iterator = network
 
         content {
-          name  = network.value.name
-          value = network.value.network
+          expiration_time = network.value.expiration_time
+          name            = network.value.name
+          value           = network.value.network
         }
       }
     }
+
+    location_preference {
+      follow_gae_application = null
+      zone                   = null
+    }
+
     dynamic "maintenance_window" {
-      for_each = var.primary_instance_name == null ? [0] : []
+      for_each = local.needs_maintenance_window
+
       content {
-        day  = 1
-        hour = 4
+        day          = var.maintenance_window.day
+        hour         = var.maintenance_window.hour
+        update_track = lookup(var.maintenance_window, "update_track", "stable")
       }
     }
   }

locals.tf

@@ -1,17 +1,31 @@
 locals {
   default_backup_config = {
-    enabled  = var.highly_available == true ? true : false
-    location = "eu"
+    enabled                        = var.highly_available
+    location                       = "eu"
+    point_in_time_recovery_enabled = false
+    retained_backups               = 7
+    transaction_log_retention_days = 7
+  }
+  default_insights_config = {
+    query_string_length     = 1024
+    record_application_tags = false
+    record_client_address   = false
   }
   default_labels = {
     env = var.environment
   }
   default_tier = var.environment == "production" ? "db-custom-2-8192" : "db-f1-micro"
 
-  backup_config = defaults(var.backup_config, local.default_backup_config)
-  labels        = merge(local.default_labels, var.labels)
-  storage_size  = var.storage_autoresize == true ? null : var.storage_size
-  tier          = var.tier != null ? var.tier : local.default_tier
+  backup_config   = defaults(var.backup_config, local.default_backup_config)
+  insights_config = defaults(var.insights_config, local.default_insights_config)
+
+  labels       = merge(local.default_labels, var.labels)
+  storage_size = var.storage_autoresize == true ? null : var.storage_size
+  tier         = var.tier != null ? var.tier : local.default_tier
 
   admin_user = "postgres"
+
+  # Helper vars for optional blocks. Will either be an empty set (no) or a
+  # single item set (yes)
+  needs_maintenance_window = var.primary_instance_name == null ? [] : [0]
 }

user.tf

@@ -4,6 +4,10 @@ resource "random_password" "admin_user" {
 
 resource "google_sql_user" "postgres_user" {
   instance = google_sql_database_instance.instance.name
+
   name     = local.admin_user
   password = random_password.admin_user.result
+  type     = "BUILT_IN"
+
+  deletion_policy = null
 }

variables.tf

@@ -1,18 +1,22 @@
 variable "authorized_networks" {
   type = list(object({
-    name    = string
-    network = string
+    name            = string
+    network         = string
+    expiration_time = optional(string)
   }))
   default = []
 }
 
 variable "backup_config" {
   type = object({
-    enabled  = optional(bool)
-    location = optional(string)
+    enabled                        = optional(bool)
+    start_time                     = optional(string)
+    point_in_time_recovery_enabled = optional(bool)
+    location                       = optional(string)
+    transaction_log_retention_days = optional(number)
+    retained_backups               = optional(number)
   })
-  default = {
-  }
+  default = {}
 }
 
 variable "database_version" {
@@ -49,16 +53,51 @@ variable "instance_name" {
   type = string
 }
 
+variable "insights_config" {
+  type = object({
+    query_insights_enabled  = bool
+    query_string_length     = optional(number)
+    record_application_tags = optional(bool)
+    record_client_address   = optional(bool)
+  })
+  default = {
+    query_insights_enabled = true
+  }
+}
+
+variable "ipv4_enabled" {
+  type    = bool
+  default = false
+}
+
 variable "labels" {
   type    = map(string)
   default = {}
 }
 
+variable "maintenance_window" {
+  type = object({
+    day          = number
+    hour         = number
+    update_track = optional(string)
+  })
+  default = {
+    day          = 1
+    hour         = 4
+    update_track = "stable"
+  }
+}
+
 variable "primary_instance_name" {
   type    = string
   default = null
 }
 
+variable "private_network" {
+  type    = string
+  default = null
+}
+
 variable "storage_autoresize" {
   type = bool
 }