feat: Add location support to backup_configuration block (#126)

terraform-google-modules · Aug 10, 2020 · aa907bd · aa907bd
1 parent 2bd0f41
commit aa907bd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 0 deletions.
diff --git a/examples/mysql-ha/main.tf b/examples/mysql-ha/main.tf
@@ -80,6 +80,7 @@ module "mysql" {
     enabled            = true
     binary_log_enabled = true
     start_time         = "20:55"
+    location           = null
   }
 
   // Read replica configurations

diff --git a/examples/postgresql-ha/main.tf b/examples/postgresql-ha/main.tf
@@ -77,6 +77,7 @@ module "pg" {
   backup_configuration = {
     enabled    = true
     start_time = "20:55"
+    location   = null
   }
 
   // Read replica configurations

diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf
@@ -58,6 +58,7 @@ resource "google_sql_database_instance" "default" {
         binary_log_enabled = local.binary_log_enabled
         enabled            = local.backups_enabled
         start_time         = lookup(backup_configuration.value, "start_time", null)
+        location           = lookup(backup_configuration.value, "location", null)
       }
     }
     dynamic "ip_configuration" {

diff --git a/modules/mysql/variables.tf b/modules/mysql/variables.tf
@@ -137,11 +137,13 @@ variable "backup_configuration" {
     binary_log_enabled = bool
     enabled            = bool
     start_time         = string
+    location           = string
   })
   default = {
     binary_log_enabled = false
     enabled            = false
     start_time         = null
+    location           = null
   }
 }
 

diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf
@@ -53,6 +53,7 @@ resource "google_sql_database_instance" "default" {
         binary_log_enabled = false
         enabled            = lookup(backup_configuration.value, "enabled", null)
         start_time         = lookup(backup_configuration.value, "start_time", null)
+        location           = lookup(backup_configuration.value, "location", null)
       }
     }
     dynamic "ip_configuration" {

diff --git a/modules/postgresql/variables.tf b/modules/postgresql/variables.tf
@@ -127,10 +127,12 @@ variable "backup_configuration" {
   type = object({
     enabled    = bool
     start_time = string
+    location   = string
   })
   default = {
     enabled    = false
     start_time = null
+    location   = null
   }
 }
 

diff --git a/modules/safer_mysql/variables.tf b/modules/safer_mysql/variables.tf
@@ -141,11 +141,13 @@ variable "backup_configuration" {
     binary_log_enabled = bool
     enabled            = bool
     start_time         = string
+    location           = string
   })
   default = {
     binary_log_enabled = false
     enabled            = false
     start_time         = null
+    location           = null
   }
 }