Merge branch 'main' into fix/maintenance-window

Evy Bongers · web-flow · commit 28186ddfa449 · 2022-01-04T16:06:52.000+01:00
diff --git a/instance.tf b/instance.tf
@@ -62,10 +62,10 @@ resource "google_sql_database_instance" "instance" {
       }
     }
 
-    location_preference {
-      follow_gae_application = null
-      zone                   = null
-    }
+    # location_preference {
+    #   follow_gae_application = null
+    #   zone                   = null
+    # }
 
     dynamic "maintenance_window" {
       for_each = local.needs_maintenance_window
diff --git a/user.tf b/user.tf
@@ -2,12 +2,12 @@ resource "random_password" "admin_user" {
   length = 48
 }
 
-resource "google_sql_user" "postgres_user" {
+resource "google_sql_user" "admin_user" {
   instance = google_sql_database_instance.instance.name
 
   name     = local.admin_user
   password = random_password.admin_user.result
-  type     = "BUILT_IN"
+  type     = "" # Equivalent of "BUILT_IN"
 
   deletion_policy = null
 }
diff --git a/variables.tf b/variables.tf
@@ -67,7 +67,7 @@ variable "insights_config" {
 
 variable "ipv4_enabled" {
   type    = bool
-  default = false
+  default = true
 }
 
 variable "labels" {

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ resource "google_sql_database_instance" "instance" {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- location_preference {`
`66`		`- follow_gae_application = null`
`67`		`- zone = null`
`68`		`- }`
	`65`	`+ # location_preference {`
	`66`	`+ # follow_gae_application = null`
	`67`	`+ # zone = null`
	`68`	`+ # }`
`69`	`69`
`70`	`70`	`dynamic "maintenance_window" {`
`71`	`71`	`for_each = local.needs_maintenance_window`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ resource "random_password" "admin_user" {`
`2`	`2`	`length = 48`
`3`	`3`	`}`
`4`	`4`
`5`		`-resource "google_sql_user" "postgres_user" {`
	`5`	`+resource "google_sql_user" "admin_user" {`
`6`	`6`	`instance = google_sql_database_instance.instance.name`
`7`	`7`
`8`	`8`	`name = local.admin_user`
`9`	`9`	`password = random_password.admin_user.result`
`10`		`- type = "BUILT_IN"`
	`10`	`+ type = "" # Equivalent of "BUILT_IN"`
`11`	`11`
`12`	`12`	`deletion_policy = null`
`13`	`13`	`}`