Update label module. Switch to using tags from label module. Remove old tags_ag. Update examples.

Author: Steven Nemetz

examples/disabled/main.tf

@@ -94,11 +94,7 @@ module "example" {
   desired_capacity          = 1
   wait_for_capacity_timeout = 0
 
-  tags_ag = [
-    {
-      key                 = "Project"
-      value               = "megasecret"
-      propagate_at_launch = true
-    },
-  ]
+  tags = {
+    Project = "megasecret"
+  }
 }

examples/ec2/main.tf

@@ -93,11 +93,7 @@ module "example" {
   desired_capacity          = 1
   wait_for_capacity_timeout = 0
 
-  tags_ag = [
-    {
-      key                 = "Project"
-      value               = "megasecret"
-      propagate_at_launch = true
-    },
-  ]
+  tags = {
+    Project = "megasecret"
+  }
 }

examples/elb/main.tf

@@ -7,8 +7,17 @@ data "aws_vpc" "vpc" {
   }
 }
 
-data "aws_subnet_ids" "all" {
+data "aws_subnet_ids" "private_subnet_ids" {
   vpc_id = "${data.aws_vpc.vpc.id}"
+
+  tags {
+    Network = "Private"
+  }
+}
+
+data "aws_subnet" "private_subnets" {
+  count = "${length(data.aws_subnet_ids.private_subnet_ids.ids)}"
+  id    = "${data.aws_subnet_ids.private_subnet_ids.ids[count.index]}"
 }
 
 data "aws_security_group" "default" {
@@ -74,36 +83,30 @@ module "example_asg" {
 
   # Auto scaling group
   asg_name                  = "example-asg"
-  vpc_zone_identifier       = ["${data.aws_subnet_ids.all.ids}"]
+  vpc_zone_identifier       = ["${data.aws_subnet_ids.private_subnet_ids.ids}"]
   health_check_type         = "EC2"
   min_size                  = 0
   max_size                  = 1
   desired_capacity          = 1
   wait_for_capacity_timeout = 0
 
-  tags_ag = [
-    {
-      key                 = "Environment"
-      value               = "dev"
-      propagate_at_launch = true
-    },
-    {
-      key                 = "Project"
-      value               = "megasecret"
-      propagate_at_launch = true
-    },
-  ]
+  tags = {
+    Environment = "dev"
+    Project     = "megasecret"
+  }
 }
 
+# TODO: Convert to lb module
 ######
 # ELB
 ######
 module "elb" {
-  source = "terraform-aws-modules/elb/aws"
+  source  = "terraform-aws-modules/elb/aws"
+  version = "1.2.0"
 
   name = "elb-example"
 
-  subnets         = ["${data.aws_subnet_ids.all.ids}"]
+  subnets         = ["${data.aws_subnet_ids.private_subnet_ids.ids}"]
   security_groups = ["${data.aws_security_group.default.id}"]
   internal        = false
 

main.tf

@@ -20,7 +20,7 @@ module "enabled" {
 # Define composite variables for resources
 module "label" {
   source        = "devops-workflow/label/local"
-  version       = "0.2.0"
+  version       = "0.2.1"
   attributes    = "${var.attributes}"
   component     = "${var.component}"
   delimiter     = "${var.delimiter}"
@@ -37,6 +37,21 @@ module "label" {
   team          = "${var.team}"
 }
 
+# Terraform converts true to 1. Can it be prevented?
+data "null_data_source" "tags_asg" {
+  count = "${module.enabled.value ? length(keys(module.label.tags)) : 0}"
+
+  inputs = "${map(
+    "key", "${element(keys(module.label.tags), count.index)}",
+    "value", "${element(values(module.label.tags), count.index)}",
+    "propagate_at_launch", "true"
+  )}"
+}
+
+locals {
+  tags_asg = ["${data.null_data_source.tags_asg.*.outputs}"]
+}
+
 #######################
 # Launch configuration
 #######################
@@ -111,27 +126,12 @@ resource "aws_autoscaling_group" "this" {
   placement_group           = "${var.placement_group}"
   protect_from_scale_in     = "${var.protect_from_scale_in}"
   suspended_processes       = "${var.suspended_processes}"
+  tags                      = ["${local.tags_asg}"]
   target_group_arns         = ["${var.target_group_arns}"]
   termination_policies      = "${var.termination_policies}"
   wait_for_capacity_timeout = "${var.wait_for_capacity_timeout}"
   wait_for_elb_capacity     = "${var.wait_for_elb_capacity}"
 
-  tags = ["${ concat(
-    list(
-      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
-  )}"]
-
   lifecycle {
     create_before_destroy = true
   }

variables.tf

@@ -261,11 +261,6 @@ variable "protect_from_scale_in" {
   default     = false
 }
 
-variable "tags_ag" {
-  description = "Additional tags for Autoscaling group. A list of tag blocks. Each element is a map with key, value, and propagate_at_launch."
-  default     = []
-}
-
 variable "vpc_zone_identifier" {
   description = "A list of subnet IDs to launch resources in"
   type        = "list"