Add tags

Author: snemetz

main.tf

@@ -36,7 +36,7 @@ resource "null_resource" "this" {
     name          = "${null_resource.pre3.triggers.name_org}"
     name_20       = "${substr(replace(null_resource.pre3.triggers.name_org,"_","-"),0,19 <= length(null_resource.pre3.triggers.name_org) ? 19 : length(null_resource.pre3.triggers.name_org))}"
     name_32       = "${substr(replace(null_resource.pre3.triggers.name_org,"_","-"),0,31 <= length(null_resource.pre3.triggers.name_org) ? 31 : length(null_resource.pre3.triggers.name_org))}"
-    /* FIX: wants only strings
+    /* FIX: wants only strings. Moved to outputs
     tags        = "${ merge(
       var.tags,
       map("Name", var.name),

outputs.tf

@@ -23,10 +23,13 @@ output "organization" {
   description = "Organization name lowercase"
   value       = "${null_resource.this.triggers.organization}"
 }
-
-/*
 output "tags" {
-  description = "Tags"
-  value       = "${null_resource.this.triggers.tags}"
+  value = "${ merge(
+    var.tags,
+    map(
+      "Name", "${null_resource.this.triggers.name}",
+      "Environment", "${null_resource.this.triggers.environment}",
+      "Organization", "${null_resource.this.triggers.organization}",
+      "Terraform", "true"
+    ))}"
 }
-*/

test/main.tf

@@ -6,15 +6,15 @@ module "labels" {
   organization  = "CorpXyZ"
 }
 
-/*
+/* Need to fix outputs for when resources don't exist
 module "labels-disabled" {
   source        = "../"
   name          = "CapMe"
   environment   = "Dev"
   organization  = "CorpXyZ"
   enabled       = false
 }
-*/
+/**/
 
 module "labels-env" {
   source        = "../"

test/outputs.tf

@@ -23,10 +23,7 @@ output "organization" {
   description = "Organization name lowercase"
   value       = "${module.labels.organization}"
 }
-
-/*
 output "tags" {
   description = "Tags"
   value       = "${module.labels.tags}"
 }
-*/