fix: remove duplicated instance just for sqlserver, we can handle as one flattened resource

Author: bryantbiggs

main.tf

@@ -77,7 +77,6 @@ module "db_instance" {
   storage_encrypted = var.storage_encrypted
   kms_key_id        = var.kms_key_id
   license_model     = var.license_model
-  replica_mode      = var.replica_mode
 
   db_name                             = var.db_name
   username                            = var.username
@@ -113,6 +112,7 @@ module "db_instance" {
   performance_insights_kms_key_id       = var.performance_insights_enabled ? var.performance_insights_kms_key_id : null
 
   replicate_source_db         = var.replicate_source_db
+  replica_mode                = var.replica_mode
   backup_retention_period     = var.backup_retention_period
   backup_window               = var.backup_window
   max_allocated_storage       = var.max_allocated_storage

modules/db_instance/README.md

@@ -25,7 +25,6 @@ No modules.
 | Name | Type |
 |------|------|
 | [aws_db_instance.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance) | resource |
-| [aws_db_instance.this_mssql](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance) | resource |
 | [aws_iam_role.enhanced_monitoring](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy_attachment.enhanced_monitoring](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [random_id.snapshot_identifier](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |

modules/db_instance/main.tf

@@ -38,7 +38,6 @@ resource "aws_db_instance" "this" {
   storage_encrypted = var.storage_encrypted
   kms_key_id        = var.kms_key_id
   license_model     = var.license_model
-  replica_mode      = var.replica_mode
 
   db_name                             = var.db_name
   username                            = local.username
@@ -74,13 +73,15 @@ resource "aws_db_instance" "this" {
   performance_insights_kms_key_id       = var.performance_insights_enabled ? var.performance_insights_kms_key_id : null
 
   replicate_source_db     = var.replicate_source_db
+  replica_mode            = var.replica_mode
   backup_retention_period = var.backup_retention_period
   backup_window           = var.backup_window
   max_allocated_storage   = var.max_allocated_storage
   monitoring_interval     = var.monitoring_interval
   monitoring_role_arn     = var.monitoring_interval > 0 ? local.monitoring_role_arn : null
 
   character_set_name              = var.character_set_name
+  timezone                        = var.timezone
   enabled_cloudwatch_logs_exports = var.enabled_cloudwatch_logs_exports
 
   deletion_protection      = var.deletion_protection
@@ -124,94 +125,6 @@ resource "aws_db_instance" "this" {
   }
 }
 
-resource "aws_db_instance" "this_mssql" {
-  count = var.create && local.is_mssql ? 1 : 0
-
-  identifier = var.identifier
-
-  engine            = local.engine
-  engine_version    = var.engine_version
-  instance_class    = var.instance_class
-  allocated_storage = var.allocated_storage
-  storage_type      = var.storage_type
-  storage_encrypted = var.storage_encrypted
-  kms_key_id        = var.kms_key_id
-  license_model     = var.license_model
-  replica_mode      = var.replica_mode
-
-  db_name                             = var.db_name
-  username                            = local.username
-  password                            = local.password
-  port                                = var.port
-  domain                              = var.domain
-  domain_iam_role_name                = var.domain_iam_role_name
-  iam_database_authentication_enabled = var.iam_database_authentication_enabled
-
-  vpc_security_group_ids = var.vpc_security_group_ids
-  db_subnet_group_name   = var.db_subnet_group_name
-  parameter_group_name   = var.parameter_group_name
-  option_group_name      = var.option_group_name
-
-  availability_zone   = var.availability_zone
-  multi_az            = var.multi_az
-  iops                = var.iops
-  publicly_accessible = var.publicly_accessible
-  ca_cert_identifier  = var.ca_cert_identifier
-
-  allow_major_version_upgrade = var.allow_major_version_upgrade
-  auto_minor_version_upgrade  = var.auto_minor_version_upgrade
-  apply_immediately           = var.apply_immediately
-  maintenance_window          = var.maintenance_window
-
-  snapshot_identifier       = var.snapshot_identifier
-  copy_tags_to_snapshot     = var.copy_tags_to_snapshot
-  skip_final_snapshot       = var.skip_final_snapshot
-  final_snapshot_identifier = local.final_snapshot_identifier
-
-  performance_insights_enabled          = var.performance_insights_enabled
-  performance_insights_retention_period = var.performance_insights_enabled ? var.performance_insights_retention_period : null
-  performance_insights_kms_key_id       = var.performance_insights_enabled ? var.performance_insights_kms_key_id : null
-
-  replicate_source_db     = var.replicate_source_db
-  backup_retention_period = var.backup_retention_period
-  backup_window           = var.backup_window
-  max_allocated_storage   = var.max_allocated_storage
-  monitoring_interval     = var.monitoring_interval
-  monitoring_role_arn     = var.monitoring_interval > 0 ? local.monitoring_role_arn : null
-
-  character_set_name              = var.character_set_name
-  timezone                        = var.timezone # MSSQL only
-  enabled_cloudwatch_logs_exports = var.enabled_cloudwatch_logs_exports
-
-  deletion_protection      = var.deletion_protection
-  delete_automated_backups = var.delete_automated_backups
-
-  dynamic "restore_to_point_in_time" {
-    for_each = var.restore_to_point_in_time != null ? [var.restore_to_point_in_time] : []
-
-    content {
-      restore_time                  = lookup(restore_to_point_in_time.value, "restore_time", null)
-      source_db_instance_identifier = lookup(restore_to_point_in_time.value, "source_db_instance_identifier", null)
-      source_dbi_resource_id        = lookup(restore_to_point_in_time.value, "source_dbi_resource_id", null)
-      use_latest_restorable_time    = lookup(restore_to_point_in_time.value, "use_latest_restorable_time", null)
-    }
-  }
-
-  tags = var.tags
-
-  timeouts {
-    create = lookup(var.timeouts, "create", null)
-    delete = lookup(var.timeouts, "delete", null)
-    update = lookup(var.timeouts, "update", null)
-  }
-
-  lifecycle {
-    ignore_changes = [
-      latest_restorable_time
-    ]
-  }
-}
-
 ################################################################################
 # Enhanced monitoring
 ################################################################################

modules/db_instance/outputs.tf

@@ -10,77 +10,77 @@ output "enhanced_monitoring_iam_role_arn" {
 
 output "db_instance_address" {
   description = "The address of the RDS instance"
-  value       = try(aws_db_instance.this_mssql[0].address, aws_db_instance.this[0].address, "")
+  value       = try(aws_db_instance.this[0].address, "")
 }
 
 output "db_instance_arn" {
   description = "The ARN of the RDS instance"
-  value       = try(aws_db_instance.this_mssql[0].arn, aws_db_instance.this[0].arn, "")
+  value       = try(aws_db_instance.this[0].arn, "")
 }
 
 output "db_instance_availability_zone" {
   description = "The availability zone of the RDS instance"
-  value       = try(aws_db_instance.this_mssql[0].availability_zone, aws_db_instance.this[0].availability_zone, "")
+  value       = try(aws_db_instance.this[0].availability_zone, "")
 }
 
 output "db_instance_endpoint" {
   description = "The connection endpoint"
-  value       = try(aws_db_instance.this_mssql[0].endpoint, aws_db_instance.this[0].endpoint, "")
+  value       = try(aws_db_instance.this[0].endpoint, "")
 }
 
 output "db_instance_hosted_zone_id" {
   description = "The canonical hosted zone ID of the DB instance (to be used in a Route 53 Alias record)"
-  value       = try(aws_db_instance.this_mssql[0].hosted_zone_id, aws_db_instance.this[0].hosted_zone_id, "")
+  value       = try(aws_db_instance.this[0].hosted_zone_id, "")
 }
 
 output "db_instance_id" {
   description = "The RDS instance ID"
-  value       = try(aws_db_instance.this_mssql[0].id, aws_db_instance.this[0].id, "")
+  value       = try(aws_db_instance.this[0].id, "")
 }
 
 output "db_instance_resource_id" {
   description = "The RDS Resource ID of this instance"
-  value       = try(aws_db_instance.this_mssql[0].resource_id, aws_db_instance.this[0].resource_id, "")
+  value       = try(aws_db_instance.this[0].resource_id, "")
 }
 
 output "db_instance_status" {
   description = "The RDS instance status"
-  value       = try(aws_db_instance.this_mssql[0].status, aws_db_instance.this[0].status, "")
+  value       = try(aws_db_instance.this[0].status, "")
 }
 
 output "db_instance_name" {
   description = "The database name"
-  value       = try(aws_db_instance.this_mssql[0].name, aws_db_instance.this[0].name, "")
+  value       = try(aws_db_instance.this[0].name, "")
 }
 
 output "db_instance_username" {
   description = "The master username for the database"
-  value       = try(aws_db_instance.this_mssql[0].username, aws_db_instance.this[0].username, "")
+  value       = try(aws_db_instance.this[0].username, "")
   sensitive   = true
 }
 
 output "db_instance_port" {
   description = "The database port"
-  value       = try(aws_db_instance.this_mssql[0].port, aws_db_instance.this[0].port, "")
+  value       = try(aws_db_instance.this[0].port, "")
 }
 
 output "db_instance_ca_cert_identifier" {
   description = "Specifies the identifier of the CA certificate for the DB instance"
-  value       = try(aws_db_instance.this_mssql[0].ca_cert_identifier, aws_db_instance.this[0].ca_cert_identifier, "")
+  value       = try(aws_db_instance.this[0].ca_cert_identifier, "")
 }
 
 output "db_instance_domain" {
   description = "The ID of the Directory Service Active Directory domain the instance is joined to"
-  value       = try(aws_db_instance.this_mssql[0].domain, aws_db_instance.this[0].domain, "")
+  value       = try(aws_db_instance.this[0].domain, "")
 }
 
 output "db_instance_domain_iam_role_name" {
   description = "The name of the IAM role to be used when making API calls to the Directory Service. "
-  value       = try(aws_db_instance.this_mssql[0].domain_iam_role_name, aws_db_instance.this[0].domain_iam_role_name, "")
+  value       = try(aws_db_instance.this[0].domain_iam_role_name, "")
 }
 
 output "db_instance_master_password" {
   description = "The master password"
-  value       = try(aws_db_instance.this_mssql[0].password, aws_db_instance.this[0].password, "")
+  value       = try(aws_db_instance.this[0].password, "")
   sensitive   = true
 }