Skip to content

Commit 5fa8b3d

Browse files
committed
fix: Change variable name from _ids to _arns
1 parent ad78d56 commit 5fa8b3d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

modules/iam-role-for-service-accounts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ No modules.
188188
| <a name="input_create"></a> [create](#input\_create) | Controls if resources should be created (affects all resources) | `bool` | `true` | no |
189189
| <a name="input_create_policy"></a> [create\_policy](#input\_create\_policy) | Whether to create an IAM policy that is attached to the IAM role created | `bool` | `true` | no |
190190
| <a name="input_description"></a> [description](#input\_description) | Description of the role | `string` | `null` | no |
191-
| <a name="input_ebs_csi_kms_cmk_ids"></a> [ebs\_csi\_kms\_cmk\_ids](#input\_ebs\_csi\_kms\_cmk\_ids) | KMS CMK IDs to allow EBS CSI to manage encrypted volumes | `list(string)` | `[]` | no |
191+
| <a name="input_ebs_csi_kms_cmk_arns"></a> [ebs\_csi\_kms\_cmk\_arns](#input\_ebs\_csi\_kms\_cmk\_arns) | KMS CMK ARNs to allow EBS CSI to manage encrypted volumes | `list(string)` | `[]` | no |
192192
| <a name="input_enable_irsa_v2"></a> [enable\_irsa\_v2](#input\_enable\_irsa\_v2) | Determines whether to add the new IRSAv2 IAM assume role trust policy | `bool` | `false` | no |
193193
| <a name="input_external_dns_hosted_zone_arns"></a> [external\_dns\_hosted\_zone\_arns](#input\_external\_dns\_hosted\_zone\_arns) | Route53 hosted zone ARNs to allow External DNS to manage records | `list(string)` | `[]` | no |
194194
| <a name="input_external_secrets_kms_key_arns"></a> [external\_secrets\_kms\_key\_arns](#input\_external\_secrets\_kms\_key\_arns) | List of KMS Key ARNs that are used by Secrets Manager that contain secrets to mount using External Secrets | `list(string)` | `[]` | no |

modules/iam-role-for-service-accounts/policies.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ data "aws_iam_policy_document" "ebs_csi" {
299299
}
300300

301301
dynamic "statement" {
302-
for_each = length(var.ebs_csi_kms_cmk_ids) > 0 ? [1] : []
302+
for_each = length(var.ebs_csi_kms_cmk_arns) > 0 ? [1] : []
303303

304304
content {
305305
actions = [
@@ -308,7 +308,7 @@ data "aws_iam_policy_document" "ebs_csi" {
308308
"kms:RevokeGrant",
309309
]
310310

311-
resources = var.ebs_csi_kms_cmk_ids
311+
resources = var.ebs_csi_kms_cmk_arns
312312

313313
condition {
314314
test = "Bool"
@@ -319,7 +319,7 @@ data "aws_iam_policy_document" "ebs_csi" {
319319
}
320320

321321
dynamic "statement" {
322-
for_each = length(var.ebs_csi_kms_cmk_ids) > 0 ? [1] : []
322+
for_each = length(var.ebs_csi_kms_cmk_arns) > 0 ? [1] : []
323323

324324
content {
325325
actions = [
@@ -330,7 +330,7 @@ data "aws_iam_policy_document" "ebs_csi" {
330330
"kms:DescribeKey",
331331
]
332332

333-
resources = var.ebs_csi_kms_cmk_ids
333+
resources = var.ebs_csi_kms_cmk_arns
334334
}
335335
}
336336
}

modules/iam-role-for-service-accounts/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ variable "attach_ebs_csi_policy" {
184184
default = false
185185
}
186186

187-
variable "ebs_csi_kms_cmk_ids" {
188-
description = "KMS CMK IDs to allow EBS CSI to manage encrypted volumes"
187+
variable "ebs_csi_kms_cmk_arns" {
188+
description = "KMS CMK ARNs to allow EBS CSI to manage encrypted volumes"
189189
type = list(string)
190190
default = []
191191
}

wrappers/iam-role-for-service-accounts/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module "wrapper" {
2727
create = try(each.value.create, var.defaults.create, true)
2828
create_policy = try(each.value.create_policy, var.defaults.create_policy, true)
2929
description = try(each.value.description, var.defaults.description, null)
30-
ebs_csi_kms_cmk_ids = try(each.value.ebs_csi_kms_cmk_ids, var.defaults.ebs_csi_kms_cmk_ids, [])
30+
ebs_csi_kms_cmk_arns = try(each.value.ebs_csi_kms_cmk_arns, var.defaults.ebs_csi_kms_cmk_arns, [])
3131
enable_irsa_v2 = try(each.value.enable_irsa_v2, var.defaults.enable_irsa_v2, false)
3232
external_dns_hosted_zone_arns = try(each.value.external_dns_hosted_zone_arns, var.defaults.external_dns_hosted_zone_arns, [])
3333
external_secrets_kms_key_arns = try(each.value.external_secrets_kms_key_arns, var.defaults.external_secrets_kms_key_arns, [])

0 commit comments

Comments
 (0)