Expose all variables

Author: snemetz

main.tf

@@ -12,7 +12,7 @@ locals {
   org       = "${lower(format("%s", var.organization))}"
   id_env    = "${var.namespace-env ? join(var.delimiter, list(local.env, local.name_low)) : local.name_low}"
   id_org    = "${var.namespace-org ? join(var.delimiter, list(local.org, local.id_env)) : local.id_env}"
-  id        = "${local.id_org}"
+  id        = "${length(local.attr) > 0 ? join(var.delimiter, list(local.id_org, local.attr)) : local.id_org}"
   id_20     = "${substr(replace(local.id,"_","-"),0,19 <= length(local.id) ? 19 : length(local.id))}"
   id_32     = "${substr(replace(local.id,"_","-"),0,31 <= length(local.id) ? 31 : length(local.id))}"
   tags      = "${ merge(

outputs.tf

@@ -19,6 +19,14 @@ output "id_32" {
   description = "ID truncated to 32 characters"
   value       = "${local.id_32}"
 }
+output "id_env" {
+  description = "If env namespace enabled <env>-<name> else <name>"
+  value       = "${local.id_env}"
+}
+output "id_org" {
+  description = "If org namespace enabled <org>-<id_env> else <id_env>"
+  value       = "${local.id_org}"
+}
 output "name" {
   description = "Name lowercase"
   value       = "${local.name_low}"
@@ -28,5 +36,6 @@ output "organization" {
   value       = "${local.org}"
 }
 output "tags" {
-  value = "${local.tags}"
+  description = "Tags map merged with standard tags"
+  value       = "${local.tags}"
 }

test/main.tf

@@ -5,7 +5,7 @@ module "labels" {
   environment   = "Dev"
   organization  = "CorpXyZ"
   namespace-org = true
-  attributes    = ["role", "policy", "use", ""]
+  #attributes    = ["role", "policy", "use", ""]
   tags          = "${map("Key", "Value")}"
 }
 module "labels-tags" {

test/outputs.tf

@@ -22,6 +22,14 @@ output "id_32" {
   description = "Name truncated to 32 characters"
   value       = "${module.labels.id_32}"
 }
+output "id_env" {
+  description = "If env namespace enabled <env>-<name> else <name>"
+  value       = "${module.labels.id_env}"
+}
+output "id_org" {
+  description = "If org namespace enabled <org>-<id_env> else <id_env>"
+  value       = "${module.labels.id_org}"
+}
 output "organization" {
   description = "Organization name lowercase"
   value       = "${module.labels.organization}"