Merge pull request #38 from thefirstofthe300/ds/patch

fix: settings.0.ip_configuration: expected a list

Author: morgante

modules/mysql/main.tf

@@ -19,8 +19,8 @@ locals {
   ip_configuration_enabled = "${length(keys(var.ip_configuration)) > 0 ? true : false}"
 
   ip_configurations = {
-    enabled  = "${list(var.ip_configuration)}"
-    disabled = "${list()}"
+    enabled  = "${var.ip_configuration}"
+    disabled = "${map()}"
   }
 }
 

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            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
+    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

@@ -111,7 +111,10 @@ EOF
 
 variable "ip_configuration" {
   description = "The ip configuration for the master instance."
-  default     = {}
+
+  default = {
+    ipv4_enabled = "true"
+  }
 }
 
 // Read Replicas

modules/postgresql/main.tf

@@ -18,8 +18,8 @@ locals {
   ip_configuration_enabled = "${length(keys(var.ip_configuration)) > 0 ? true : false}"
 
   ip_configurations = {
-    enabled  = "${list(var.ip_configuration)}"
-    disabled = "${list()}"
+    enabled  = "${var.ip_configuration}"
+    disabled = "${map()}"
   }
 }
 

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            = "${local.ip_configurations["${local.ip_configuration_enabled ? "enabled" : "disabled"}"]}"
+    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

@@ -115,7 +115,10 @@ variable "authorized_gae_applications" {
 
 variable "ip_configuration" {
   description = "The ip configuration for the master instances."
-  default     = {}
+
+  default = {
+    ipv4_enabled = "true"
+  }
 }
 
 variable "read_replica_size" {

test/fixtures/postgresql-ha/main.tf

@@ -114,6 +114,10 @@ module "pg" {
   user_password = "foobar"
 
   additional_users = [
+    {
+      name     = "tftest1"
+      password = "raboof"
+    },
     {
       name     = "tftest2"
       password = "abcdefg"