Merge pull request #200 from tablexi/va-simplify-parameter-groups-for…

…-database_replica Simplify handling of parameter groups in aws/database_replica
tablexi · Mar 18, 2021 · 6fd6b10 · 6fd6b10
2 parents b1e0b70 + 16f02d3
commit 6fd6b10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/aws/database_replica/main.tf b/aws/database_replica/main.tf
@@ -3,27 +3,15 @@ data "aws_db_instance" "source_database" {
 }
 
 locals {
-  allocated_storage = data.aws_db_instance.source_database.allocated_storage
-  engine            = data.aws_db_instance.source_database.engine
-  engine_nickname   = local.is_postgres ? "pg" : "mysql"
-  engine_version    = var.engine_version != "" ? var.engine_version : data.aws_db_instance.source_database.engine_version
-  family            = "${local.engine}${local.major_engine_version}"
-  is_postgres       = local.engine == "postgres" ? true : false
-  major_engine_version = join(
-    ".",
-    slice(
-      split(".", local.engine_version),
-      0,
-      local.major_engine_version_return,
-    ),
-  )
-  major_engine_version_return = length(split(".", local.engine_version)) > 1 ? 2 : 1
-  parameter_group_name        = var.parameter_group_name != "" ? var.parameter_group_name : "default.${local.engine}${local.major_engine_version}"
-  port                        = local.is_postgres ? 5432 : 3306
-  sg_on_rds_instance_name     = "rds-${var.name}_${var.env}-${local.engine_nickname}"
-  source_db                   = data.aws_db_instance.source_database.id
-  storage_encrypted           = data.aws_db_instance.source_database.storage_encrypted
-  storage_type                = var.storage_type != "" ? var.storage_type : data.aws_db_instance.source_database.storage_type
+  allocated_storage       = data.aws_db_instance.source_database.allocated_storage
+  engine                  = data.aws_db_instance.source_database.engine
+  engine_nickname         = local.is_postgres ? "pg" : "mysql"
+  is_postgres             = local.engine == "postgres" ? true : false
+  port                    = local.is_postgres ? 5432 : 3306
+  sg_on_rds_instance_name = "rds-${var.name}_${var.env}-${local.engine_nickname}"
+  source_db               = data.aws_db_instance.source_database.id
+  storage_encrypted       = data.aws_db_instance.source_database.storage_encrypted
+  storage_type            = var.storage_type != "" ? var.storage_type : data.aws_db_instance.source_database.storage_type
 }
 
 resource "aws_db_instance" "mod" {
@@ -33,15 +21,15 @@ resource "aws_db_instance" "mod" {
   auto_minor_version_upgrade  = var.auto_minor_version_upgrade
   backup_retention_period     = var.backup_retention_period
   engine                      = local.engine
-  engine_version              = local.engine_version
+  engine_version              = data.aws_db_instance.source_database.engine_version
   final_snapshot_identifier   = "${var.name}-${var.env}-${local.engine}-final-snapshot"
   identifier                  = var.identifier != "" ? var.identifier : "${var.name}-${var.env}-${local.engine}"
   instance_class              = var.node_type
   iops                        = var.iops
   monitoring_interval         = var.monitoring_interval
   monitoring_role_arn         = var.monitoring_interval == 0 ? "" : aws_iam_role.rds_enhanced_monitoring[0].arn
   multi_az                    = var.multi_az
-  parameter_group_name        = local.parameter_group_name
+  parameter_group_name        = data.aws_db_instance.source_database.db_parameter_groups[0]
   publicly_accessible         = var.publicly_accessible
   replicate_source_db         = local.source_db
   skip_final_snapshot         = var.skip_final_snapshot

diff --git a/aws/database_replica/outputs.tf b/aws/database_replica/outputs.tf
@@ -6,10 +6,6 @@ output "env" {
   value = var.env
 }
 
-output "family" {
-  value = local.family
-}
-
 output "name" {
   value = var.name
 }

diff --git a/aws/database_replica/variables.tf b/aws/database_replica/variables.tf
@@ -13,11 +13,6 @@ variable "env" {
   default     = "production"
 }
 
-variable "engine_version" {
-  description = "Engine version. Defaults to the version of the source database."
-  default     = ""
-}
-
 variable "identifier" {
   description = "Set the identifier for the instance"
   default     = ""