diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4395e67..dabb150 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.79.1
+ rev: v1.80.0
hooks:
- id: terraform_fmt
- id: terraform_validate
diff --git a/examples/private-cluster/README.md b/examples/private-cluster/README.md
index b129767..8fcb203 100644
--- a/examples/private-cluster/README.md
+++ b/examples/private-cluster/README.md
@@ -43,10 +43,10 @@ Note that this example may create resources which will incur monetary charges on
| [emr\_disabled](#module\_emr\_disabled) | ../.. | n/a |
| [emr\_instance\_fleet](#module\_emr\_instance\_fleet) | ../.. | n/a |
| [emr\_instance\_group](#module\_emr\_instance\_group) | ../.. | n/a |
-| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> v3.0 |
-| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
-| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 3.0 |
-| [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 4.0 |
+| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
+| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
+| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
+| [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 |
## Resources
diff --git a/examples/private-cluster/main.tf b/examples/private-cluster/main.tf
index 0d80b5f..ed05878 100644
--- a/examples/private-cluster/main.tf
+++ b/examples/private-cluster/main.tf
@@ -249,7 +249,7 @@ module "emr_disabled" {
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
- version = "~> 3.0"
+ version = "~> 5.0"
name = local.name
cidr = local.vpc_cidr
@@ -258,9 +258,8 @@ module "vpc" {
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 10)]
- enable_nat_gateway = true
- single_nat_gateway = true
- enable_dns_hostnames = true
+ enable_nat_gateway = true
+ single_nat_gateway = true
# https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-iam-policies.html#manually-tagged-resources
# Tag if you want EMR to create the security groups for you
@@ -274,7 +273,7 @@ module "vpc" {
module "vpc_endpoints" {
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
- version = "~> 3.0"
+ version = "~> 5.0"
vpc_id = module.vpc.vpc_id
security_group_ids = [module.vpc_endpoints_sg.security_group_id]
@@ -304,7 +303,7 @@ module "vpc_endpoints" {
module "vpc_endpoints_sg" {
source = "terraform-aws-modules/security-group/aws"
- version = "~> 4.0"
+ version = "~> 5.0"
name = "${local.name}-vpc-endpoints"
description = "Security group for VPC endpoint access"
@@ -323,7 +322,7 @@ module "vpc_endpoints_sg" {
module "s3_bucket" {
source = "terraform-aws-modules/s3-bucket/aws"
- version = "~> v3.0"
+ version = "~> 3.0"
bucket_prefix = "${local.name}-"
diff --git a/examples/public-cluster/README.md b/examples/public-cluster/README.md
index 1eb8928..43bf0cf 100644
--- a/examples/public-cluster/README.md
+++ b/examples/public-cluster/README.md
@@ -40,8 +40,8 @@ Note that this example may create resources which will incur monetary charges on
|------|--------|---------|
| [emr\_instance\_fleet](#module\_emr\_instance\_fleet) | ../.. | n/a |
| [emr\_instance\_group](#module\_emr\_instance\_group) | ../.. | n/a |
-| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> v3.0 |
-| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
+| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
+| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
## Resources
diff --git a/examples/public-cluster/main.tf b/examples/public-cluster/main.tf
index 587ff99..ae8dd4a 100644
--- a/examples/public-cluster/main.tf
+++ b/examples/public-cluster/main.tf
@@ -247,7 +247,7 @@ module "emr_instance_group" {
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
- version = "~> 3.0"
+ version = "~> 5.0"
name = local.name
cidr = local.vpc_cidr
@@ -255,8 +255,7 @@ module "vpc" {
azs = local.azs
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
- enable_nat_gateway = false
- enable_dns_hostnames = true
+ enable_nat_gateway = false
# https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-managed-iam-policies.html#manually-tagged-resources
# Tag if you want EMR to create the security groups for you
@@ -271,7 +270,7 @@ module "vpc" {
module "s3_bucket" {
source = "terraform-aws-modules/s3-bucket/aws"
- version = "~> v3.0"
+ version = "~> 3.0"
bucket_prefix = "${local.name}-"
diff --git a/examples/serverless-cluster/README.md b/examples/serverless-cluster/README.md
index 8d608f3..2e25e19 100644
--- a/examples/serverless-cluster/README.md
+++ b/examples/serverless-cluster/README.md
@@ -44,7 +44,7 @@ Note that this example may create resources which will incur monetary charges on
| [emr\_serverless\_disabled](#module\_emr\_serverless\_disabled) | ../../modules/serverless | n/a |
| [emr\_serverless\_hive](#module\_emr\_serverless\_hive) | ../../modules/serverless | n/a |
| [emr\_serverless\_spark](#module\_emr\_serverless\_spark) | ../../modules/serverless | n/a |
-| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
+| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
## Resources
diff --git a/examples/serverless-cluster/main.tf b/examples/serverless-cluster/main.tf
index a7bfa05..7058dd7 100644
--- a/examples/serverless-cluster/main.tf
+++ b/examples/serverless-cluster/main.tf
@@ -132,7 +132,7 @@ module "emr_serverless_disabled" {
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
- version = "~> 3.0"
+ version = "~> 5.0"
name = local.name
cidr = local.vpc_cidr
@@ -141,9 +141,8 @@ module "vpc" {
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 10)]
- enable_nat_gateway = true
- single_nat_gateway = true
- enable_dns_hostnames = true
+ enable_nat_gateway = true
+ single_nat_gateway = true
tags = local.tags
}
diff --git a/examples/studio/README.md b/examples/studio/README.md
index 27dd472..3409ef9 100644
--- a/examples/studio/README.md
+++ b/examples/studio/README.md
@@ -38,8 +38,8 @@ $ terraform apply
| [emr\_studio\_disabled](#module\_emr\_studio\_disabled) | ../../modules/studio | n/a |
| [emr\_studio\_iam](#module\_emr\_studio\_iam) | ../../modules/studio | n/a |
| [emr\_studio\_sso](#module\_emr\_studio\_sso) | ../../modules/studio | n/a |
-| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> v3.0 |
-| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
+| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
+| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
## Resources
diff --git a/examples/studio/main.tf b/examples/studio/main.tf
index c84f45f..e4c9412 100644
--- a/examples/studio/main.tf
+++ b/examples/studio/main.tf
@@ -154,7 +154,7 @@ module "emr_studio_disabled" {
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
- version = "~> 3.0"
+ version = "~> 5.0"
name = local.name
cidr = local.vpc_cidr
@@ -172,7 +172,7 @@ module "vpc" {
module "s3_bucket" {
source = "terraform-aws-modules/s3-bucket/aws"
- version = "~> v3.0"
+ version = "~> 3.0"
bucket_prefix = "${local.name}-"
diff --git a/examples/virtual-cluster/README.md b/examples/virtual-cluster/README.md
index a1d417d..982498c 100644
--- a/examples/virtual-cluster/README.md
+++ b/examples/virtual-cluster/README.md
@@ -65,11 +65,11 @@ aws emr-containers list-virtual-clusters --region us-west-2 --states ARRESTED \
| [complete](#module\_complete) | ../../modules/virtual-cluster | n/a |
| [default](#module\_default) | ../../modules/virtual-cluster | n/a |
| [disabled](#module\_disabled) | ../../modules/virtual-cluster | n/a |
-| [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.10 |
-| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> v3.0 |
-| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
-| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 3.0 |
-| [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 4.0 |
+| [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.13 |
+| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
+| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 |
+| [vpc\_endpoints](#module\_vpc\_endpoints) | terraform-aws-modules/vpc/aws//modules/vpc-endpoints | ~> 5.0 |
+| [vpc\_endpoints\_sg](#module\_vpc\_endpoints\_sg) | terraform-aws-modules/security-group/aws | ~> 5.0 |
## Resources
diff --git a/examples/virtual-cluster/main.tf b/examples/virtual-cluster/main.tf
index 86e182f..e2350af 100644
--- a/examples/virtual-cluster/main.tf
+++ b/examples/virtual-cluster/main.tf
@@ -150,10 +150,10 @@ resource "null_resource" "start_job_run" {
module "eks" {
source = "terraform-aws-modules/eks/aws"
- version = "~> 19.10"
+ version = "~> 19.13"
cluster_name = local.name
- cluster_version = "1.24"
+ cluster_version = "1.27"
cluster_endpoint_public_access = true
cluster_addons = {
@@ -221,7 +221,7 @@ module "eks" {
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
- version = "~> 3.0"
+ version = "~> 5.0"
name = local.name
cidr = local.vpc_cidr
@@ -230,9 +230,8 @@ module "vpc" {
public_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k)]
private_subnets = [for k, v in local.azs : cidrsubnet(local.vpc_cidr, 8, k + 10)]
- enable_nat_gateway = true
- single_nat_gateway = true
- enable_dns_hostnames = true
+ enable_nat_gateway = true
+ single_nat_gateway = true
public_subnet_tags = {
"kubernetes.io/role/elb" = 1
@@ -247,7 +246,7 @@ module "vpc" {
module "vpc_endpoints" {
source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints"
- version = "~> 3.0"
+ version = "~> 5.0"
vpc_id = module.vpc.vpc_id
security_group_ids = [module.vpc_endpoints_sg.security_group_id]
@@ -277,7 +276,7 @@ module "vpc_endpoints" {
module "vpc_endpoints_sg" {
source = "terraform-aws-modules/security-group/aws"
- version = "~> 4.0"
+ version = "~> 5.0"
name = "${local.name}-vpc-endpoints"
description = "Security group for VPC endpoint access"
@@ -296,7 +295,7 @@ module "vpc_endpoints_sg" {
module "s3_bucket" {
source = "terraform-aws-modules/s3-bucket/aws"
- version = "~> v3.0"
+ version = "~> 3.0"
bucket_prefix = "${local.name}-"
diff --git a/modules/studio/main.tf b/modules/studio/main.tf
index af66ac0..60edc38 100644
--- a/modules/studio/main.tf
+++ b/modules/studio/main.tf
@@ -291,8 +291,8 @@ data "aws_iam_policy_document" "service" {
"s3:DeleteObject",
]
resources = coalescelist(
- ["arn:${local.partition}:s3:::*"],
- var.service_role_s3_bucket_arns
+ [var.service_role_s3_bucket_arns],
+ ["arn:${local.partition}:s3:::*"]
)
}