Merge pull request #80 from aws-ia/b-subnet-tags-for-tgw

Bug: subnet tags for tgw

examples/public_private_flow_logs/README.md

@@ -19,7 +19,7 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | aws-ia/vpc/aws | >= 2.0.0 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | ../.. | n/a |
 
 ## Resources
 

examples/transit_gateway/main.tf

@@ -1,7 +1,8 @@
+data "aws_availability_zones" "current" {}
+
 module "vpc" {
-  # source  = "aws-ia/vpc/aws"
-  # version = ">= 2.0.0"
-  source = "../.."
+  source  = "aws-ia/vpc/aws"
+  version = ">= 2.0.0"
 
   name       = "tgw"
   cidr_block = "10.0.0.0/16"
@@ -32,6 +33,10 @@ module "vpc" {
       transit_gateway_default_route_table_propagation = true
       transit_gateway_appliance_mode_support          = "enable"
       transit_gateway_dns_support                     = "disable"
+
+      tags = {
+        subnet_type = "tgw"
+      }
     }
   }
 }

examples/transit_gateway/outputs.tf

@@ -0,0 +1,9 @@
+output "tgw_subnets_tags_length" {
+  description = "Count of tgw subnet tags for a single az."
+  value       = length(module.vpc.tgw_subnet_attributes_by_az[data.aws_availability_zones.current.names[0]].tags)
+}
+
+output "private_subnets_tags_length" {
+  description = "Count of private subnet tags for a single az."
+  value       = length(module.vpc.private_subnet_attributes_by_az["truly_private/${data.aws_availability_zones.current.names[0]}"].tags)
+}

main.tf

@@ -207,7 +207,7 @@ resource "awscc_ec2_route_table" "tgw" {
   tags = concat(
     [{ "key" = "Name", "value" = "${local.subnet_names["transit_gateway"]}-${each.key}" }],
     module.tags.tags,
-    try(module.subnet_tags[split("/", each.key)[0]].tags, {})
+    try(module.subnet_tags["transit_gateway"].tags, [])
   )
 }
 

test/examples_transit_gatway_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/gruntwork-io/terratest/modules/terraform"
+	"github.com/likexian/gokit/assert"
 )
 
 func TestExamplesTransitGateway(t *testing.T) {
@@ -29,4 +30,10 @@ func TestExamplesTransitGateway(t *testing.T) {
 	defer terraform.Destroy(t, terraformOptions)
 	terraform.InitAndApply(t, terraformOptions)
 	terraform.ApplyAndIdempotent(t, terraformOptions)
+
+	tgwTagsLength := terraform.Output(t, terraformOptions, "tgw_subnets_tags_length")
+	assert.Equal(t, "2", tgwTagsLength)
+
+	privateTagsLength := terraform.Output(t, terraformOptions, "private_subnets_tags_length")
+	assert.Equal(t, "1", privateTagsLength)
 }