Merge pull request #35 from unifio/yl-wip

Support adding additional tags
unifio · Aug 7, 2018 · 8dda436 · 8dda436
2 parents 5c1b475 + 3498a58
commit 8dda436
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/az/main.tf b/az/main.tf
@@ -40,6 +40,14 @@ locals {
 
   # Check to see if NAT gateways are NOT to be provisioned
   nat_gateways_not_enabled_check = "${var.nat_gateways_enabled != "true" ? 1 : 0}"
+
+  # default subnet tags
+  default_subnet_tags = [
+    {
+      application = "${var.stack_item_fullname}"
+      managed_by  = "terraform"
+    },
+  ]
 }
 
 ## Provisions DMZ resources
@@ -61,11 +69,7 @@ resource "aws_subnet" "dmz" {
   map_public_ip_on_launch = "${var.enable_dmz_public_ips}"
   vpc_id                  = "${var.vpc_id}"
 
-  tags {
-    application = "${var.stack_item_fullname}"
-    managed_by  = "terraform"
-    Name        = "${var.stack_item_label}-dmz-${count.index}"
-  }
+  tags = "${concat(local.default_subnet_tags, var.additional_subnet_tags, list(map("Name", "${var.stack_item_label}-dmz-${count.index}")))}"
 }
 
 ### Associates subnet with routing table
@@ -189,11 +193,7 @@ resource "aws_subnet" "lan" {
   cidr_block = "${local.lan_cidrs_override_enabled == "true" ? element(var.lan_cidrs_override,count.index) : cidrsubnet(data.aws_vpc.base.cidr_block,lookup(var.az_cidrsubnet_newbits, local.azs_provisioned_count * local.lans_multiplier),count.index + lookup(var.az_cidrsubnet_offset, local.azs_provisioned_count))}"
   vpc_id     = "${var.vpc_id}"
 
-  tags {
-    application = "${var.stack_item_fullname}"
-    managed_by  = "terraform"
-    Name        = "${var.stack_item_label}-lan-${count.index}"
-  }
+  tags = "${concat(local.default_subnet_tags, var.additional_subnet_tags, list(map("Name", "${var.stack_item_label}-lan-${count.index}")))}"
 }
 
 ### Provisions routing table

diff --git a/az/variables.tf b/az/variables.tf
@@ -13,6 +13,12 @@ variable "stack_item_label" {
   default     = "qckstrt"
 }
 
+variable "additional_subnet_tags" {
+  type        = "list"
+  description = "Additional subnet to apply at the subnet level, if any"
+  default     = []
+}
+
 ## VPC parameters
 variable "az_cidrsubnet_newbits" {
   type        = "map"

diff --git a/base/main.tf b/base/main.tf
@@ -8,6 +8,14 @@ terraform {
 ## Set default instance tennancy if not provided
 locals {
   default_instance_tenancy = "${length(var.instance_tenancy) >= 1 ? "${var.instance_tenancy}" : "default"}"
+
+  default_vpc_tags = [
+    {
+      application = "${var.stack_item_fullname}"
+      managed_by  = "terraform"
+      Name        = "${var.stack_item_label}-vpc"
+    },
+  ]
 }
 
 ## Provisions Virtual Private Cloud (VPC)
@@ -20,11 +28,7 @@ resource "aws_vpc" "vpc" {
   enable_classiclink_dns_support   = "${var.enable_classiclink_dns_support}"
   assign_generated_ipv6_cidr_block = "${var.assign_generated_ipv6_cidr_block}"
 
-  tags {
-    application = "${var.stack_item_fullname}"
-    managed_by  = "terraform"
-    Name        = "${var.stack_item_label}-vpc"
-  }
+  tags = "${concat(local.default_vpc_tags, var.additional_vpc_tags)}"
 }
 
 ## Provisions Internet gateways

diff --git a/base/variables.tf b/base/variables.tf
@@ -13,6 +13,12 @@ variable "stack_item_label" {
   default     = "qckstrt"
 }
 
+variable "additional_vpc_tags" {
+  type        = "list"
+  description = "Additional tags to apply at the VPC level, if any"
+  default     = []
+}
+
 ## VPC parameters
 variable "assign_generated_ipv6_cidr_block" {
   type        = "string"