Skip to content

Commit 8fa9a62

Browse files
fix: Ensure KMS key policy includes IAM role path (#979)
Co-authored-by: Bryant Biggs <[email protected]>
1 parent 85a0fca commit 8fa9a62

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

data.tf

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
data "aws_partition" "current" {}
2-
32
data "aws_caller_identity" "current" {}
4-
53
data "aws_region" "current" {}
64

75
data "aws_eks_cluster" "cluster" {
@@ -106,7 +104,7 @@ data "aws_iam_policy_document" "eks_key" {
106104
principals {
107105
type = "AWS"
108106
identifiers = [
109-
local.cluster_iam_role_arn
107+
local.cluster_iam_role_pathed_arn
110108
]
111109
}
112110
}
@@ -126,7 +124,7 @@ data "aws_iam_policy_document" "eks_key" {
126124
principals {
127125
type = "AWS"
128126
identifiers = [
129-
local.cluster_iam_role_arn
127+
local.cluster_iam_role_pathed_arn
130128
]
131129
}
132130

locals.tf

+3-2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ locals {
142142
}
143143
] : []
144144

145-
cluster_iam_role_name = var.iam_role_name == null ? "${var.cluster_name}-cluster-role" : var.iam_role_name
146-
cluster_iam_role_arn = var.create_iam_role ? "arn:${local.context.aws_partition_id}:iam::${local.context.aws_caller_identity_account_id}:role/${local.cluster_iam_role_name}" : var.iam_role_arn
145+
cluster_iam_role_name = var.iam_role_name == null ? "${var.cluster_name}-cluster-role" : var.iam_role_name
146+
cluster_iam_role_pathed_name = var.iam_role_path == null ? local.cluster_iam_role_name : "${trimprefix(var.iam_role_path, "/")}${local.cluster_iam_role_name}"
147+
cluster_iam_role_pathed_arn = var.create_iam_role ? "arn:${local.context.aws_partition_id}:iam::${local.context.aws_caller_identity_account_id}:role/${local.cluster_iam_role_pathed_name}" : var.iam_role_arn
147148
}

0 commit comments

Comments
 (0)