drop changes in google_sql_database and google_sql_user

Author: namusyaka

modules/mysql/README.md

@@ -11,7 +11,9 @@
 | backup_configuration | The backup configuration block of the Cloud SQL resources This argument will be passed through the master instance directrly.<br><br>See [more details](https://www.terraform.io/docs/providers/google/r/sql_database_instance.html). | map | `<map>` | no |
 | database_flags | The database flags for the master instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags) | list | `<list>` | no |
 | database_version | The database version to use | string | - | yes |
-| databases | The list of databases for the instacne | list | `<list>` | no |
+| db_charset | The charset for the default database | string | `` | no |
+| db_collation | The collation for the default database. Example: 'utf8_general_ci' | string | `` | no |
+| db_name | The name of the default database to create | string | `default` | no |
 | disk_autoresize | Configuration to increase storage size | string | `true` | no |
 | disk_size | The disk size for the master instance | string | `10` | no |
 | disk_type | The disk type for the master instance. | string | `PD_SSD` | no |
@@ -58,18 +60,16 @@
 | read_replica_zones | The zones for the read replica instancess, it should be something like: `a,b,c`. Given zones are used rotationally for creating read replicas. | string | `` | no |
 | region | The region of the Cloud SQL resources | string | `us-central1` | no |
 | tier | The tier for the master instance. | string | `db-n1-standard-1` | no |
+| user_host | The host for the default user | string | `%` | no |
 | user_labels | The key/value labels for the master instances. | map | `<map>` | no |
-| users | The list of users on the database | list | `<list>` | no |
+| user_name | The name of the default user | string | `default` | no |
+| user_password | The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable. | string | `` | no |
 | zone | The zone for the master instance, it should be something like: `a`, `c`. | string | - | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| database_charsets | The list of database charsets |
-| database_collation | The list of database collations |
-| database_names | The list of database names |
-| database_self_links | The URIs of the databases |
 | failover-replica_instance_connection_name | The connection name of the failover-replica instance to be used in connection strings |
 | failover-replica_instance_first_ip_address | The first IPv4 address of the addesses assigned for the failover-replica instance |
 | failover-replica_instance_name | The instance name for the failover replica instance |
@@ -90,8 +90,5 @@
 | replicas_instance_self_links | The URIs of the replica instances |
 | replicas_instance_server_ca_certs | The CA certificates information used to connect to the replica instances via SSL |
 | replicas_instance_service_account_email_addresses | The service account email addresses assigned to the replica instances |
-| user_hosts | The list of user hosts for the database |
-| user_names | The list of user names for the database |
-| user_passwords | The list of user passwords for the database |
 
 [^]: (autogen_docs_end)

modules/mysql/main.tf

@@ -15,7 +15,13 @@
  */
 
 locals {
-  default_user_host = "%"
+  default_user_host        = "%"
+  ip_configuration_enabled = "${length(keys(var.ip_configuration)) > 0 ? true : false}"
+
+  ip_configurations = {
+    enabled  = "${list(var.ip_configuration)}"
+    disabled = "${list()}"
+  }
 }
 
 resource "google_sql_database_instance" "default" {
@@ -29,7 +35,7 @@ resource "google_sql_database_instance" "default" {
     activation_policy           = "${var.activation_policy}"
     authorized_gae_applications = ["${var.authorized_gae_applications}"]
     backup_configuration        = ["${var.backup_configuration}"]
-    ip_configuration            = ["${var.ip_configuration}"]
+    ip_configuration            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
 
     disk_autoresize = "${var.disk_autoresize}"
 
@@ -55,13 +61,12 @@ resource "google_sql_database_instance" "default" {
   }
 }
 
-resource "google_sql_database" "databases" {
-  count      = "${length(var.databases)}"
+resource "google_sql_database" "default" {
+  name       = "${var.db_name}"
   project    = "${var.project_id}"
-  name       = "${lookup(var.databases[count.index], "name")}"
-  charset    = "${lookup(var.databases[count.index], "charset", "utf8mb4")}"
-  collation  = "${lookup(var.databases[count.index], "collation", "utf8mb4_general_ci")}"
   instance   = "${google_sql_database_instance.default.name}"
+  charset    = "${var.db_charset}"
+  collation  = "${var.db_collation}"
   depends_on = ["google_sql_database_instance.default"]
 }
 
@@ -74,12 +79,11 @@ resource "random_id" "user-password" {
   depends_on  = ["google_sql_database_instance.default"]
 }
 
-resource "google_sql_user" "users" {
-  count      = "${length(var.users)}"
+resource "google_sql_user" "default" {
+  name       = "${var.user_name}"
   project    = "${var.project_id}"
   instance   = "${google_sql_database_instance.default.name}"
-  name       = "${lookup(var.users[count.index], "name")}"
-  password   = "${lookup(var.users[count.index], "password", random_id.user-password.hex)}"
-  host       = "${lookup(var.users[count.index], "host", local.default_user_host)}"
+  host       = "${var.user_host}"
+  password   = "${var.user_password == "" ? random_id.user-password.hex : var.user_password}"
   depends_on = ["google_sql_database_instance.default"]
 }

modules/mysql/outputs.tf

@@ -112,41 +112,6 @@ output "failover-replica_instance_name" {
   description = "The instance name for the failover replica instance"
 }
 
-output "user_names" {
-  value       = ["${google_sql_user.users.*.name}"]
-  description = "The list of user names for the database"
-}
-
-output "user_passwords" {
-  value       = ["${google_sql_user.users.*.password}"]
-  description = "The list of user passwords for the database"
-}
-
-output "user_hosts" {
-  value       = ["${google_sql_user.users.*.host}"]
-  description = "The list of user hosts for the database"
-}
-
-output "database_names" {
-  value       = ["${google_sql_database.databases.*.name}"]
-  description = "The list of database names"
-}
-
-output "database_charsets" {
-  value       = ["${google_sql_database.databases.*.charset}"]
-  description = "The list of database charsets"
-}
-
-output "database_collation" {
-  value       = ["${google_sql_database.databases.*.collation}"]
-  description = "The list of database collations"
-}
-
-output "database_self_links" {
-  value       = ["${google_sql_database.databases.*.self_link}"]
-  description = "The URIs of the databases"
-}
-
 output "generated_user_password" {
   description = "The auto generated default user password if not input password was provided"
   value       = "${random_id.user-password.hex}"

modules/mysql/read_replica.tf

@@ -41,7 +41,7 @@ resource "google_sql_database_instance" "replicas" {
   settings {
     tier                        = "${var.read_replica_tier}"
     activation_policy           = "${var.read_replica_activation_policy}"
-    ip_configuration            = ["${var.read_replica_ip_configuration}"]
+    ip_configuration            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
     authorized_gae_applications = ["${var.authorized_gae_applications}"]
 
     crash_safe_replication = "${var.read_replica_crash_safe_replication}"

modules/mysql/variables.tf

@@ -288,14 +288,32 @@ variable "failover_replica_ip_configuration" {
   default     = {}
 }
 
-// for google_sql_database
-variable "databases" {
-  default     = []
-  description = "The list of databases for the instacne"
+variable "db_name" {
+  description = "The name of the default database to create"
+  default     = "default"
 }
 
-// for google_sql_user
-variable "users" {
-  default     = []
-  description = "The list of users on the database"
+variable "db_charset" {
+  description = "The charset for the default database"
+  default     = ""
+}
+
+variable "db_collation" {
+  description = "The collation for the default database. Example: 'utf8_general_ci'"
+  default     = ""
+}
+
+variable "user_name" {
+  description = "The name of the default user"
+  default     = "default"
+}
+
+variable "user_host" {
+  description = "The host for the default user"
+  default     = "%"
+}
+
+variable "user_password" {
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+  default     = ""
 }

modules/postgresql/README.md

@@ -12,7 +12,9 @@
 | backup_configuration | The backup configuration block of the Cloud SQL resources This argument will be passed through the master instance directrly.<br><br>See [more details](https://www.terraform.io/docs/providers/google/r/sql_database_instance.html). | map | `<map>` | no |
 | database_flags | The database flags for the master instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags) | list | `<list>` | no |
 | database_version | The database version to use | string | - | yes |
-| databases | The list of databases for the instacne | list | `<list>` | no |
+| db_charset | The charset for the default database | string | `` | no |
+| db_collation | The collation for the default database. Example: 'en_US.UTF8' | string | `` | no |
+| db_name | The name of the default database to create | string | `default` | no |
 | disk_autoresize | Configuration to increase storage size. | string | `true` | no |
 | disk_size | The disk size for the master instance. | string | `10` | no |
 | disk_type | The disk type for the master instance. | string | `PD_SSD` | no |
@@ -43,18 +45,16 @@
 | read_replica_zones | The zones for the read replica instancess, it should be something like: `a,b,c`. Given zones are used rotationally for creating read replicas. | string | `` | no |
 | region | The region of the Cloud SQL resources | string | `us-central1` | no |
 | tier | The tier for the master instance. | string | `db-f1-micro` | no |
+| user_host | The host for the default user | string | `%` | no |
 | user_labels | The key/value labels for the master instances. | map | `<map>` | no |
-| users | The list of users on the database | list | `<list>` | no |
+| user_name | The name of the default user | string | `default` | no |
+| user_password | The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable. | string | `` | no |
 | zone | The zone for the master instance, it should be something like: `a`, `c`. | string | - | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| database_charsets | The list of database charsets |
-| database_collation | The list of database collations |
-| database_names | The list of database names |
-| database_self_links | The URIs of the databases |
 | generated_user_password | The auto generated default user password if not input password was provided |
 | instance_address | The IPv4 addesses assigned for the master instance |
 | instance_connection_name | The connection name of the master instance to be used in connection strings |
@@ -69,8 +69,5 @@
 | replicas_instance_self_links | The URIs of the replica instances |
 | replicas_instance_server_ca_certs | The CA certificates information used to connect to the replica instances via SSL |
 | replicas_instance_service_account_email_addresses | The service account email addresses assigned to the replica instances |
-| user_hosts | The list of user hosts for the database |
-| user_names | The list of user names for the database |
-| user_passwords | The list of user passwords for the database |
 
 [^]: (autogen_docs_end)

modules/postgresql/main.tf

@@ -15,7 +15,13 @@
  */
 
 locals {
-  default_user_host = ""
+  default_user_host        = ""
+  ip_configuration_enabled = "${length(keys(var.ip_configuration)) > 0 ? true : false}"
+
+  ip_configurations = {
+    enabled  = "${list(var.ip_configuration)}"
+    disabled = "${list()}"
+  }
 }
 
 resource "google_sql_database_instance" "default" {
@@ -30,7 +36,7 @@ resource "google_sql_database_instance" "default" {
     availability_type           = "${var.availability_type}"
     authorized_gae_applications = ["${var.authorized_gae_applications}"]
     backup_configuration        = ["${var.backup_configuration}"]
-    ip_configuration            = ["${var.ip_configuration}"]
+    ip_configuration            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
 
     disk_autoresize = "${var.disk_autoresize}"
     disk_size       = "${var.disk_size}"
@@ -55,13 +61,12 @@ resource "google_sql_database_instance" "default" {
   }
 }
 
-resource "google_sql_database" "databases" {
-  count      = "${length(var.databases)}"
+resource "google_sql_database" "default" {
+  name       = "${var.db_name}"
   project    = "${var.project_id}"
-  name       = "${lookup(var.databases[count.index], "name")}"
-  charset    = "${lookup(var.databases[count.index], "charset", "UTF8")}"
-  collation  = "${lookup(var.databases[count.index], "collation", "en_US.UTF8")}"
   instance   = "${google_sql_database_instance.default.name}"
+  charset    = "${var.db_charset}"
+  collation  = "${var.db_collation}"
   depends_on = ["google_sql_database_instance.default"]
 }
 
@@ -74,12 +79,11 @@ resource "random_id" "user-password" {
   depends_on  = ["google_sql_database_instance.default"]
 }
 
-resource "google_sql_user" "users" {
-  count      = "${length(var.users)}"
+resource "google_sql_user" "default" {
+  name       = "${var.user_name}"
   project    = "${var.project_id}"
   instance   = "${google_sql_database_instance.default.name}"
-  name       = "${lookup(var.users[count.index], "name")}"
-  password   = "${lookup(var.users[count.index], "password", random_id.user-password.hex)}"
-  host       = "${lookup(var.users[count.index], "host", local.default_user_host)}"
+  host       = "${var.user_host}"
+  password   = "${var.user_password == "" ? random_id.user-password.hex : var.user_password}"
   depends_on = ["google_sql_database_instance.default"]
 }

modules/postgresql/outputs.tf

@@ -81,41 +81,6 @@ output "read_replica_instance_names" {
   description = "The instance names for the read replica instances"
 }
 
-output "user_names" {
-  value       = ["${google_sql_user.users.*.name}"]
-  description = "The list of user names for the database"
-}
-
-output "user_passwords" {
-  value       = ["${google_sql_user.users.*.password}"]
-  description = "The list of user passwords for the database"
-}
-
-output "user_hosts" {
-  value       = ["${google_sql_user.users.*.host}"]
-  description = "The list of user hosts for the database"
-}
-
-output "database_names" {
-  value       = ["${google_sql_database.databases.*.name}"]
-  description = "The list of database names"
-}
-
-output "database_charsets" {
-  value       = ["${google_sql_database.databases.*.charset}"]
-  description = "The list of database charsets"
-}
-
-output "database_collation" {
-  value       = ["${google_sql_database.databases.*.collation}"]
-  description = "The list of database collations"
-}
-
-output "database_self_links" {
-  value       = ["${google_sql_database.databases.*.self_link}"]
-  description = "The URIs of the databases"
-}
-
 output "generated_user_password" {
   description = "The auto generated default user password if not input password was provided"
   value       = "${random_id.user-password.hex}"

modules/postgresql/read_replica.tf

@@ -43,7 +43,7 @@ resource "google_sql_database_instance" "replicas" {
     activation_policy           = "${var.read_replica_activation_policy}"
     authorized_gae_applications = ["${var.authorized_gae_applications}"]
     availability_type           = "${var.read_replica_availability_type}"
-    ip_configuration            = ["${var.read_replica_ip_configuration}"]
+    ip_configuration            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
 
     crash_safe_replication = "${var.read_replica_crash_safe_replication}"
     disk_autoresize        = "${var.read_replica_disk_autoresize}"

modules/postgresql/variables.tf

@@ -208,14 +208,32 @@ variable "read_replica_ip_configuration" {
   default     = {}
 }
 
-// for google_sql_database
-variable "databases" {
-  default     = []
-  description = "The list of databases for the instacne"
+variable "db_name" {
+  description = "The name of the default database to create"
+  default     = "default"
 }
 
-// for google_sql_user
-variable "users" {
-  default     = []
-  description = "The list of users on the database"
+variable "db_charset" {
+  description = "The charset for the default database"
+  default     = ""
+}
+
+variable "db_collation" {
+  description = "The collation for the default database. Example: 'en_US.UTF8'"
+  default     = ""
+}
+
+variable "user_name" {
+  description = "The name of the default user"
+  default     = "default"
+}
+
+variable "user_host" {
+  description = "The host for the default user"
+  default     = "%"
+}
+
+variable "user_password" {
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+  default     = ""
 }