Upgrade label module and define new tag variables

Author: Steven Nemetz

main.tf

@@ -30,30 +30,42 @@ module "enabled" {
 
 module "label" {
   source        = "devops-workflow/label/local"
-  version       = "0.1.3"
-  organization  = "${var.organization}"
+  version       = "0.2.0"
+  attributes    = "${var.attributes}"
+  component     = "${var.component}"
+  delimiter     = "${var.delimiter}"
+  environment   = "${var.environment}"
+  monitor       = "${var.monitor}"
   name          = "${var.name}"
   namespace-env = "${var.namespace-env}"
   namespace-org = "${var.namespace-org}"
-  environment   = "${var.environment}"
-  delimiter     = "${var.delimiter}"
-  attributes    = "${var.attributes}"
+  organization  = "${var.organization}"
+  owner         = "${var.owner}"
+  product       = "${var.product}"
+  service       = "${var.service}"
   tags          = "${var.tags}"
+  team          = "${var.team}"
 }
 
 # TODO: need to support from var both basename and a complete name
 #       may have 1 log bucket for many apps
 module "log_bucket" {
   source        = "devops-workflow/label/local"
-  version       = "0.1.3"
-  organization  = "${var.organization}"
+  version       = "0.2.0"
+  attributes    = "${var.attributes}"
+  component     = "${var.component}"
+  delimiter     = "${var.delimiter}"
+  environment   = "${var.environment}"
+  monitor       = "${var.monitor}"
   name          = "${var.log_bucket_name}"
   namespace-env = true
   namespace-org = true
-  environment   = "${var.environment}"
-  delimiter     = "${var.delimiter}"
-  attributes    = "${var.attributes}"
+  organization  = "${var.organization}"
+  owner         = "${var.owner}"
+  product       = "${var.product}"
+  service       = "${var.service}"
   tags          = "${var.tags}"
+  team          = "${var.team}"
 }
 
 /*

variables.tf

@@ -7,44 +7,80 @@ variable "attributes" {
   default     = []
 }
 
+variable "component" {
+  description = "TAG: Underlying, dedicated piece of service (Cache, DB, ...)"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
 variable "delimiter" {
   description = "Delimiter to be used between `name`, `namespaces`, `attributes`, etc."
   type        = "string"
   default     = "-"
 }
 
 variable "environment" {
-  description = "Environment (ex: dev, qa, stage, prod)"
+  description = "Environment (ex: `dev`, `qa`, `stage`, `prod`). (Second or top level namespace. Depending on namespacing options)"
   type        = "string"
 }
 
+variable "monitor" {
+  description = "TAG: Should resource be monitored"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
 variable "name" {
   description = "Base name for resource"
   type        = "string"
 }
 
 variable "namespace-env" {
-  description = "Prefix name with the environment"
+  description = "Prefix name with the environment. If true, format is: <env>-<name>"
   default     = true
 }
 
 variable "namespace-org" {
-  description = "Prefix name with the organization. If both env and org namespaces are used, format will be <org>-<env>-<name>"
+  description = "Prefix name with the organization. If true, format is: <org>-<env namespaced name>. If both env and org namespaces are used, format will be <org>-<env>-<name>"
   default     = false
 }
 
 variable "organization" {
-  description = "Organization name"
+  description = "Organization name (Top level namespace)"
   type        = "string"
   default     = ""
 }
 
+variable "owner" {
+  description = "TAG: Owner of the service"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
+variable "product" {
+  description = "TAG: Company/business product"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
+variable "service" {
+  description = "TAG: Application (microservice) name"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
 variable "tags" {
-  description = "A map of additional tags to add"
+  description = "A map of additional tags"
   type        = "map"
   default     = {}
 }
 
+variable "team" {
+  description = "TAG: Department/team of people responsible for service"
+  type        = "string"
+  default     = "UNDEF-LB"
+}
+
 //
 // Module specific Variables
 //