From 6755951f20510f39dd33b89fa17377dc1c4c8b1b Mon Sep 17 00:00:00 2001 From: mrobinson1022 Date: Tue, 15 Jul 2025 14:40:44 -0400 Subject: [PATCH 1/3] fix: update aws_region.name to aws_region.region (#1) --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index f622a07..7f715cd 100644 --- a/main.tf +++ b/main.tf @@ -10,7 +10,7 @@ data "aws_service_principal" "rds" { count = var.create && var.create_iam_role ? 1 : 0 service_name = "rds" - region = data.aws_region.current.name + region = data.aws_region.current.region } ################################################################################ # RDS Proxy @@ -153,7 +153,7 @@ data "aws_iam_policy_document" "this" { test = "StringEquals" variable = "kms:ViaService" values = [ - "secretsmanager.${data.aws_region.current.name}.${data.aws_partition.current.dns_suffix}" + "secretsmanager.${data.aws_region.current.region}.${data.aws_partition.current.dns_suffix}" ] } } From 37ac3c9542103254561df25b2d72adb330c03b8a Mon Sep 17 00:00:00 2001 From: mrobinson1022 Date: Tue, 15 Jul 2025 14:50:01 -0400 Subject: [PATCH 2/3] fix: update versions --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index ddfcb0e..aaf26b8 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = ">= 6.0" } } } From 5f83f0d5d141aefc219f1683e8ec29542054d64e Mon Sep 17 00:00:00 2001 From: mrobinson1022 Date: Tue, 15 Jul 2025 15:42:35 -0400 Subject: [PATCH 3/3] fix: examples --- examples/mysql-iam-cluster/README.md | 8 ++++---- examples/mysql-iam-cluster/main.tf | 4 ++-- examples/mysql-iam-cluster/versions.tf | 2 +- examples/mysql-iam-instance/README.md | 8 ++++---- examples/mysql-iam-instance/main.tf | 6 +++--- examples/mysql-iam-instance/versions.tf | 2 +- examples/postgresql-iam-cluster/README.md | 8 ++++---- examples/postgresql-iam-cluster/main.tf | 4 ++-- examples/postgresql-iam-cluster/versions.tf | 2 +- examples/postgresql-iam-instance/README.md | 8 ++++---- examples/postgresql-iam-instance/main.tf | 6 +++--- examples/postgresql-iam-instance/versions.tf | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/mysql-iam-cluster/README.md b/examples/mysql-iam-cluster/README.md index 922a6e4..07943d1 100644 --- a/examples/mysql-iam-cluster/README.md +++ b/examples/mysql-iam-cluster/README.md @@ -31,22 +31,22 @@ An EC2 instance configuration has been provided for use in validating the exampl | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.0 | +| [aws](#requirement\_aws) | >= 6.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.0 | +| [aws](#provider\_aws) | >= 6.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [rds](#module\_rds) | terraform-aws-modules/rds-aurora/aws | ~> 8.0 | +| [rds](#module\_rds) | terraform-aws-modules/rds-aurora/aws | ~> 9.0 | | [rds\_proxy](#module\_rds\_proxy) | ../../ | n/a | | [rds\_proxy\_sg](#module\_rds\_proxy\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 | ## Resources diff --git a/examples/mysql-iam-cluster/main.tf b/examples/mysql-iam-cluster/main.tf index ea10621..491d029 100644 --- a/examples/mysql-iam-cluster/main.tf +++ b/examples/mysql-iam-cluster/main.tf @@ -69,7 +69,7 @@ module "rds_proxy" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 5.0" + version = "~> 6.0" name = local.name cidr = local.vpc_cidr @@ -84,7 +84,7 @@ module "vpc" { module "rds" { source = "terraform-aws-modules/rds-aurora/aws" - version = "~> 8.0" + version = "~> 9.0" name = local.name engine = "aurora-mysql" diff --git a/examples/mysql-iam-cluster/versions.tf b/examples/mysql-iam-cluster/versions.tf index ddfcb0e..aaf26b8 100644 --- a/examples/mysql-iam-cluster/versions.tf +++ b/examples/mysql-iam-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = ">= 6.0" } } } diff --git a/examples/mysql-iam-instance/README.md b/examples/mysql-iam-instance/README.md index 8f9e2bb..e78534a 100644 --- a/examples/mysql-iam-instance/README.md +++ b/examples/mysql-iam-instance/README.md @@ -31,25 +31,25 @@ An EC2 instance configuration has been provided for use in validating the exampl | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.0 | +| [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.0 | +| [aws](#provider\_aws) | >= 6.0 | | [random](#provider\_random) | >= 2.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [rds](#module\_rds) | terraform-aws-modules/rds/aws | ~> 5.0 | +| [rds](#module\_rds) | terraform-aws-modules/rds/aws | ~> 6.0 | | [rds\_proxy](#module\_rds\_proxy) | ../../ | n/a | | [rds\_proxy\_sg](#module\_rds\_proxy\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | | [rds\_sg](#module\_rds\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 | ## Resources diff --git a/examples/mysql-iam-instance/main.tf b/examples/mysql-iam-instance/main.tf index 5fed116..3a09453 100644 --- a/examples/mysql-iam-instance/main.tf +++ b/examples/mysql-iam-instance/main.tf @@ -61,7 +61,7 @@ module "rds_proxy" { # Target RDS instance target_db_instance = true - db_instance_identifier = module.rds.db_instance_id + db_instance_identifier = module.rds.db_instance_identifier tags = local.tags } @@ -82,7 +82,7 @@ resource "random_password" "password" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 5.0" + version = "~> 6.0" name = local.name cidr = local.vpc_cidr @@ -97,7 +97,7 @@ module "vpc" { module "rds" { source = "terraform-aws-modules/rds/aws" - version = "~> 5.0" + version = "~> 6.0" username = local.db_username password = local.db_password diff --git a/examples/mysql-iam-instance/versions.tf b/examples/mysql-iam-instance/versions.tf index b80a85f..263213d 100644 --- a/examples/mysql-iam-instance/versions.tf +++ b/examples/mysql-iam-instance/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = ">= 6.0" } random = { source = "hashicorp/random" diff --git a/examples/postgresql-iam-cluster/README.md b/examples/postgresql-iam-cluster/README.md index 445c455..778410f 100644 --- a/examples/postgresql-iam-cluster/README.md +++ b/examples/postgresql-iam-cluster/README.md @@ -31,22 +31,22 @@ An EC2 instance configuration has been provided for use in validating the exampl | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.0 | +| [aws](#requirement\_aws) | >= 6.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.0 | +| [aws](#provider\_aws) | >= 6.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [rds](#module\_rds) | terraform-aws-modules/rds-aurora/aws | ~> 8.0 | +| [rds](#module\_rds) | terraform-aws-modules/rds-aurora/aws | ~> 9.0 | | [rds\_proxy](#module\_rds\_proxy) | ../../ | n/a | | [rds\_proxy\_sg](#module\_rds\_proxy\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 | ## Resources diff --git a/examples/postgresql-iam-cluster/main.tf b/examples/postgresql-iam-cluster/main.tf index 6347ef6..f858511 100644 --- a/examples/postgresql-iam-cluster/main.tf +++ b/examples/postgresql-iam-cluster/main.tf @@ -69,7 +69,7 @@ module "rds_proxy" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 5.0" + version = "~> 6.0" name = local.name cidr = local.vpc_cidr @@ -84,7 +84,7 @@ module "vpc" { module "rds" { source = "terraform-aws-modules/rds-aurora/aws" - version = "~> 8.0" + version = "~> 9.0" name = local.name engine = "aurora-postgresql" diff --git a/examples/postgresql-iam-cluster/versions.tf b/examples/postgresql-iam-cluster/versions.tf index ddfcb0e..aaf26b8 100644 --- a/examples/postgresql-iam-cluster/versions.tf +++ b/examples/postgresql-iam-cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = ">= 6.0" } } } diff --git a/examples/postgresql-iam-instance/README.md b/examples/postgresql-iam-instance/README.md index 9960340..be38a1a 100644 --- a/examples/postgresql-iam-instance/README.md +++ b/examples/postgresql-iam-instance/README.md @@ -31,25 +31,25 @@ An EC2 instance configuration has been provided for use in validating the exampl | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 5.0 | +| [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.0 | +| [aws](#provider\_aws) | >= 6.0 | | [random](#provider\_random) | >= 2.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [rds](#module\_rds) | terraform-aws-modules/rds/aws | ~> 5.0 | +| [rds](#module\_rds) | terraform-aws-modules/rds/aws | ~> 6.0 | | [rds\_proxy](#module\_rds\_proxy) | ../../ | n/a | | [rds\_proxy\_sg](#module\_rds\_proxy\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | | [rds\_sg](#module\_rds\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 | ## Resources diff --git a/examples/postgresql-iam-instance/main.tf b/examples/postgresql-iam-instance/main.tf index 5a0a254..c5a7849 100644 --- a/examples/postgresql-iam-instance/main.tf +++ b/examples/postgresql-iam-instance/main.tf @@ -61,7 +61,7 @@ module "rds_proxy" { # Target RDS instance target_db_instance = true - db_instance_identifier = module.rds.db_instance_id + db_instance_identifier = module.rds.db_instance_identifier tags = local.tags } @@ -82,7 +82,7 @@ resource "random_password" "password" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 5.0" + version = "~> 6.0" name = local.name cidr = local.vpc_cidr @@ -97,7 +97,7 @@ module "vpc" { module "rds" { source = "terraform-aws-modules/rds/aws" - version = "~> 5.0" + version = "~> 6.0" username = local.db_username password = local.db_password diff --git a/examples/postgresql-iam-instance/versions.tf b/examples/postgresql-iam-instance/versions.tf index b80a85f..263213d 100644 --- a/examples/postgresql-iam-instance/versions.tf +++ b/examples/postgresql-iam-instance/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = ">= 6.0" } random = { source = "hashicorp/random"