fix: Correct weird sort issue with wrappers hook between linux and macos

terraform-aws-modules · Dec 26, 2024 · b1b82d3 · b1b82d3
1 parent 04fd14d
commit b1b82d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wrappers/iam-assumable-role/main.tf b/wrappers/iam-assumable-role/main.tf
@@ -30,8 +30,8 @@ module "wrapper" {
   role_session_name                 = try(each.value.role_session_name, var.defaults.role_session_name, ["$${aws:username}"])
   role_sts_externalid               = try(each.value.role_sts_externalid, var.defaults.role_sts_externalid, [])
   tags                              = try(each.value.tags, var.defaults.tags, {})
+  trust_policy_conditions           = try(each.value.trust_policy_conditions, var.defaults.trust_policy_conditions, [])
   trusted_role_actions              = try(each.value.trusted_role_actions, var.defaults.trusted_role_actions, ["sts:AssumeRole", "sts:TagSession"])
   trusted_role_arns                 = try(each.value.trusted_role_arns, var.defaults.trusted_role_arns, [])
   trusted_role_services             = try(each.value.trusted_role_services, var.defaults.trusted_role_services, [])
-  trust_policy_conditions           = try(each.value.trust_policy_conditions, var.defaults.trust_policy_conditions, [])
 }
diff --git a/wrappers/iam-assumable-roles/main.tf b/wrappers/iam-assumable-roles/main.tf
@@ -28,8 +28,8 @@ module "wrapper" {
   readonly_role_policy_arns               = try(each.value.readonly_role_policy_arns, var.defaults.readonly_role_policy_arns, ["arn:aws:iam::aws:policy/ReadOnlyAccess"])
   readonly_role_requires_mfa              = try(each.value.readonly_role_requires_mfa, var.defaults.readonly_role_requires_mfa, true)
   readonly_role_tags                      = try(each.value.readonly_role_tags, var.defaults.readonly_role_tags, {})
+  trust_policy_conditions                 = try(each.value.trust_policy_conditions, var.defaults.trust_policy_conditions, [])
   trusted_role_actions                    = try(each.value.trusted_role_actions, var.defaults.trusted_role_actions, ["sts:AssumeRole", "sts:TagSession"])
   trusted_role_arns                       = try(each.value.trusted_role_arns, var.defaults.trusted_role_arns, [])
   trusted_role_services                   = try(each.value.trusted_role_services, var.defaults.trusted_role_services, [])
-  trust_policy_conditions                 = try(each.value.trust_policy_conditions, var.defaults.trust_policy_conditions, [])
 }