Removed comments starting from # to fix README

README.md

@@ -177,6 +177,7 @@ Terraform version 0.10.3 or newer is required for this module to work.
 | create_vpc | Controls if VPC should be created (it affects almost all resources) | string | `true` | no |
 | database_route_table_tags | Additional tags for the database route tables | string | `<map>` | no |
 | database_subnet_group_tags | Additional tags for the database subnet group | string | `<map>` | no |
+| database_subnet_suffix | Suffix to append to database subnets name | string | `db` | no |
 | database_subnet_tags | Additional tags for the database subnets | string | `<map>` | no |
 | database_subnets | A list of database subnets | list | `<list>` | no |
 | default_vpc_enable_classiclink | Should be true to enable ClassicLink in the Default VPC | string | `false` | no |
@@ -191,6 +192,7 @@ Terraform version 0.10.3 or newer is required for this module to work.
 | dhcp_options_ntp_servers | Specify a list of NTP servers for DHCP options set | list | `<list>` | no |
 | dhcp_options_tags | Additional tags for the DHCP option set | string | `<map>` | no |
 | elasticache_route_table_tags | Additional tags for the elasticache route tables | string | `<map>` | no |
+| elasticache_subnet_suffix | Suffix to append to elasticache subnets name | string | `elasticache` | no |
 | elasticache_subnet_tags | Additional tags for the elasticache subnets | string | `<map>` | no |
 | elasticache_subnets | A list of elasticache subnets | list | `<list>` | no |
 | enable_dhcp_options | Should be true if you want to specify a DHCP options set with a custom domain name, DNS servers, NTP servers, netbios servers, and/or netbios server type | string | `false` | no |
@@ -213,15 +215,18 @@ Terraform version 0.10.3 or newer is required for this module to work.
 | nat_gateway_tags | Additional tags for the NAT gateways | string | `<map>` | no |
 | one_nat_gateway_per_az | Should be true if you want only one NAT Gateway per availability zone. Requires `var.azs` to be set, and the number of `public_subnets` created to be greater than or equal to the number of availability zones specified in `var.azs`. | string | `false` | no |
 | private_route_table_tags | Additional tags for the private route tables | string | `<map>` | no |
+| private_subnet_suffix | Suffix to append to private subnets name | string | `private` | no |
 | private_subnet_tags | Additional tags for the private subnets | string | `<map>` | no |
 | private_subnets | A list of private subnets inside the VPC | string | `<list>` | no |
 | propagate_private_route_tables_vgw | Should be true if you want route table propagation | string | `false` | no |
 | propagate_public_route_tables_vgw | Should be true if you want route table propagation | string | `false` | no |
 | public_route_table_tags | Additional tags for the public route tables | string | `<map>` | no |
+| public_subnet_suffix | Suffix to append to public subnets name | string | `public` | no |
 | public_subnet_tags | Additional tags for the public subnets | string | `<map>` | no |
 | public_subnets | A list of public subnets inside the VPC | string | `<list>` | no |
 | redshift_route_table_tags | Additional tags for the redshift route tables | string | `<map>` | no |
 | redshift_subnet_group_tags | Additional tags for the redshift subnet group | string | `<map>` | no |
+| redshift_subnet_suffix | Suffix to append to redshift subnets name | string | `redshift` | no |
 | redshift_subnet_tags | Additional tags for the redshift subnets | string | `<map>` | no |
 | redshift_subnets | A list of redshift subnets | list | `<list>` | no |
 | reuse_nat_ips | Should be true if you don't want EIPs to be created for your NAT Gateways and will instead pass them in via the 'external_nat_ip_ids' variable | string | `false` | no |
@@ -249,7 +254,7 @@ Terraform version 0.10.3 or newer is required for this module to work.
 | default_vpc_default_security_group_id | The ID of the security group created by default on VPC creation |
 | default_vpc_enable_dns_hostnames | Whether or not the VPC has DNS hostname support |
 | default_vpc_enable_dns_support | Whether or not the VPC has DNS support |
-| default_vpc_id | Default VPC |
+| default_vpc_id | The ID of the VPC |
 | default_vpc_instance_tenancy | Tenancy of instances spin up within VPC |
 | default_vpc_main_route_table_id | The ID of the main route table associated with this VPC |
 | elasticache_route_table_ids | List of IDs of elasticache route tables |
@@ -257,32 +262,32 @@ Terraform version 0.10.3 or newer is required for this module to work.
 | elasticache_subnet_group_name | Name of elasticache subnet group |
 | elasticache_subnets | List of IDs of elasticache subnets |
 | elasticache_subnets_cidr_blocks | List of cidr_blocks of elasticache subnets |
-| igw_id | Internet Gateway |
+| igw_id | The ID of the Internet Gateway |
 | intra_route_table_ids | List of IDs of intra route tables |
 | intra_subnets | List of IDs of intra subnets |
 | intra_subnets_cidr_blocks | List of cidr_blocks of intra subnets |
-| nat_ids | Nat gateway |
+| nat_ids | List of allocation ID of Elastic IPs created for AWS NAT Gateway |
 | nat_public_ips | List of public Elastic IPs created for AWS NAT Gateway |
 | natgw_ids | List of NAT Gateway IDs |
 | private_route_table_ids | List of IDs of private route tables |
-| private_subnets | Subnets |
+| private_subnets | List of IDs of private subnets |
 | private_subnets_cidr_blocks | List of cidr_blocks of private subnets |
-| public_route_table_ids | Route tables |
+| public_route_table_ids | List of IDs of public route tables |
 | public_subnets | List of IDs of public subnets |
 | public_subnets_cidr_blocks | List of cidr_blocks of public subnets |
 | redshift_route_table_ids | List of IDs of redshift route tables |
 | redshift_subnet_group | ID of redshift subnet group |
 | redshift_subnets | List of IDs of redshift subnets |
 | redshift_subnets_cidr_blocks | List of cidr_blocks of redshift subnets |
-| vgw_id | VPN Gateway |
+| vgw_id | The ID of the VPN Gateway |
 | vpc_cidr_block | The CIDR block of the VPC |
 | vpc_enable_dns_hostnames | Whether or not the VPC has DNS hostname support |
 | vpc_enable_dns_support | Whether or not the VPC has DNS support |
 | vpc_endpoint_dynamodb_id | The ID of VPC endpoint for DynamoDB |
 | vpc_endpoint_dynamodb_pl_id | The prefix list for the DynamoDB VPC endpoint. |
-| vpc_endpoint_s3_id | VPC Endpoints |
+| vpc_endpoint_s3_id | The ID of VPC endpoint for S3 |
 | vpc_endpoint_s3_pl_id | The prefix list for the S3 VPC endpoint. |
-| vpc_id | VPC |
+| vpc_id | The ID of the VPC |
 | vpc_instance_tenancy | Tenancy of instances spin up within VPC |
 | vpc_main_route_table_id | The ID of the main route table associated with this VPC |
 | vpc_secondary_cidr_blocks | List of secondary CIDR blocks of the VPC |

outputs.tf

-# VPC
 output "vpc_id" {
   description = "The ID of the VPC"
   value       = "${element(concat(aws_vpc.this.*.id, list("")), 0)}"
@@ -64,7 +63,6 @@ output "vpc_secondary_cidr_blocks" {
   value       = ["${aws_vpc_ipv4_cidr_block_association.this.*.cidr_block}"]
 }
 
-# Subnets
 output "private_subnets" {
   description = "List of IDs of private subnets"
   value       = ["${aws_subnet.private.*.id}"]
@@ -145,7 +143,6 @@ output "elasticache_subnet_group_name" {
   value       = "${element(concat(aws_elasticache_subnet_group.elasticache.*.name, list("")), 0)}"
 }
 
-# Route tables
 output "public_route_table_ids" {
   description = "List of IDs of public route tables"
   value       = ["${aws_route_table.public.*.id}"]
@@ -176,7 +173,6 @@ output "intra_route_table_ids" {
   value       = ["${aws_route_table.intra.*.id}"]
 }
 
-# Nat gateway
 output "nat_ids" {
   description = "List of allocation ID of Elastic IPs created for AWS NAT Gateway"
   value       = ["${aws_eip.nat.*.id}"]
@@ -192,13 +188,11 @@ output "natgw_ids" {
   value       = ["${aws_nat_gateway.this.*.id}"]
 }
 
-# Internet Gateway
 output "igw_id" {
   description = "The ID of the Internet Gateway"
   value       = "${element(concat(aws_internet_gateway.this.*.id, list("")), 0)}"
 }
 
-# VPC Endpoints
 output "vpc_endpoint_s3_id" {
   description = "The ID of VPC endpoint for S3"
   value       = "${element(concat(aws_vpc_endpoint.s3.*.id, list("")), 0)}"
@@ -214,7 +208,6 @@ output "vpc_endpoint_dynamodb_id" {
   value       = "${element(concat(aws_vpc_endpoint.dynamodb.*.id, list("")), 0)}"
 }
 
-# VPN Gateway
 output "vgw_id" {
   description = "The ID of the VPN Gateway"
   value       = "${element(concat(aws_vpn_gateway.this.*.id, aws_vpn_gateway_attachment.this.*.vpn_gateway_id, list("")), 0)}"
@@ -225,7 +218,6 @@ output "vpc_endpoint_dynamodb_pl_id" {
   value       = "${element(concat(aws_vpc_endpoint.dynamodb.*.prefix_list_id, list("")), 0)}"
 }
 
-# Default VPC
 output "default_vpc_id" {
   description = "The ID of the VPC"
   value       = "${element(concat(aws_default_vpc.this.*.id, list("")), 0)}"