Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow email to be configured at account level #799

Merged
merged 3 commits into from
Aug 9, 2023
Merged

feat: allow email to be configured at account level #799

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94f8ac0
feat: allow email to be configured at account level
sgtoj Aug 7, 2023
d64be39
Update modules/account/main.tf
sgtoj Aug 9, 2023
5b3b26f
Merge branch 'main' into allow-account-level-email-config
milldr Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/account/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ locals {
# Organizational Units' Accounts list and map configuration
organizational_units_accounts = flatten([
for ou in local.organizational_units : [
for account in lookup(ou, "accounts", []) : merge(account, { "ou" = ou.name, "account_email_format" = lookup(ou, "account_email_format", var.account_email_format) })
for account in lookup(ou, "accounts", []) : merge(account, { "ou" = ou.name, "account_email_format" = lookup(account, "account_email_format", lookup(ou, "account_email_format", var.account_email_format)) })
sgtoj marked this conversation as resolved.
Show resolved Hide resolved
]
])
organizational_units_accounts_map = { for acc in local.organizational_units_accounts : acc.name => acc }
Expand Down Expand Up @@ -139,7 +139,7 @@ resource "aws_organizations_account" "organizational_units_accounts" {
for_each = local.organizational_units_accounts_map
name = each.value.name
parent_id = aws_organizations_organizational_unit.this[local.account_names_organizational_unit_names_map[each.value.name]].id
email = format(each.value.account_email_format, each.value.name)
email = try(format(each.value.account_email_format, each.value.name), each.value.account_email_format)
iam_user_access_to_billing = var.account_iam_user_access_to_billing
tags = merge(module.this.tags, try(each.value.tags, {}), { Name : each.value.name })

Expand Down