diff --git a/README.md b/README.md index 78bb4f5..4bd8e6f 100644 --- a/README.md +++ b/README.md @@ -251,9 +251,9 @@ The following resources _CAN_ be created: | Name | Version | |------|---------| -| [aws](#provider\_aws) | ~> 4.0 | -| [null](#provider\_null) | ~> 3.0 | -| [random](#provider\_random) | ~> 3.0 | +| [aws](#provider\_aws) | ~> 5.40 | +| [null](#provider\_null) | ~> 3.2 | +| [random](#provider\_random) | ~> 3.6 | @@ -263,9 +263,9 @@ The following resources _CAN_ be created: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3 | -| [aws](#requirement\_aws) | ~> 4.0 | -| [null](#requirement\_null) | ~> 3.0 | -| [random](#requirement\_random) | ~> 3.0 | +| [aws](#requirement\_aws) | ~> 5.40 | +| [null](#requirement\_null) | ~> 3.2 | +| [random](#requirement\_random) | ~> 3.6 | @@ -2196,7 +2196,7 @@ Default: `false` | [rds\_this\_db\_instance\_availability\_zone](#output\_rds\_this\_db\_instance\_availability\_zone) | The availability zone of the RDS instance | | [rds\_this\_db\_instance\_endpoint](#output\_rds\_this\_db\_instance\_endpoint) | The connection endpoint | | [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) | -| [rds\_this\_db\_instance\_id](#output\_rds\_this\_db\_instance\_id) | The RDS instance ID | +| [rds\_this\_db\_instance\_identifier](#output\_rds\_this\_db\_instance\_identifier) | The RDS instance Identifier | | [rds\_this\_db\_instance\_name](#output\_rds\_this\_db\_instance\_name) | The database name | | [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) | | [rds\_this\_db\_instance\_port](#output\_rds\_this\_db\_instance\_port) | The database port | diff --git a/examples/dynamodb/README.md b/examples/dynamodb/README.md index 3c8e84b..d99827f 100644 --- a/examples/dynamodb/README.md +++ b/examples/dynamodb/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers diff --git a/examples/dynamodb/versions.tf b/examples/dynamodb/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/dynamodb/versions.tf +++ b/examples/dynamodb/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/examples/iam/README.md b/examples/iam/README.md index e031a04..c0b9972 100644 --- a/examples/iam/README.md +++ b/examples/iam/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers diff --git a/examples/iam/versions.tf b/examples/iam/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/iam/versions.tf +++ b/examples/iam/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/examples/rds/README.md b/examples/rds/README.md index cc0466f..b9f170b 100644 --- a/examples/rds/README.md +++ b/examples/rds/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers @@ -35,7 +35,7 @@ No inputs. | [ms\_sample\_rds\_rds\_this\_db\_instance\_availability\_zone](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_availability\_zone) | n/a | | [ms\_sample\_rds\_rds\_this\_db\_instance\_endpoint](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_endpoint) | n/a | | [ms\_sample\_rds\_rds\_this\_db\_instance\_hosted\_zone\_id](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_hosted\_zone\_id) | n/a | -| [ms\_sample\_rds\_rds\_this\_db\_instance\_id](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_id) | n/a | +| [ms\_sample\_rds\_rds\_this\_db\_instance\_identifier](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_identifier) | n/a | | [ms\_sample\_rds\_rds\_this\_db\_instance\_resource\_id](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_resource\_id) | n/a | | [ms\_sample\_rds\_rds\_this\_db\_instance\_status](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_status) | n/a | | [ms\_sample\_rds\_rds\_this\_db\_instance\_name](#output\_ms\_sample\_rds\_rds\_this\_db\_instance\_name) | n/a | diff --git a/examples/rds/outputs.tf b/examples/rds/outputs.tf index 4ff2b62..6cea85d 100644 --- a/examples/rds/outputs.tf +++ b/examples/rds/outputs.tf @@ -18,8 +18,8 @@ output "ms_sample_rds_rds_this_db_instance_hosted_zone_id" { value = module.ms_sample_rds.rds_this_db_instance_hosted_zone_id } -output "ms_sample_rds_rds_this_db_instance_id" { - value = module.ms_sample_rds.rds_this_db_instance_id +output "ms_sample_rds_rds_this_db_instance_identifier" { + value = module.ms_sample_rds.rds_this_db_instance_identifier } output "ms_sample_rds_rds_this_db_instance_resource_id" { diff --git a/examples/rds/versions.tf b/examples/rds/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/rds/versions.tf +++ b/examples/rds/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/examples/redis/README.md b/examples/redis/README.md index bc224a6..5b1592f 100644 --- a/examples/redis/README.md +++ b/examples/redis/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers diff --git a/examples/redis/versions.tf b/examples/redis/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/redis/versions.tf +++ b/examples/redis/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/examples/s3/README.md b/examples/s3/README.md index 8c9fdf8..b32c48f 100644 --- a/examples/s3/README.md +++ b/examples/s3/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers diff --git a/examples/s3/versions.tf b/examples/s3/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/s3/versions.tf +++ b/examples/s3/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/examples/sqs/README.md b/examples/sqs/README.md index 6d946a0..698911e 100644 --- a/examples/sqs/README.md +++ b/examples/sqs/README.md @@ -6,7 +6,7 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | ~> 1.3 | -| [aws](#requirement\_aws) | ~> 4.10 | +| [aws](#requirement\_aws) | ~> 5.40 | ## Providers diff --git a/examples/sqs/versions.tf b/examples/sqs/versions.tf index 513699c..e5ad5e4 100644 --- a/examples/sqs/versions.tf +++ b/examples/sqs/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.10" + version = "~> 5.40" } } required_version = "~> 1.3" diff --git a/outputs.tf b/outputs.tf index b62ebec..b3f10e1 100644 --- 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 index d8bd946..4cdbc52 100644 --- 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 index aa0e4bb..dbdbde8 100644 --- 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 diff --git a/versions.tf b/versions.tf index 77e72e6..341e7c6 100644 --- a/versions.tf +++ b/versions.tf @@ -2,15 +2,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "~> 5.40" } null = { source = "hashicorp/null" - version = "~> 3.0" + version = "~> 3.2" } random = { source = "hashicorp/random" - version = "~> 3.0" + version = "~> 3.6" } } required_version = ">= 1.3"