Update label module and define new tag variables. Define new tags for ASG. Fix issue user data no longer allowed to have length 0

Author: Steven Nemetz

main.tf

@@ -20,15 +20,21 @@ module "enabled" {
 # Define composite variables for resources
 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}"
 }
 
 #######################
@@ -112,8 +118,15 @@ resource "aws_autoscaling_group" "this" {
 
   tags = ["${ concat(
     list(
-      map("key", "Name", "value", module.label.id, "propagate_at_launch", true),
+      map("key", "Component", "value", var.component, "propagate_at_launch", true),
       map("key", "Environment", "value", module.label.environment, "propagate_at_launch", true),
+      map("key", "Monitor", "value", var.monitor, "propagate_at_launch", true),
+      map("key", "Name", "value", module.label.id, "propagate_at_launch", true),
+      map("key", "Organization", "value", var.organization, "propagate_at_launch", true),
+      map("key", "Owner", "value", var.owner, "propagate_at_launch", true),
+      map("key", "Product", "value", var.product, "propagate_at_launch", true),
+      map("key", "Service", "value", var.service, "propagate_at_launch", true),
+      map("key", "Team", "value", var.team, "propagate_at_launch", true),
       map("key", "Terraform", "value", "true", "propagate_at_launch", true)
     ),
     var.tags_ag

variables.tf

@@ -5,17 +5,32 @@ variable "attributes" {
   default     = []
 }
 
+variable "component" {
+  description = "TAG: Underlying, dedicated piece of service (Cache, DB, ...)"
+  type        = "string"
+  default     = "UNDEF-ASG"
+}
+
 variable "delimiter" {
   description = "Delimiter to be used between `name`, `namespaces`, `attributes`, etc."
+  type        = "string"
   default     = "-"
 }
 
 variable "environment" {
   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-ASG"
 }
 
 variable "name" {
-  description = "Base name for resources"
+  description = "Base name for resource"
+  type        = "string"
 }
 
 variable "namespace-env" {
@@ -29,16 +44,41 @@ variable "namespace-org" {
 }
 
 variable "organization" {
-  description = "Organization name (Top level namespace)."
+  description = "Organization name (Top level namespace)"
+  type        = "string"
   default     = ""
 }
 
+variable "owner" {
+  description = "TAG: Owner of the service"
+  type        = "string"
+  default     = "UNDEF-ASG"
+}
+
+variable "product" {
+  description = "TAG: Company/business product"
+  type        = "string"
+  default     = "UNDEF-ASG"
+}
+
+variable "service" {
+  description = "TAG: Application (microservice) name"
+  type        = "string"
+  default     = "UNDEF-ASG"
+}
+
 variable "tags" {
   description = "A map of additional tags"
   type        = "map"
   default     = {}
 }
 
+variable "team" {
+  description = "TAG: Department/team of people responsible for service"
+  type        = "string"
+  default     = "UNDEF-ASG"
+}
+
 // Variables specific to this module
 variable "enabled" {
   description = "Set to false to prevent the module from creating anything"
@@ -81,7 +121,7 @@ variable "associate_public_ip_address" {
 
 variable "user_data" {
   description = "The user data to provide when launching the instance"
-  default     = ""
+  default     = " "
 }
 
 variable "enable_monitoring" {