chore: missing tag overrides for cloud aws rds monitors (#54)

Lynggaard91 · web-flow · commit cfa3a8ce7682 · 2024-07-29T15:11:36.000+02:00
diff --git a/cloud/aws/rds/common/monitors-rds-common.tf b/cloud/aws/rds/common/monitors-rds-common.tf
@@ -25,7 +25,7 @@ EOQ
   include_tags        = true
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.cpu_extra_tags)
+  tags = concat(local.common_tags, var.tags, var.cpu_extra_tags)
 }
 
 ### RDS instance free space monitor ###
@@ -57,7 +57,7 @@ EOQ
   include_tags        = true
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags)
+  tags = concat(local.common_tags, var.tags, var.diskspace_extra_tags)
 }
 
 ### RDS Replica Lag monitor ###
@@ -87,7 +87,7 @@ EOQ
   include_tags        = true
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.replicalag_extra_tags)
+  tags = concat(local.common_tags, var.tags, var.replicalag_extra_tags)
 }
 
 resource "datadog_monitor" "rds_connection_variance" {
@@ -120,5 +120,5 @@ EOQ
   include_tags        = true
   require_full_window = false
 
-  tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.connection_variance_extra_tags)
+  tags = concat(local.common_tags, var.tags, var.connection_variance_extra_tags)
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ EOQ`
`25`	`25`	`include_tags = true`
`26`	`26`	`require_full_window = false`
`27`	`27`
`28`		`- tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.cpu_extra_tags)`
	`28`	`+ tags = concat(local.common_tags, var.tags, var.cpu_extra_tags)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`### RDS instance free space monitor ###`
`@@ -57,7 +57,7 @@ EOQ`
`57`	`57`	`include_tags = true`
`58`	`58`	`require_full_window = false`
`59`	`59`
`60`		`- tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.diskspace_extra_tags)`
	`60`	`+ tags = concat(local.common_tags, var.tags, var.diskspace_extra_tags)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`### RDS Replica Lag monitor ###`
`@@ -87,7 +87,7 @@ EOQ`
`87`	`87`	`include_tags = true`
`88`	`88`	`require_full_window = false`
`89`	`89`
`90`		`- tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.replicalag_extra_tags)`
	`90`	`+ tags = concat(local.common_tags, var.tags, var.replicalag_extra_tags)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`resource "datadog_monitor" "rds_connection_variance" {`
`@@ -120,5 +120,5 @@ EOQ`
`120`	`120`	`include_tags = true`
`121`	`121`	`require_full_window = false`
`122`	`122`
`123`		`- tags = concat(["env:${var.environment}", "type:cloud", "provider:aws", "resource:rds", "team:claranet", "created-by:terraform"], var.connection_variance_extra_tags)`
	`123`	`+ tags = concat(local.common_tags, var.tags, var.connection_variance_extra_tags)`
`124`	`124`	`}`