Fix EC2 and ECS client's nat_public_ips parameter for existing VPC UI templates (#78)

* Remove ref to nat_public_ips from ui templates

* Use empty array, do not remove

Author: Joshua Timmons

hcp-ui-templates/ec2-existing-vpc/main.tf

@@ -93,7 +93,7 @@ module "aws_ec2_consul_client" {
   client_ca_file           = hcp_consul_cluster.main.consul_ca_file
   client_config_file       = hcp_consul_cluster.main.consul_config_file
   consul_version           = hcp_consul_cluster.main.consul_version
-  nat_public_ips           = module.vpc.nat_public_ips
+  nat_public_ips           = []
   install_demo_app         = local.install_demo_app
   root_token               = hcp_consul_cluster_root_token.token.secret_id
   security_group_id        = module.aws_hcp_consul.security_group_id

hcp-ui-templates/ecs-existing-vpc/main.tf

@@ -77,7 +77,7 @@ module "aws_ecs_cluster" {
   consul_url               = hcp_consul_cluster.main.consul_private_endpoint_url
   consul_version           = substr(hcp_consul_cluster.main.consul_version, 1, -1)
   datacenter               = hcp_consul_cluster.main.datacenter
-  nat_public_ips           = module.vpc.nat_public_ips
+  nat_public_ips           = []
   private_subnet_ids       = [local.private_subnet1, local.private_subnet2]
   public_subnet_ids        = [local.public_subnet1, local.public_subnet2]
   region                   = local.vpc_region

modules/hcp-ec2-client/variables.tf

@@ -33,7 +33,7 @@ variable "install_demo_app" {
 
 variable "nat_public_ips" {
   type        = list(string)
-  description = "Here to ensure the instance is deleted and public IP freed before attempting to destroy the Internet Gateway which will otherwise fail"
+  description = "Here to ensure the instance is deleted and public IP freed before attempting to destroy the Internet Gateway which will otherwise fail. Note: this is only necessary for new VPCs"
 }
 
 variable "node_id" {

scripts/generate_ui_templates.sh

@@ -13,7 +13,8 @@ generate_base_existing_vpc_terraform () {
     | sed -e 's/module\.vpc\.vpc_id/local\.vpc_id/' \
     | sed -e 's/module\.vpc\.public_subnets\[0\]/local\.public_subnet1/' \
     | sed -e 's/module\.vpc\.public_route_table_ids/\[local\.public_route_table_id\]/' \
-    | sed -e 's/module\.vpc\.private_route_table_ids/\[local\.private_route_table_id\]/'
+    | sed -e 's/module\.vpc\.private_route_table_ids/\[local\.private_route_table_id\]/' \
+    | sed -e 's/module\.vpc\.nat_public_ips/\[\]/'
 }
 
 generate_existing_vpc_terraform () {

test/hcp/testdata/ec2-existing-vpc.golden

@@ -93,7 +93,7 @@ module "aws_ec2_consul_client" {
   client_ca_file           = hcp_consul_cluster.main.consul_ca_file
   client_config_file       = hcp_consul_cluster.main.consul_config_file
   consul_version           = hcp_consul_cluster.main.consul_version
-  nat_public_ips           = module.vpc.nat_public_ips
+  nat_public_ips           = []
   install_demo_app         = local.install_demo_app
   root_token               = hcp_consul_cluster_root_token.token.secret_id
   security_group_id        = module.aws_hcp_consul.security_group_id

test/hcp/testdata/ecs-existing-vpc.golden

@@ -77,7 +77,7 @@ module "aws_ecs_cluster" {
   consul_url               = hcp_consul_cluster.main.consul_private_endpoint_url
   consul_version           = substr(hcp_consul_cluster.main.consul_version, 1, -1)
   datacenter               = hcp_consul_cluster.main.datacenter
-  nat_public_ips           = module.vpc.nat_public_ips
+  nat_public_ips           = []
   private_subnet_ids       = [local.private_subnet1, local.private_subnet2]
   public_subnet_ids        = [local.public_subnet1, local.public_subnet2]
   region                   = local.vpc_region