Updated terraform expected test output

tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-bastionuserdata-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.bastionuserdata-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-bastionuserdata-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-bastionuserdata-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.bastionuserdata-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.bastionuserdata-example-com.id}"
 }

tests/integration/update_cluster/complex/kubernetes.tf

@@ -34,6 +34,18 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_public_id" {
+  value = "${aws_route_table.complex-example-com.id}"
+}
+
+output "subnet_us-test-1a-public_id" {
+  value = "${aws_subnet.us-test-1a-complex-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.complex-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.complex-example-com.id}"
 }

tests/integration/update_cluster/ha/kubernetes.tf

@@ -34,6 +34,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_public_id" {
+  value = "${aws_route_table.ha-example-com.id}"
+}
+
+output "subnet_us-test-1a-public_id" {
+  value = "${aws_subnet.us-test-1a-ha-example-com.id}"
+}
+
+output "subnet_us-test-1b-public_id" {
+  value = "${aws_subnet.us-test-1b-ha-example-com.id}"
+}
+
+output "subnet_us-test-1c-public_id" {
+  value = "${aws_subnet.us-test-1c-ha-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.ha-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.ha-example-com.id}"
 }

tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf

@@ -6,6 +6,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-lifecyclephases-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.lifecyclephases-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-lifecyclephases-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-lifecyclephases-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.lifecyclephases-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.lifecyclephases-example-com.id}"
 }

tests/integration/update_cluster/minimal-141/kubernetes.tf

@@ -34,6 +34,18 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_public_id" {
+  value = "${aws_route_table.minimal-141-example-com.id}"
+}
+
+output "subnet_us-test-1a-public_id" {
+  value = "${aws_subnet.us-test-1a-minimal-141-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.minimal-141-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.minimal-141-example-com.id}"
 }

tests/integration/update_cluster/minimal/kubernetes.tf

@@ -34,6 +34,18 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_public_id" {
+  value = "${aws_route_table.minimal-example-com.id}"
+}
+
+output "subnet_us-test-1a-public_id" {
+  value = "${aws_subnet.us-test-1a-minimal-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.minimal-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.minimal-example-com.id}"
 }

tests/integration/update_cluster/private-shared-subnet/kubernetes.tf

@@ -50,6 +50,14 @@ output "subnet_ids" {
   value = ["subnet-12345678", "subnet-abcdef"]
 }
 
+output "subnet_us-test-1a-private_id" {
+  value = "subnet-12345678"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "subnet-abcdef"
+}
+
 output "vpc_id" {
   value = "vpc-12345678"
 }

tests/integration/update_cluster/privatecalico/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privatecalico-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privatecalico-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privatecalico-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privatecalico-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privatecalico-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privatecalico-example-com.id}"
 }

tests/integration/update_cluster/privatecanal/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privatecanal-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privatecanal-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privatecanal-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privatecanal-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privatecanal-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privatecanal-example-com.id}"
 }

tests/integration/update_cluster/privatedns1/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privatedns1-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privatedns1-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privatedns1-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privatedns1-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privatedns1-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privatedns1-example-com.id}"
 }

tests/integration/update_cluster/privatedns2/kubernetes.tf

@@ -46,6 +46,22 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privatedns2-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privatedns2-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privatedns2-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privatedns2-example-com.id}"
+}
+
 output "vpc_id" {
   value = "vpc-12345678"
 }

tests/integration/update_cluster/privateflannel/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privateflannel-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privateflannel-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privateflannel-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privateflannel-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privateflannel-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privateflannel-example-com.id}"
 }

tests/integration/update_cluster/privatekopeio/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privatekopeio-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privatekopeio-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privatekopeio-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privatekopeio-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privatekopeio-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privatekopeio-example-com.id}"
 }

tests/integration/update_cluster/privateweave/kubernetes.tf

@@ -46,6 +46,26 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_private-us-test-1a_id" {
+  value = "${aws_route_table.private-us-test-1a-privateweave-example-com.id}"
+}
+
+output "route_table_public_id" {
+  value = "${aws_route_table.privateweave-example-com.id}"
+}
+
+output "subnet_us-test-1a-private_id" {
+  value = "${aws_subnet.us-test-1a-privateweave-example-com.id}"
+}
+
+output "subnet_us-test-1a-utility_id" {
+  value = "${aws_subnet.utility-us-test-1a-privateweave-example-com.id}"
+}
+
+output "vpc_cidr_block" {
+  value = "${aws_vpc.privateweave-example-com.cidr_block}"
+}
+
 output "vpc_id" {
   value = "${aws_vpc.privateweave-example-com.id}"
 }

tests/integration/update_cluster/shared_subnet/kubernetes.tf

@@ -38,6 +38,10 @@ output "subnet_ids" {
   value = ["subnet-12345678"]
 }
 
+output "subnet_us-test-1a-public_id" {
+  value = "subnet-12345678"
+}
+
 output "vpc_id" {
   value = "vpc-12345678"
 }

tests/integration/update_cluster/shared_vpc/kubernetes.tf

@@ -34,6 +34,14 @@ output "region" {
   value = "us-test-1"
 }
 
+output "route_table_public_id" {
+  value = "${aws_route_table.sharedvpc-example-com.id}"
+}
+
+output "subnet_us-test-1a-public_id" {
+  value = "${aws_subnet.us-test-1a-sharedvpc-example-com.id}"
+}
+
 output "vpc_id" {
   value = "vpc-12345678"
 }