From 52f201c0729f4a14f0410ca71e8fbb1018316f15 Mon Sep 17 00:00:00 2001
From: Win Gutmann <54120202+winthropgutmann-ef@users.noreply.github.com>
Date: Fri, 9 May 2025 16:38:00 -0400
Subject: [PATCH 1/2] Adding variable 'copy_db_instance_tags'

If true, merge db_instance_tags with the common tags.
---
 modules/db_instance/variables.tf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/db_instance/variables.tf b/modules/db_instance/variables.tf
index 31a833d2..48adcf6f 100644
--- a/modules/db_instance/variables.tf
+++ b/modules/db_instance/variables.tf
@@ -341,6 +341,12 @@ variable "db_instance_tags" {
   default     = {}
 }
 
+variable "copy_db_instance_tags" {
+  description = "If true, merge db_instance_tags with the common tags"
+  type        = bool
+  default     = true
+}
+
 variable "option_group_name" {
   description = "Name of the DB option group to associate."
   type        = string

From ba6260e22cdddcd1f7a908f155941cedc07a0f64 Mon Sep 17 00:00:00 2001
From: Win Gutmann <54120202+winthropgutmann-ef@users.noreply.github.com>
Date: Fri, 9 May 2025 16:40:07 -0400
Subject: [PATCH 2/2] copy db_instance_tags only if the flag is set to true

---
 modules/db_instance/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/db_instance/main.tf b/modules/db_instance/main.tf
index 4b908963..45197b81 100644
--- a/modules/db_instance/main.tf
+++ b/modules/db_instance/main.tf
@@ -137,7 +137,7 @@ resource "aws_db_instance" "this" {
     }
   }
 
-  tags = merge(var.tags, var.db_instance_tags)
+  tags = merge(var.tags, var.copy_db_instance_tags ? var.db_instance_tags : {})
 
   depends_on = [aws_cloudwatch_log_group.this]