Merge pull request #53 from ministryofjustice/revert-parameter-changes

Revert dynamic "parameter" changes
ministryofjustice · Mar 13, 2020 · 1c2666d · 1c2666d
2 parents 19dc44a + 967e42b
commit 1c2666d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/main.tf b/main.tf
@@ -127,13 +127,10 @@ resource "aws_db_parameter_group" "custom_parameters" {
   name   = local.identifier
   family = var.rds_family
 
-  dynamic "parameter" {
-    for_each = var.db_parameter
-    content {
-      apply_method = lookup(parameter.value, "apply_method", null)
-      name         = parameter.value.name
-      value        = parameter.value.value
-    }
+  parameter {
+    name         = "rds.force_ssl"
+    value        = var.force_ssl ? 1 : 0
+    apply_method = var.apply_method
   }
 }
 

diff --git a/variables.tf b/variables.tf
@@ -91,22 +91,6 @@ variable "ca_cert_identifier" {
   default     = "rds-ca-2019"
 }
 
-variable "db_parameter" {
-  type = list(object({
-    apply_method = string
-    name         = string
-    value        = string
-  }))
-  default = [
-    {
-      name         = "rds.force_ssl"
-      value        = "true"
-      apply_method = "immediate"
-    }
-  ]
-  description = "A list of DB parameters to apply. Note that parameters may differ from a DB family to another"
-}
-
 variable "performance_insights_enabled" {
   type        = bool
   description = "Enable performance insights for RDS?"