Finish refactoring to use locals instead of null

Author: snemetz

main.tf

@@ -3,66 +3,24 @@
 #
 # TODO:
 #   Add attributes to name if not empty
-#   return name as lowercase
-#   return id and id_20, id_32 for combined name
 #   Refactor to use local and output the locals. Test - test - test
 
 locals {
   attr      = "${lower(format("%s", join(var.delimiter, compact(var.attributes))))}"
   env       = "${lower(format("%s", var.environment))}"
   name_low  = "${lower(format("%s", var.name))}"
   org       = "${lower(format("%s", var.organization))}"
-  name_env  = "${var.namespace-env ? join(var.delimiter, list(local.env, local.name_low)) : local.name_low}"
-  name_org  = "${var.namespace-org ? join(var.delimiter, list(local.org, local.name_env)) : local.name_env}"
-  name_20   = "${substr(replace(local.name_org,"_","-"),0,19 <= length(local.name_org) ? 19 : length(local.name_org))}"
-  name_32   = "${substr(replace(local.name_org,"_","-"),0,31 <= length(local.name_org) ? 31 : length(local.name_org))}"
+  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_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(
-      var.tags,
-      map(
-        "Name", "${local.name_org}",
-        "Environment", "${local.env}",
-        "Organization", "${local.org}",
-        "Terraform", "true"
-      ))}"
+    var.tags,
+    map(
+      "Name", "${local.id}",
+      "Environment", "${local.env}",
+      "Organization", "${local.org}",
+      "Terraform", "true"
+    ))}"
 }
-/*
-resource "null_resource" "pre1" {
-  count     = "${var.enabled ? 1 : 0}"
-  triggers  = {
-    attributes    = "${lower(format("%s", join(var.delimiter, compact(var.attributes))))}"
-    environment   = "${lower(format("%s", var.environment))}"
-    name          = "${lower(format("%s", var.name))}"
-    organization  = "${lower(format("%s", var.organization))}"
-  }
-}
-resource "null_resource" "pre2" {
-  count     = "${var.enabled ? 1 : 0}"
-  triggers  = {
-    name_env      = "${var.namespace-env ? join(var.delimiter, list(null_resource.pre1.triggers.environment, null_resource.pre1.triggers.name)) : null_resource.pre1.triggers.name}"
-  }
-}
-resource "null_resource" "pre3" {
-  count     = "${var.enabled ? 1 : 0}"
-  triggers  = {
-    name_org      = "${var.namespace-org ? join(var.delimiter, list(null_resource.pre1.triggers.organization, null_resource.pre2.triggers.name_env)) : null_resource.pre2.triggers.name_env}"
-  }
-}
-resource "null_resource" "this" {
-  count     = "${var.enabled ? 1 : 0}"
-  triggers  = {
-    attributes    = "${null_resource.pre1.triggers.attributes}"
-    environment   = "${null_resource.pre1.triggers.environment}"
-    id            = "${local.name_org}"
-    organization  = "${null_resource.pre1.triggers.organization}"
-    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. Moved to outputs
-    tags        = "${ merge(
-      var.tags,
-      map("Name", var.name),
-      map("Environment", var.environment),
-      map("Terraform", "true") )}"*/
-/*  }
-}
-*/

outputs.tf

@@ -8,58 +8,25 @@ output "environment" {
   value       = "${local.env}"
 }
 output "id" {
-  description = "Full formatted name ID"
-  #value       = "${null_resource.this.triggers.id}"
-  value       = "${local.name_org}"
+  description = "Fully formatted name ID"
+  value       = "${local.id}"
 }
-output "name" {
-  description = "Name"
-  value       = "${local.name_low}"
-}
-output "name_20" {
-  description = "Name truncated to 20 characters"
-  value       = "${local.name_20}"
-}
-output "name_32" {
-  description = "Name truncated to 32 characters"
-  value       = "${local.name_32}"
-}
-output "organization" {
-  description = "Organization name lowercase"
-  value       = "${local.org}"
-}
-
-/*
-output "attributes" {
-  description = "Attribute string lowercase"
-  value       = "${null_resource.this.triggers.attributes}"
-}
-output "environment" {
-  description = "Environment name lowercase"
-  value       = "${null_resource.this.triggers.environment}"
+output "id_20" {
+  description = "ID truncated to 20 characters"
+  value       = "${local.id_20}"
 }
-output "id" {
-  description = "Full formatted name ID"
-  #value       = "${null_resource.this.triggers.id}"
-  value       = "${local.name_org}=new"
+output "id_32" {
+  description = "ID truncated to 32 characters"
+  value       = "${local.id_32}"
 }
 output "name" {
-  description = "Name"
-  value       = "${null_resource.this.triggers.name}"
-}
-output "name_20" {
-  description = "Name truncated to 20 characters"
-  value       = "${null_resource.this.triggers.name_20}"
-}
-output "name_32" {
-  description = "Name truncated to 32 characters"
-  value       = "${null_resource.this.triggers.name_32}"
+  description = "Name lowercase"
+  value       = "${local.name_low}"
 }
 output "organization" {
   description = "Organization name lowercase"
-  value       = "${null_resource.this.triggers.organization}"
+  value       = "${local.org}"
 }
-*/
 output "tags" {
   value = "${local.tags}"
 }

test/outputs.tf

@@ -14,13 +14,13 @@ output "name" {
   description = "Name"
   value       = "${module.labels.name}"
 }
-output "name_20" {
+output "id_20" {
   description = "Name truncated to 20 characters"
-  value       = "${module.labels.name_20}"
+  value       = "${module.labels.id_20}"
 }
-output "name_32" {
+output "id_32" {
   description = "Name truncated to 32 characters"
-  value       = "${module.labels.name_32}"
+  value       = "${module.labels.id_32}"
 }
 output "organization" {
   description = "Organization name lowercase"

variables.tf

@@ -1,4 +1,3 @@
-// Standard Variables
 variable "attributes" {
   description = "Suffix name with additional attributes (policy, role, etc.)"
   type        = "list"
@@ -8,15 +7,11 @@ variable "delimiter" {
   description = "Delimiter to be used between `name`, `namespaces`, `attributes`, etc."
   default     = "-"
 }
-variable "enabled" {
-  description = "Enable use of module. Set to false to not create resources"
-  default     = true
-}
 variable "environment" {
   description = "Environment (ex: dev, qa, stage, prod)"
 }
 variable "name" {
-  description = "Name for the EFS Filesystem"
+  description = "Base name for resource"
 }
 variable "namespace-env" {
   description = "Prefix name with the environment"
@@ -35,24 +30,3 @@ variable "tags" {
   type        = "map"
   default     = {}
 }
-
-// Internal Variables
-variable "id" {
-  default = ""
-}
-variable "name_lower" {
-  description = "Internal"
-  default     = ""
-}
-variable "name_env" {
-  description = "Internal"
-  default     = ""
-}
-variable "name_org" {
-  description = "Internal"
-  default     = ""
-}
-variable "nameo" {
-  description = "Internal"
-  default     = ""
-}