* 1.0.3 -- 2023-12-12

- update to make ou list or ou ids work
terraform-modules · Dec 12, 2023 · c81f55e · c81f55e
1 parent fba977b
commit c81f55e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,3 +9,6 @@
 
 * 1.0.2 -- 2023-11-13
   - allow users, account_ids to be null
+
+* 1.0.3 -- 2023-12-12
+  - update to make ou list or ou ids work
diff --git a/common/version.tf b/common/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "1.0.2"
+  _module_version = "1.0.3"
 }
diff --git a/group-assignment/accounts.tf b/group-assignment/accounts.tf
@@ -14,10 +14,12 @@ locals {
 
   organizational_unit_hierarchy = length(var.organizational_unit_hierarchy) > 0 ? { for k, v in var.organizational_unit_hierarchy : k => v.self_id } : {}
 
-  _ou_1 = ! local.org_all && length(local.organizational_unit_names) > 0 && length(var.organizational_unit_hierarchy) > 0 ? [for k, v in local.organizational_unit_names : lookup(local.organizational_unit_hierarchy, k, null)] : []
-  _ou_2 = ! local.org_all && length(var.organizational_unit_ids) > 0 && length(var.organizational_unit_hierarchy) > 0 ? [for k in var.organizational_unit_ids : k if contains(values(local.organizational_unit_hierarchy, k))] : []
+  #  _ou_1 = ! local.org_all && length(local.organizational_unit_names) > 0 && length(var.organizational_unit_hierarchy) > 0 ? [for k, v in local.organizational_unit_names : lookup(local.organizational_unit_hierarchy, k, null)] : []
+  _ou_1 = ! local.org_all && length(local.organizational_unit_names) > 0 && length(var.organizational_unit_hierarchy) > 0 ? { for k, v in local.organizational_unit_hierarchy : k => v if contains(local.organizational_unit_names, k) } : {}
+  _ou_2 = ! local.org_all && length(var.organizational_unit_ids) > 0 && length(var.organizational_unit_hierarchy) > 0 ? { for k in var.organizational_unit_ids : k => k } : {}
 
-  organizational_units = distinct(compact(concat(local._ou_1, local._ou_2)))
+  #  organizational_units = distinct(compact(concat(local._ou_1, local._ou_2)))
+  organizational_units = merge(local._ou_1, local._ou_2)
 
   _id_3 = flatten([for k, v in data.aws_organizations_organizational_unit_descendant_accounts.ou : [for account in v.accounts : account.id if account.status == "ACTIVE"]])
   _id_4 = local.org_all ? values(local.active_accounts) : []
@@ -26,7 +28,7 @@ locals {
 }
 
 data "aws_organizations_organizational_unit_descendant_accounts" "ou" {
-  for_each  = toset(local.organizational_units)
-  parent_id = each.key
+  #  for_each  = {for k,v in local.ou_names_ids: k => v if length(v)>0 }
+  for_each  = { for k, v in local.organizational_units : k => v if v != null }
+  parent_id = each.value
 }
-