Merge branch 'master' into feature/add-postgres-point-in-time-recovery-backup-config

modules/cloud-sql/main.tf

@@ -64,9 +64,10 @@ resource "google_sql_database_instance" "master" {
     }
 
     backup_configuration {
-      binary_log_enabled = local.actual_binary_log_enabled
+      binary_log_enabled             = local.actual_binary_log_enabled
-      enabled            = var.backup_enabled
+      enabled                        = var.backup_enabled
-      start_time         = var.backup_start_time
+      start_time                     = var.backup_start_time
+      point_in_time_recovery_enabled = var.point_in_time_recovery_enabled
     }
 
     maintenance_window {

modules/cloud-sql/variables.tf

@@ -87,6 +87,12 @@ variable "backup_start_time" {
   default     = "04:00"
 }
 
+variable "point_in_time_recovery_enabled" {
+  description = "Will restart database if enabled after instance creation. Valid only for PostgreSQL instances."
+  type        = bool
+  default     = false
+}
+
 variable "mysql_binary_log_enabled" {
   description = "Set to false if you want to disable binary logs - only applicable to MySQL. Note, when using failover or read replicas, master and existing backups need to have binary_log_enabled=true set."
   type        = bool