Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: MalformedPolicyDocument error without kms or ssm arns #550

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: MalformedPolicyDocument error without kms or ssm arns #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97b9c59
fix: allow empty kms and ssm arns
brycelowe Feb 10, 2025
83debd9
fix: linters
brycelowe Feb 10, 2025
c3035d9
fix: include examples
brycelowe Feb 10, 2025
be40269
fix: pre-commit
brycelowe Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/iam-role-for-service-accounts-eks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Run `terraform destroy` when you don't need these resources.
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | ~> 19.21 |
| <a name="module_external_dns_irsa_role"></a> [external\_dns\_irsa\_role](#module\_external\_dns\_irsa\_role) | ../../modules/iam-role-for-service-accounts-eks | n/a |
| <a name="module_external_secrets_irsa_role"></a> [external\_secrets\_irsa\_role](#module\_external\_secrets\_irsa\_role) | ../../modules/iam-role-for-service-accounts-eks | n/a |
| <a name="module_external_secrets_without_kms_or_ssm_irsa_role"></a> [external\_secrets\_without\_kms\_or\_ssm\_irsa\_role](#module\_external\_secrets\_without\_kms\_or\_ssm\_irsa\_role) | ../../modules/iam-role-for-service-accounts-eks | n/a |
| <a name="module_fsx_lustre_csi_irsa_role"></a> [fsx\_lustre\_csi\_irsa\_role](#module\_fsx\_lustre\_csi\_irsa\_role) | ../../modules/iam-role-for-service-accounts-eks | n/a |
| <a name="module_iam_eks_role"></a> [iam\_eks\_role](#module\_iam\_eks\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
| <a name="module_iam_policy"></a> [iam\_policy](#module\_iam\_policy) | terraform-aws-modules/iam/aws//modules/iam-policy | n/a |
Expand Down
20 changes: 20 additions & 0 deletions examples/iam-role-for-service-accounts-eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,26 @@ module "external_secrets_irsa_role" {
tags = local.tags
}

module "external_secrets_without_kms_or_ssm_irsa_role" {
source = "../../modules/iam-role-for-service-accounts-eks"

role_name = "external-secrets"
attach_external_secrets_policy = true
external_secrets_ssm_parameter_arns = []
external_secrets_secrets_manager_arns = ["arn:aws:secretsmanager:*:*:secret:bar"]
external_secrets_kms_key_arns = []
external_secrets_secrets_manager_create_permission = false

oidc_providers = {
ex = {
provider_arn = module.eks.oidc_provider_arn
namespace_service_accounts = ["default:kubernetes-external-secrets"]
}
}

tags = local.tags
}

module "fsx_lustre_csi_irsa_role" {
source = "../../modules/iam-role-for-service-accounts-eks"

Expand Down
25 changes: 16 additions & 9 deletions modules/iam-role-for-service-accounts-eks/policies.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,12 +539,16 @@ data "aws_iam_policy_document" "external_secrets" {
resources = ["*"]
}

statement {
actions = [
"ssm:GetParameter",
"ssm:GetParameters",
]
resources = var.external_secrets_ssm_parameter_arns
dynamic "statement" {
for_each = length(var.external_secrets_ssm_parameter_arns) > 0 ? [1] : []
content {
actions = [
"ssm:GetParameter",
"ssm:GetParameters",
]

resources = var.external_secrets_ssm_parameter_arns
}
}

statement {
Expand All @@ -562,9 +566,12 @@ data "aws_iam_policy_document" "external_secrets" {
resources = var.external_secrets_secrets_manager_arns
}

statement {
actions = ["kms:Decrypt"]
resources = var.external_secrets_kms_key_arns
dynamic "statement" {
for_each = length(var.external_secrets_kms_key_arns) > 0 ? [1] : []
content {
actions = ["kms:Decrypt"]
resources = var.external_secrets_kms_key_arns
}
}

dynamic "statement" {
Expand Down