File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
operations/deployment/terraform/modules/aws/rds Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -1367,9 +1367,9 @@ runs:
1367
1367
AWS_RDS_DB_APPLY_IMMEDIATELY : ${{ inputs.aws_rds_db_apply_immediately }}
1368
1368
AWS_RDS_DB_PERFORMANCE_INSIGHTS_ENABLE : ${{ inputs.aws_rds_db_performance_insights_enable }}
1369
1369
AWS_RDS_DB_PERFORMANCE_INSIGHTS_RETENTION : ${{ inputs.aws_rds_db_performance_insights_retention }}
1370
+ AWS_RDS_DB_PERFORMANCE_INSIGHTS_KMS_KEY_ID : ${{ inputs.aws_rds_db_performance_insights_kms_key_id }}
1370
1371
AWS_RDS_DB_MONITORING_INTERVAL : ${{ inputs.aws_rds_db_monitoring_interval }}
1371
1372
AWS_RDS_DB_MONITORING_ROLE_ARN : ${{ inputs.aws_rds_db_monitoring_role_arn }}
1372
- AWS_RDS_DB_PERFORMANCE_INSIGHTS_KMS_KEY_ID : ${{ inputs.aws_rds_db_performance_insights_kms_key_id }}
1373
1373
AWS_RDS_DB_INSIGHTS_MODE : ${{ inputs.aws_rds_db_insights_mode }}
1374
1374
AWS_RDS_DB_ALLOW_MAJOR_VERSION_UPGRADE : ${{ inputs.aws_rds_db_allow_major_version_upgrade }}
1375
1375
AWS_RDS_DB_AUTO_MINOR_VERSION_UPGRADE : ${{ inputs.aws_rds_db_auto_minor_version_upgrade }}
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ resource "aws_db_instance" "default" {
82
82
performance_insights_kms_key_id = var. aws_rds_db_performance_insights_enable ? var. aws_rds_db_performance_insights_kms_key_id : null
83
83
# Updgrades
84
84
monitoring_interval = var. aws_rds_db_monitoring_interval
85
- monitoring_role_arn = var. aws_rds_db_monitoring_role_arn
85
+ monitoring_role_arn = var. aws_rds_db_monitoring_role_arn != " " ? var . aws_rds_db_monitoring_role_arn : data . aws_iam_role . monitoring [ 0 ] . arn
86
86
database_insights_mode = var. aws_rds_db_insights_mode
87
87
allow_major_version_upgrade = var. aws_rds_db_allow_major_version_upgrade
88
88
auto_minor_version_upgrade = var. aws_rds_db_auto_minor_version_upgrade
@@ -94,6 +94,11 @@ resource "aws_db_instance" "default" {
94
94
}
95
95
}
96
96
97
+ data "aws_iam_role" "monitoring" {
98
+ count = var. aws_rds_db_monitoring_role_arn != " " ? 1 : 0
99
+ name = " rds-monitoring-role"
100
+ }
101
+
97
102
// Creates a secret manager secret for the databse credentials
98
103
resource "aws_secretsmanager_secret" "rds_database_credentials" {
99
104
name = " ${ var . aws_resource_identifier_supershort } -rdsdb-pub-${ random_string . random_sm . result } "
You can’t perform that action at this time.
0 commit comments