From 7c117f7b857a445919f8843a5c0890f6673d24a6 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 30 May 2025 12:57:28 +0100 Subject: [PATCH 1/2] Align role with https://docs.aws.amazon.com/cli/latest/reference/emr-containers/update-role-trust-policy.html --- modules/virtual-cluster/main.tf | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modules/virtual-cluster/main.tf b/modules/virtual-cluster/main.tf index 3f43c55..f01317e 100644 --- a/modules/virtual-cluster/main.tf +++ b/modules/virtual-cluster/main.tf @@ -146,17 +146,6 @@ locals { data "aws_iam_policy_document" "assume" { count = local.create_iam_role ? 1 : 0 - statement { - sid = "EMR" - effect = "Allow" - actions = ["sts:AssumeRole"] - - principals { - type = "Service" - identifiers = ["elasticmapreduce.${data.aws_partition.current.dns_suffix}"] - } - } - statement { sid = "IRSA" effect = "Allow" From f320757243ed286ad5469276c66dbe522f84f4a7 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Fri, 30 May 2025 07:30:14 -0500 Subject: [PATCH 2/2] fix: Remove unused partition data source following policy change --- .pre-commit-config.yaml | 2 +- modules/virtual-cluster/README.md | 1 - modules/virtual-cluster/main.tf | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6cd122d..481604d 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.98.0 + rev: v1.99.1 hooks: - id: terraform_fmt - id: terraform_docs diff --git a/modules/virtual-cluster/README.md b/modules/virtual-cluster/README.md index 67b6a8c..dd6203c 100644 --- a/modules/virtual-cluster/README.md +++ b/modules/virtual-cluster/README.md @@ -112,7 +112,6 @@ No modules. | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | [aws_iam_policy_document.assume](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source | | [aws_iam_policy_document.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source | -| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source | ## Inputs diff --git a/modules/virtual-cluster/main.tf b/modules/virtual-cluster/main.tf index f01317e..4c54930 100644 --- a/modules/virtual-cluster/main.tf +++ b/modules/virtual-cluster/main.tf @@ -1,5 +1,4 @@ data "aws_caller_identity" "current" {} -data "aws_partition" "current" {} locals { account_id = data.aws_caller_identity.current.account_id