fix: simplify count statements (#93)

terraform-aws-modules · Sep 8, 2020 · 5825fb4 · 5825fb4
1 parent 591bef4
commit 5825fb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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)

diff --git 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"]