Merge pull request #16 from toussaints/feature/SRC-2736-update-rds-se…

…ttings Add optional parameters for RDS cluster, cluster instances and instances
coveo · Nov 5, 2018 · 713c108 · 713c108
2 parents 989a137 + cc13418
commit 713c108
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/rds_database_cluster/rds_database_cluster.tf b/rds_database_cluster/rds_database_cluster.tf
@@ -46,24 +46,26 @@ resource "aws_rds_cluster" "rds_db_cluster" {
   kms_key_id                          = "${lookup(var.optional_parameters, "kms_key_id", "")}"
   iam_database_authentication_enabled = "${lookup(var.optional_parameters, "iam_database_authentication_enabled", false)}"
   enabled_cloudwatch_logs_exports     = ["${var.enabled_cloudwatch_logs_exports}"]
+  deletion_protection                 = "${lookup(var.optional_parameters, "deletion_protection", false)}"
 
   tags = "${var.db_tags}"
 }
 
 resource "aws_rds_cluster_instance" "rds_db_cluster_instance" {
   cluster_identifier = "${aws_rds_cluster.rds_db_cluster.id}"
 
-  count                      = "${var.instances_count}"
-  identifier                 = "${lookup(var.optional_parameters, "cluster_instance_identifier", "${var.custom_identifier}")}-${count.index}"
-  instance_class             = "${lookup(var.optional_parameters, "instance_class", "db.r3.large")}"
-  publicly_accessible        = "${lookup(var.optional_parameters, "publicly_accessible", false)}"
-  db_subnet_group_name       = "${aws_db_subnet_group.db_subnet_group.name}"
-  db_parameter_group_name    = "${lookup(var.optional_parameters, "db_parameter_group_name", "")}"
-  apply_immediately          = "${lookup(var.optional_parameters, "apply_immediately", false)}"
-  monitoring_role_arn        = "${lookup(var.optional_parameters, "monitoring_role_arn", "")}"
-  monitoring_interval        = "${lookup(var.optional_parameters, "monitoring_interval", 0)}"
-  promotion_tier             = "${lookup(var.optional_parameters, "promotion_tier", 0)}"
-  auto_minor_version_upgrade = "${lookup(var.optional_parameters, "auto_minor_version_upgrade", true)}"
+  count                        = "${var.instances_count}"
+  identifier                   = "${lookup(var.optional_parameters, "cluster_instance_identifier", "${var.custom_identifier}")}-${count.index}"
+  instance_class               = "${lookup(var.optional_parameters, "instance_class", "db.r3.large")}"
+  publicly_accessible          = "${lookup(var.optional_parameters, "publicly_accessible", false)}"
+  db_subnet_group_name         = "${aws_db_subnet_group.db_subnet_group.name}"
+  db_parameter_group_name      = "${lookup(var.optional_parameters, "db_parameter_group_name", "")}"
+  apply_immediately            = "${lookup(var.optional_parameters, "apply_immediately", false)}"
+  monitoring_role_arn          = "${lookup(var.optional_parameters, "monitoring_role_arn", "")}"
+  monitoring_interval          = "${lookup(var.optional_parameters, "monitoring_interval", 0)}"
+  promotion_tier               = "${lookup(var.optional_parameters, "promotion_tier", 0)}"
+  auto_minor_version_upgrade   = "${lookup(var.optional_parameters, "auto_minor_version_upgrade", true)}"
+  performance_insights_enabled = "${lookup(var.optional_parameters, "performance_insights_enabled", false)}"
 
   tags = "${var.db_tags}"
 }
diff --git a/rds_database_instance/rds_database_instance.tf b/rds_database_instance/rds_database_instance.tf
@@ -60,4 +60,5 @@ resource "aws_db_instance" "rds_db_instance" {
   iam_database_authentication_enabled = "${lookup(var.optional_parameters, "iam_database_authentication_enabled", false)}"
   tags                                = "${var.db_tags}"
   enabled_cloudwatch_logs_exports     = ["${var.enabled_cloudwatch_logs_exports}"]
+  deletion_protection                 = "${lookup(var.optional_parameters, "deletion_protection", false)}"
 }