Move users/databases to for_each

examples/mysql-ha/main.tf

@@ -140,8 +140,6 @@ module "mysql" {
 
   additional_databases = [
     {
-      project   = var.project_id
-      instance  = local.instance_name
       name      = "${var.mysql_ha_name}-additional"
       charset   = "utf8mb4"
       collation = "utf8mb4_general_ci"
@@ -153,18 +151,14 @@ module "mysql" {
 
   additional_users = [
     {
-      project  = var.project_id
       name     = "tftest2"
       password = "abcdefg"
       host     = "localhost"
-      instance = local.instance_name
     },
     {
-      project  = var.project_id
       name     = "tftest3"
       password = "abcdefg"
       host     = "localhost"
-      instance = local.instance_name
     },
   ]
 }

examples/mysql-private/main.tf

@@ -74,18 +74,14 @@ module "safer-mysql-db" {
   // Cloud SQL proxy.
   additional_users = [
     {
-      project  = var.project_id
       name     = "app"
       password = "PaSsWoRd"
       host     = "localhost"
-      instance = local.instance_name
     },
     {
-      project  = var.project_id
       name     = "readonly"
       password = "PaSsWoRd"
       host     = "localhost"
-      instance = local.instance_name
     },
   ]
 

examples/postgresql-ha/main.tf

@@ -142,8 +142,6 @@ module "pg" {
       name      = "${var.pg_ha_name}-additional"
       charset   = "UTF8"
       collation = "en_US.UTF8"
-      instance  = local.instance_name
-      project   = var.project_id
     },
   ]
 
@@ -152,18 +150,14 @@ module "pg" {
 
   additional_users = [
     {
-      project  = var.project_id
       name     = "tftest2"
       password = "abcdefg"
       host     = "localhost"
-      instance = local.instance_name
     },
     {
-      project  = var.project_id
       name     = "tftest3"
       password = "abcdefg"
       host     = "localhost"
-      instance = local.instance_name
     },
   ]
 }

modules/mysql/main.tf

@@ -23,6 +23,9 @@ locals {
     disabled = {}
   }
 
+  databases = { for db in var.additional_databases : db.name => db }
+  users     = { for u in var.additional_users : u.name => u }
+
   // HA method using REGIONAL availability_type requires binary logs to be enabled
   binary_log_enabled = var.availability_type == "REGIONAL" ? true : lookup(var.backup_configuration, "binary_log_enabled", null)
   backups_enabled    = var.availability_type == "REGIONAL" ? true : lookup(var.backup_configuration, "enabled", null)
@@ -117,11 +120,11 @@ resource "google_sql_database" "default" {
 }
 
 resource "google_sql_database" "additional_databases" {
-  count      = length(var.additional_databases)
+  for_each   = local.databases
   project    = var.project_id
-  name       = var.additional_databases[count.index]["name"]
-  charset    = lookup(var.additional_databases[count.index], "charset", null)
-  collation  = lookup(var.additional_databases[count.index], "collation", null)
+  name       = each.value.name
+  charset    = lookup(each.value, "charset", null)
+  collation  = lookup(each.value, "collation", null)
   instance   = google_sql_database_instance.default.name
   depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
@@ -145,15 +148,11 @@ resource "google_sql_user" "default" {
 }
 
 resource "google_sql_user" "additional_users" {
-  count   = length(var.additional_users)
-  project = var.project_id
-  name    = var.additional_users[count.index]["name"]
-  password = lookup(
-    var.additional_users[count.index],
-    "password",
-    random_id.user-password.hex,
-  )
-  host       = lookup(var.additional_users[count.index], "host", var.user_host)
+  for_each   = local.users
+  project    = var.project_id
+  name       = each.value.name
+  password   = lookup(each.value, "password", random_id.user-password.hex)
+  host       = lookup(each.value, "host", var.user_host)
   instance   = google_sql_database_instance.default.name
   depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
 }

modules/mysql/variables.tf

@@ -471,11 +471,9 @@ variable "db_collation" {
 variable "additional_databases" {
   description = "A list of databases to be created in your cluster"
   type = list(object({
-    project   = string
     name      = string
     charset   = string
     collation = string
-    instance  = string
   }))
   default = []
 }
@@ -501,11 +499,9 @@ variable "user_password" {
 variable "additional_users" {
   description = "A list of users to be created in your cluster"
   type = list(object({
-    project  = string
     name     = string
     password = string
     host     = string
-    instance = string
   }))
   default = []
 }

modules/postgresql/main.tf

@@ -21,6 +21,9 @@ locals {
     enabled  = var.ip_configuration
     disabled = {}
   }
+
+  databases = { for db in var.additional_databases : db.name => db }
+  users     = { for u in var.additional_users : u.name => u }
 }
 
 resource "google_sql_database_instance" "default" {
@@ -112,11 +115,11 @@ resource "google_sql_database" "default" {
 }
 
 resource "google_sql_database" "additional_databases" {
-  count      = length(var.additional_databases)
+  for_each   = local.databases
   project    = var.project_id
-  name       = var.additional_databases[count.index]["name"]
-  charset    = lookup(var.additional_databases[count.index], "charset", "")
-  collation  = lookup(var.additional_databases[count.index], "collation", "")
+  name       = each.value.name
+  charset    = lookup(each.value, "charset", null)
+  collation  = lookup(each.value, "collation", null)
   instance   = google_sql_database_instance.default.name
   depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
@@ -139,14 +142,10 @@ resource "google_sql_user" "default" {
 }
 
 resource "google_sql_user" "additional_users" {
-  count   = length(var.additional_users)
-  project = var.project_id
-  name    = var.additional_users[count.index]["name"]
-  password = lookup(
-    var.additional_users[count.index],
-    "password",
-    random_id.user-password.hex,
-  )
+  for_each   = local.users
+  project    = var.project_id
+  name       = each.value.name
+  password   = lookup(each.value, "password", random_id.user-password.hex)
   instance   = google_sql_database_instance.default.name
   depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
 }

modules/postgresql/variables.tf

@@ -304,11 +304,9 @@ variable "db_collation" {
 variable "additional_databases" {
   description = "A list of databases to be created in your cluster"
   type = list(object({
-    project   = string
     name      = string
     charset   = string
     collation = string
-    instance  = string
   }))
   default = []
 }
@@ -328,11 +326,8 @@ variable "user_password" {
 variable "additional_users" {
   description = "A list of users to be created in your cluster"
   type = list(object({
-    project  = string
     name     = string
     password = string
-    host     = string
-    instance = string
   }))
   default = []
 }

modules/safer_mysql/variables.tf

@@ -432,11 +432,9 @@ variable "db_collation" {
 variable "additional_databases" {
   description = "A list of databases to be created in your cluster"
   type = list(object({
-    project   = string
     name      = string
     charset   = string
     collation = string
-    instance  = string
   }))
   default = []
 }
@@ -456,11 +454,9 @@ variable "user_password" {
 variable "additional_users" {
   description = "A list of users to be created in your cluster"
   type = list(object({
-    project  = string
     name     = string
     password = string
     host     = string
-    instance = string
   }))
   default = []
 }