Skip to content

v1.0.3: add output of ldap_dn #2

Merged
merged 1 commit into from
Apr 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@

* v1.0.2 -- 20210402
- add `role_description` variable

* v1.0.3 -- 20210402
- add export of ldap_dn
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,6 @@ No modules.

| Name | Description |
|------|-------------|
| <a name="output_ldap_dn"></a> [ldap\_dn](#output\_ldap\_dn) | Created LDAP DN for role (empty if ldap is not enabled) |
| <a name="output_role_arn"></a> [role\_arn](#output\_role\_arn) | Created role ARN |
| <a name="output_role_name"></a> [role\_name](#output\_role\_name) | Created role name |
3 changes: 2 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ locals {

ldap_provider_exists = data.external.ldap_provider_bin.result.status == "0" ? true : false
enable_ldap = var.enable_ldap_creation && var.ldap_user != "" && var.ldap_password != "" && var.saml_provider_arn != "" && local.ldap_provider_exists
ldap_dn = format("cn=%s,ou=%s,ou=AWS,ou=Cloud,ou=Application,o=U.S. Census Bureau,c=US", aws_iam_role.role.name, local.account_id)

base_tags = {
"boc:tf_module_version" = local._module_version
Expand Down Expand Up @@ -135,7 +136,7 @@ resource "null_resource" "role_ldif" {
resource "ldap_object" "role" {
count = local.ldap_exists && local.enable_ldap ? 1 : 0
provider = ldap
dn = format("cn=%s,ou=%s,ou=AWS,ou=Cloud,ou=Application,o=U.S. Census Bureau,c=US", aws_iam_role.role.name, local.account_id)
dn = local.ldap_dn
object_classes = [
"top",
"bocGroup",
Expand Down
5 changes: 5 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ output "role_name" {
description = "Created role name"
value = aws_iam_role.role.name
}

output "ldap_dn" {
description = "Created LDAP DN for role (empty if ldap is not enabled)"
value = local.enable_ldap ? local.ldap_dn : ""
}
2 changes: 1 addition & 1 deletion version.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
locals {
_module_version = "1.0.2"
_module_version = "1.0.3"
}