Skip to content

null for monitoring_role_arn when interval is 0 #102

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

Merged
merged 6 commits into from
Oct 23, 2025
Merged

null for monitoring_role_arn when interval is 0 #102

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7f5bd9
null for monitoring_role_arn when interval is 0
LeoDiazL Oct 22, 2025
dde78a5
Adding moniroting role creation
LeoDiazL Oct 22, 2025
6e35ab5
Fix length
LeoDiazL Oct 22, 2025
fa815eb
Fix dependency
LeoDiazL Oct 22, 2025
97f7e62
Fixing conditional
LeoDiazL Oct 22, 2025
c7542aa
Fix conditional #2
LeoDiazL Oct 22, 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
25 changes: 21 additions & 4 deletions operations/deployment/terraform/modules/aws/rds/aws_rds.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ resource "aws_db_instance" "default" {
performance_insights_kms_key_id = var.aws_rds_db_performance_insights_enable ? var.aws_rds_db_performance_insights_kms_key_id : null
# Updgrades
monitoring_interval = var.aws_rds_db_monitoring_interval
monitoring_role_arn = var.aws_rds_db_monitoring_role_arn != "" ? var.aws_rds_db_monitoring_role_arn : data.aws_iam_role.monitoring[0].arn
monitoring_role_arn = var.aws_rds_db_monitoring_interval > 0 ? var.aws_rds_db_monitoring_role_arn != "" ? var.aws_rds_db_monitoring_role_arn : aws_iam_role.rds_enhanced_monitoring[0].arn : null
database_insights_mode = var.aws_rds_db_insights_mode
allow_major_version_upgrade = var.aws_rds_db_allow_major_version_upgrade
auto_minor_version_upgrade = var.aws_rds_db_auto_minor_version_upgrade
Expand All @@ -94,9 +94,26 @@ resource "aws_db_instance" "default" {
}
}

data "aws_iam_role" "monitoring" {
count = var.aws_rds_db_monitoring_role_arn != "" ? 0 : 1
name = "rds-monitoring-role"
resource "aws_iam_role" "rds_enhanced_monitoring" {
count = var.aws_rds_db_monitoring_role_arn != "" ? 0 : var.aws_rds_db_monitoring_interval > 0 ? 1 : 0
name = "${var.aws_resource_identifier}-rds"

assume_role_policy = jsonencode({
Version = "2012-10-17",
Statement = [{
Effect = "Allow",
Principal = {
Service = "monitoring.rds.amazonaws.com"
},
Action = "sts:AssumeRole"
}]
})
}

resource "aws_iam_role_policy_attachment" "rds_enhanced_monitoring_attach" {
count = var.aws_rds_db_monitoring_role_arn != "" ? 0 : var.aws_rds_db_monitoring_interval > 0 ? 1 : 0
role = aws_iam_role.rds_enhanced_monitoring[0].name
policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonRDSEnhancedMonitoringRole"
}

// Creates a secret manager secret for the databse credentials
Expand Down