OPS-0 Update rds modules

Flaconi · Mar 12, 2024 · 67b0952 · 67b0952
1 parent 7cab41d
commit 67b0952
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2196,7 +2196,7 @@ Default: `false`
 | <a name="output_rds_this_db_instance_availability_zone"></a> [rds\_this\_db\_instance\_availability\_zone](#output\_rds\_this\_db\_instance\_availability\_zone) | The availability zone of the RDS instance |
 | <a name="output_rds_this_db_instance_endpoint"></a> [rds\_this\_db\_instance\_endpoint](#output\_rds\_this\_db\_instance\_endpoint) | The connection endpoint |
 | <a name="output_rds_this_db_instance_hosted_zone_id"></a> [rds\_this\_db\_instance\_hosted\_zone\_id](#output\_rds\_this\_db\_instance\_hosted\_zone\_id) | The canonical hosted zone ID of the DB instance (to be used in a Route 53 Alias record) |
-| <a name="output_rds_this_db_instance_id"></a> [rds\_this\_db\_instance\_id](#output\_rds\_this\_db\_instance\_id) | The RDS instance ID |
+| <a name="output_rds_this_db_instance_identifier"></a> [rds\_this\_db\_instance\_identifier](#output\_rds\_this\_db\_instance\_identifier) | The RDS instance Identifier |
 | <a name="output_rds_this_db_instance_name"></a> [rds\_this\_db\_instance\_name](#output\_rds\_this\_db\_instance\_name) | The database name |
 | <a name="output_rds_this_db_instance_password"></a> [rds\_this\_db\_instance\_password](#output\_rds\_this\_db\_instance\_password) | The database password (this password may be old, because Terraform doesn't track it after initial creation) |
 | <a name="output_rds_this_db_instance_port"></a> [rds\_this\_db\_instance\_port](#output\_rds\_this\_db\_instance\_port) | The database port |

diff --git a/outputs.tf b/outputs.tf
@@ -279,9 +279,9 @@ output "rds_this_db_instance_hosted_zone_id" {
   value       = module.rds.db_instance_hosted_zone_id
 }
 
-output "rds_this_db_instance_id" {
-  description = "The RDS instance ID"
-  value       = module.rds.db_instance_id
+output "rds_this_db_instance_identifier" {
+  description = "The RDS instance Identifier"
+  value       = module.rds.db_instance_identifier
 }
 
 output "rds_this_db_instance_resource_id" {
@@ -307,7 +307,7 @@ output "rds_this_db_instance_username" {
 
 output "rds_this_db_instance_password" {
   description = "The database password (this password may be old, because Terraform doesn't track it after initial creation)"
-  value       = module.rds.db_instance_password
+  value       = local.password
   sensitive   = true
 }
 

diff --git a/rds-s3-dumps.tf b/rds-s3-dumps.tf
@@ -178,7 +178,7 @@ resource "aws_iam_role" "rds_dumps" {
 resource "aws_db_instance_role_association" "this" {
   count = local.rds_dumps_enabled ? 1 : 0
 
-  db_instance_identifier = module.rds.db_instance_id
+  db_instance_identifier = module.rds.db_instance_identifier
   feature_name           = "S3_INTEGRATION"
   role_arn               = var.rds_s3_dump_role_arn == "" ? aws_iam_role.rds_dumps[0].arn : var.rds_s3_dump_role_arn
 }

diff --git a/rds.tf b/rds.tf
@@ -25,7 +25,7 @@ locals {
 
 module "rds_sg" {
   source  = "terraform-aws-modules/security-group/aws"
-  version = "4.13.1"
+  version = "5.1.1"
 
   create = var.rds_enabled
 
@@ -51,7 +51,7 @@ resource "random_string" "password" {
 # -------------------------------------------------------------------------------------------------
 module "rds" {
   source  = "terraform-aws-modules/rds/aws"
-  version = "5.1.0"
+  version = "6.5.2"
 
   apply_immediately = var.rds_apply_immediately
 
@@ -85,11 +85,11 @@ module "rds" {
   family                = var.rds_family
   license_model         = var.rds_license_model
 
-  db_name                = local.rds_db_name
-  username               = var.rds_admin_user
-  password               = local.password
-  port                   = var.rds_port
-  create_random_password = false
+  db_name                     = local.rds_db_name
+  username                    = var.rds_admin_user
+  password                    = local.password
+  port                        = var.rds_port
+  manage_master_user_password = false
 
   iam_database_authentication_enabled = var.rds_iam_database_authentication_enabled