Merge pull request #11 from adrianlop/dbtags_and_replica

dbtags and replica support

Author: danawillow

examples/mysql-and-postgres/main.tf

@@ -34,8 +34,8 @@ data "google_client_config" "current" {}
 
 data "google_compute_subnetwork" "default-us-central1" {
   project = "${data.google_client_config.current.project}"
-  region = "${var.region}"
-  name   = "default"
+  region  = "${var.region}"
+  name    = "default"
 }
 
 resource "random_id" "name" {
@@ -47,12 +47,20 @@ module "mysql-db" {
   source           = "../../"
   name             = "example-mysql-${random_id.name.hex}"
   database_version = "MYSQL_5_6"
+
   ip_configuration = [{
     authorized_networks = [{
-      name = "default"
+      name  = "default"
       value = "${data.google_compute_subnetwork.default-us-central1.ip_cidr_range}"
     }]
   }]
+
+  database_flags = [
+    {
+      name  = "log_bin_trust_function_creators"
+      value = "on"
+    },
+  ]
 }
 
 module "postgresql-db" {
@@ -61,9 +69,10 @@ module "postgresql-db" {
   name             = "example-postgresql-${random_id.name.hex}"
   user_host        = ""
   database_version = "POSTGRES_9_6"
+
   ip_configuration = [{
     authorized_networks = [{
-      name = "default"
+      name  = "default"
       value = "${data.google_compute_subnetwork.default-us-central1.ip_cidr_range}"
     }]
   }]

main.tf

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-resource "google_sql_database_instance" "master" {
-  name             = "${var.name}"
-  project          = "${var.project}"
-  region           = "${var.region}"
-  database_version = "${var.database_version}"
+resource "google_sql_database_instance" "default" {
+  name                 = "${var.name}"
+  project              = "${var.project}"
+  region               = "${var.region}"
+  database_version     = "${var.database_version}"
+  master_instance_name = "${var.master_instance_name}"
 
   settings {
     tier                        = "${var.tier}"
@@ -33,15 +34,17 @@ resource "google_sql_database_instance" "master" {
     disk_type                   = "${var.disk_type}"
     pricing_plan                = "${var.pricing_plan}"
     replication_type            = "${var.replication_type}"
+    database_flags              = ["${var.database_flags}"]
   }
 
   replica_configuration = ["${var.replica_configuration}"]
 }
 
 resource "google_sql_database" "default" {
+  count     = "${var.master_instance_name == "" ? 1 : 0}"
   name      = "${var.db_name}"
   project   = "${var.project}"
-  instance  = "${google_sql_database_instance.master.name}"
+  instance  = "${google_sql_database_instance.default.name}"
   charset   = "${var.db_charset}"
   collation = "${var.db_collation}"
 }
@@ -51,9 +54,10 @@ resource "random_id" "user-password" {
 }
 
 resource "google_sql_user" "default" {
+  count    = "${var.master_instance_name == "" ? 1 : 0}"
   name     = "${var.user_name}"
   project  = "${var.project}"
-  instance = "${google_sql_database_instance.master.name}"
+  instance = "${google_sql_database_instance.default.name}"
   host     = "${var.user_host}"
   password = "${var.user_password == "" ? random_id.user-password.hex : var.user_password}"
 }

outputs.tf

@@ -16,22 +16,22 @@
 
 output instance_name {
   description = "The name of the database instance"
-  value       = "${google_sql_database_instance.master.name}"
+  value       = "${google_sql_database_instance.default.name}"
 }
 
 output instance_address {
   description = "The IPv4 address of the master database instnace"
-  value       = "${google_sql_database_instance.master.ip_address.0.ip_address}"
+  value       = "${google_sql_database_instance.default.ip_address.0.ip_address}"
 }
 
 output instance_address_time_to_retire {
   description = "The time the master instance IP address will be reitred. RFC 3339 format."
-  value       = "${google_sql_database_instance.master.ip_address.0.time_to_retire}"
+  value       = "${google_sql_database_instance.default.ip_address.0.time_to_retire}"
 }
 
 output self_link {
   description = "Self link to the master instance"
-  value       = "${google_sql_database_instance.master.self_link}"
+  value       = "${google_sql_database_instance.default.self_link}"
 }
 
 output generated_user_password {

variables.tf

@@ -33,6 +33,11 @@ variable database_version {
   default     = "MYSQL_5_6"
 }
 
+variable master_instance_name {
+  description = "The name of the master instance to replicate"
+  default     = ""
+}
+
 variable tier {
   description = "The machine tier (First Generation) or type (Second Generation). See this page for supported tiers and pricing: https://cloud.google.com/sql/pricing"
   default     = "db-f1-micro"
@@ -49,7 +54,7 @@ variable db_charset {
 }
 
 variable db_collation {
-  description = "The collation for the default database. Example for MySQL databases: 'utf8', and Postgres: 'en_US.UTF8'"
+  description = "The collation for the default database. Example for MySQL databases: 'utf8_general_ci', and Postgres: 'en_US.UTF8'"
   default     = ""
 }
 
@@ -104,6 +109,11 @@ variable replication_type {
   default     = "SYNCHRONOUS"
 }
 
+variable database_flags {
+  description = "List of Cloud SQL flags that are applied to the database server"
+  default     = []
+}
+
 variable backup_configuration {
   description = "The backup_configuration settings subblock for the database setings"
   type        = "map"