Fix truncate calc. Improve doc

Author: snemetz

main.tf

@@ -29,8 +29,7 @@ locals {
   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))}"
-  # Fix calc
-  org_attr_20 = "${(19 <= length(local.id_org) ? 19 - length(local.attr) : length(local.id_org) - length(local.attr))}"
+  org_attr_20 = "${min(18 - length(local.attr), length(local.id_org))}"
   id_attr_20  = "${19 <= length(local.id) ?
     join(var.delimiter,
       list(
@@ -40,7 +39,7 @@ locals {
       list(local.attr)
     )
     : local.id}"
-  org_attr_32 = "${(31 <= length(local.id_org) ? 31 - length(local.attr) : length(local.id_org) - length(local.attr))}"
+  org_attr_32 = "${min(30 - length(local.attr), length(local.id_org))}"
   id_attr_32  = "${31 <= length(local.id) ?
     join(var.delimiter,
       list(
@@ -63,5 +62,6 @@ locals {
       "Environment", "${local.env}",
       "Organization", "${local.org}",
       "Terraform", "true"
-    ))}"
+    )
+  )}"
 }

outputs.tf

@@ -20,11 +20,11 @@ output "id_32" {
   value       = "${local.id_32}"
 }
 output "id_attr_20" {
-  description = "ID truncated to 20 characters"
+  description = "ID max size 20 characters by truncating `id_org` then appending `attributes`"
   value       = "${local.id_attr_20}"
 }
 output "id_attr_32" {
-  description = "ID truncated to 32 characters"
+  description = "ID max size 32 characters by truncating `id_org` then appending `attributes`"
   value       = "${local.id_attr_32}"
 }
 output "id_env" {

test/main.tf

@@ -9,6 +9,8 @@ module "labels" {
   attributes    = ["8080"]
   tags          = "${map("Key", "Value")}"
 }
+
+/*
 module "labels-tags" {
   source        = "../"
   name          = "CapMe"
@@ -26,7 +28,7 @@ module "labels-disabled" {
   organization  = "CorpXyZ"
   enabled       = false
 }
-/**/
+/*
 
 module "labels-env" {
   source        = "../"
@@ -52,3 +54,4 @@ module "labels-org-env" {
   namespace-env = true
   namespace-org = true
 }
+*/

test/outputs.tf

@@ -8,26 +8,27 @@ output "environment" {
   value       = "${module.labels.environment}"
 }
 output "id" {
+  description = "Full combined ID"
   value       = "${module.labels.id}"
 }
 output "name" {
-  description = "Name"
+  description = "Name lowercase"
   value       = "${module.labels.name}"
 }
 output "id_20" {
-  description = "Name truncated to 20 characters"
+  description = "ID truncated to 20 characters"
   value       = "${module.labels.id_20}"
 }
 output "id_32" {
-  description = "Name truncated to 32 characters"
+  description = "ID truncated to 32 characters"
   value       = "${module.labels.id_32}"
 }
 output "id_attr_20" {
-  description = "Name truncated to 20 characters"
+  description = "ID max size 20 characters by truncating `id_org` then appending `attributes`"
   value       = "${module.labels.id_attr_20}"
 }
 output "id_attr_32" {
-  description = "Name truncated to 32 characters"
+  description = "ID max size 32 characters by truncating `id_org` then appending `attributes`"
   value       = "${module.labels.id_attr_32}"
 }
 output "id_env" {
@@ -43,7 +44,7 @@ output "organization" {
   value       = "${module.labels.organization}"
 }
 output "tags" {
-  description = "Tags"
+  description = "Tags with standard tags added"
   value       = "${module.labels.tags}"
 }
 output "org_attr_20" {