From 1404eeb5342ea2317f8352203cf9b1aeca8d25b1 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Thu, 3 Sep 2020 15:55:30 +0300 Subject: [PATCH 1/2] simplify count stmts --- modules/iam-assumable-role-with-oidc/main.tf | 2 +- modules/iam-assumable-role/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/iam-assumable-role-with-oidc/main.tf b/modules/iam-assumable-role-with-oidc/main.tf index e37f9c52..0f6a5a7c 100644 --- a/modules/iam-assumable-role-with-oidc/main.tf +++ b/modules/iam-assumable-role-with-oidc/main.tf @@ -66,7 +66,7 @@ resource "aws_iam_role" "this" { } resource "aws_iam_role_policy_attachment" "custom" { - count = var.create_role && length(var.role_policy_arns) > 0 ? length(var.role_policy_arns) : 0 + count = var.create_role ? length(var.role_policy_arns) : 0 role = join("", aws_iam_role.this.*.name) policy_arn = var.role_policy_arns[count.index] diff --git a/modules/iam-assumable-role/main.tf b/modules/iam-assumable-role/main.tf index 983b7a78..8cb47f6e 100644 --- a/modules/iam-assumable-role/main.tf +++ b/modules/iam-assumable-role/main.tf @@ -72,7 +72,7 @@ resource "aws_iam_role" "this" { } resource "aws_iam_role_policy_attachment" "custom" { - count = var.create_role && length(var.custom_role_policy_arns) > 0 ? length(var.custom_role_policy_arns) : 0 + count = var.create_role ? length(var.custom_role_policy_arns) : 0 role = aws_iam_role.this[0].name policy_arn = element(var.custom_role_policy_arns, count.index) From 8252aa66741256b90112cc888854f7b66e948730 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Thu, 3 Sep 2020 16:10:50 +0300 Subject: [PATCH 2/2] simplify count stmts --- modules/iam-group-with-policies/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/iam-group-with-policies/main.tf b/modules/iam-group-with-policies/main.tf index 48f4e3fc..987252a8 100644 --- a/modules/iam-group-with-policies/main.tf +++ b/modules/iam-group-with-policies/main.tf @@ -27,14 +27,14 @@ resource "aws_iam_group_policy_attachment" "iam_self_management" { } resource "aws_iam_group_policy_attachment" "custom_arns" { - count = length(var.custom_group_policy_arns) > 0 ? length(var.custom_group_policy_arns) : 0 + count = length(var.custom_group_policy_arns) group = local.group_name policy_arn = element(var.custom_group_policy_arns, count.index) } resource "aws_iam_group_policy_attachment" "custom" { - count = length(var.custom_group_policies) > 0 ? length(var.custom_group_policies) : 0 + count = length(var.custom_group_policies) group = local.group_name policy_arn = element(aws_iam_policy.custom.*.arn, count.index) @@ -51,7 +51,7 @@ resource "aws_iam_policy" "iam_self_management" { } resource "aws_iam_policy" "custom" { - count = length(var.custom_group_policies) > 0 ? length(var.custom_group_policies) : 0 + count = length(var.custom_group_policies) name = var.custom_group_policies[count.index]["name"] policy = var.custom_group_policies[count.index]["policy"]