Skip to content

Allow additional tags on rds instances #3040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jfharden wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Allow additional tags on rds instances #3040

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ef2ef5
Allow additional tags on rds instances
jfharden Oct 22, 2025
209913d
Allow additional_tags to be specified for rds instances
jfharden Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions terraform/deployments/rds/rds.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ resource "aws_db_instance" "instance" {
storage_encrypted = try(each.value.encryption_at_rest, true)
kms_key_id = try(each.value.encryption_at_rest, true) ? aws_kms_key.rds.arn : null

tags = { Name = "govuk-rds-${each.value.name}-${each.value.engine}", project = lookup(each.value, "project", "GOV.UK - Other") }
tags = merge(
{
Name = "govuk-rds-${each.value.name}-${each.value.engine}",
project = lookup(each.value, "project", "GOV.UK - Other")
},
lookup(each.value, "additional_tags", {}),
)
}

resource "aws_db_snapshot" "unencrypted_snapshot" {
Expand Down Expand Up @@ -174,10 +180,13 @@ resource "aws_db_instance" "normalised_instance" {
storage_encrypted = true
kms_key_id = aws_kms_key.rds.arn

tags = {
Name = "govuk-rds-${local.identifier_prefix}${each.value.name}-${var.govuk_environment}-${each.value.engine}",
project = lookup(each.value, "project", "GOV.UK - Other"),
}
tags = merge(
{
Name = "govuk-rds-${local.identifier_prefix}${each.value.name}-${var.govuk_environment}-${each.value.engine}",
project = lookup(each.value, "project", "GOV.UK - Other"),
},
lookup(each.value, "additional_tags", {}),
)
}

resource "aws_db_event_subscription" "subscription" {
Expand Down Expand Up @@ -210,6 +219,8 @@ resource "aws_cloudwatch_metric_alarm" "rds_freestoragespace" {
)
alarm_actions = [aws_sns_topic.rds_alerts.arn]
alarm_description = "Available storage space on ${aws_db_instance.instance[each.key].identifier} RDS is below ${lookup(each.value, "storage_alarm_threshold_percentage", 10)}%."

tags = lookup(each.value, "additional_tags", {})
}


Expand All @@ -234,6 +245,8 @@ resource "aws_cloudwatch_metric_alarm" "normalised_rds_freestoragespace" {
)
alarm_actions = [aws_sns_topic.rds_alerts.arn]
alarm_description = "Available storage space on ${aws_db_instance.normalised_instance[each.key].identifier} RDS is below ${lookup(each.value, "storage_alarm_threshold_percentage", 10)}%."

tags = lookup(each.value, "additional_tags", {})
}

resource "aws_route53_record" "instance_cname" {
Expand Down Expand Up @@ -263,7 +276,13 @@ resource "aws_db_instance" "replica" {

skip_final_snapshot = true

tags = { Name = "govuk-rds-${each.value.name}-${each.value.engine}-replica", project = lookup(each.value, "project", "GOV.UK - Other") }
tags = merge(
{
Name = "govuk-rds-${each.value.name}-${each.value.engine}-replica",
project = lookup(each.value, "project", "GOV.UK - Other")
},
lookup(each.value, "additional_tags", {}),
)

lifecycle {
ignore_changes = [identifier]
Expand All @@ -285,10 +304,13 @@ resource "aws_db_instance" "normalised_replica" {

skip_final_snapshot = true

tags = {
Name = "govuk-rds-${aws_db_instance.normalised_instance[each.key].identifier}-replica",
project = lookup(each.value, "project", "GOV.UK - Other"),
}
tags = merge(
{
Name = "govuk-rds-${aws_db_instance.normalised_instance[each.key].identifier}-replica",
project = lookup(each.value, "project", "GOV.UK - Other"),
},
lookup(each.value, "additional_tags", {}),
)

storage_encrypted = true
kms_key_id = aws_kms_key.rds.arn
Expand Down
Loading