Merge branch 'master' into feature/managed-default-security-group

bryantbiggs · web-flow · commit 99e8d19b3db9 · 2020-04-09T15:24:47.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ All notable changes to this project will be documented in this file.
 
 
 
+<a name="v2.33.0"></a>
+## [v2.33.0] - 2020-04-02
+
+- docs: Updated required versions of Terraform
+- feat: Add EC2 Auto Scaling VPC endpoint ([#374](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/374))
+- docs: Document create_database_subnet_group requiring database_subnets ([#424](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/424))
+
+
 <a name="v2.32.0"></a>
 ## [v2.32.0] - 2020-03-24
 
@@ -855,7 +863,8 @@ All notable changes to this project will be documented in this file.
 - Initial commit
 
 
-[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.32.0...HEAD
+[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.33.0...HEAD
+[v2.33.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.32.0...v2.33.0
 [v2.32.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.31.0...v2.32.0
 [v2.31.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.30.0...v2.31.0
 [v2.30.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v2.29.0...v2.30.0
diff --git a/README.md b/README.md
diff --git a/examples/complete-vpc/README.md b/examples/complete-vpc/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 | Name | Version |
diff --git a/examples/ipv6/README.md b/examples/ipv6/README.md
@@ -15,6 +15,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 | Name | Version |
diff --git a/examples/issue-108-route-already-exists/README.md b/examples/issue-108-route-already-exists/README.md
@@ -19,6 +19,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/issue-44-asymmetric-private-subnets/README.md b/examples/issue-44-asymmetric-private-subnets/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/issue-46-no-private-subnets/README.md b/examples/issue-46-no-private-subnets/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/manage-default-vpc/README.md b/examples/manage-default-vpc/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/network-acls/README.md b/examples/network-acls/README.md
@@ -19,6 +19,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/secondary-cidr-blocks/README.md b/examples/secondary-cidr-blocks/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/examples/simple-vpc/README.md b/examples/simple-vpc/README.md
@@ -21,6 +21,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 | Name | Version |
diff --git a/examples/test_fixture/README.md b/examples/test_fixture/README.md
@@ -21,6 +21,10 @@ Finished in 4.25 seconds (files took 2.75 seconds to load)
 This will destroy any existing test resources, create the resources afresh, run the tests, report back, and destroy the resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 | Name | Version |
@@ -30,7 +34,7 @@ This will destroy any existing test resources, create the resources afresh, run
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:-----:|
+|------|-------------|------|---------|:--------:|
 | region | n/a | `string` | `"eu-west-1"` | no |
 
 ## Outputs
diff --git a/examples/vpc-flow-logs/README.md b/examples/vpc-flow-logs/README.md
@@ -19,6 +19,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 | Name | Version |
diff --git a/examples/vpc-separate-private-route-tables/README.md b/examples/vpc-separate-private-route-tables/README.md
@@ -17,6 +17,10 @@ $ terraform apply
 Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
 ## Providers
 
 No provider.
diff --git a/outputs.tf b/outputs.tf
@@ -543,6 +543,21 @@ output "vpc_endpoint_ec2messages_dns_entry" {
   value       = flatten(aws_vpc_endpoint.ec2messages.*.dns_entry)
 }
 
+output "vpc_endpoint_ec2_autoscaling_id" {
+  description = "The ID of VPC endpoint for EC2 Autoscaling"
+  value       = concat(aws_vpc_endpoint.ec2_autoscaling.*.id, [""])[0]
+}
+
+output "vpc_endpoint_ec2_autoscaling_network_interface_ids" {
+  description = "One or more network interfaces for the VPC Endpoint for EC2 Autoscaling"
+  value       = flatten(aws_vpc_endpoint.ec2_autoscaling.*.network_interface_ids)
+}
+
+output "vpc_endpoint_ec2_autoscaling_dns_entry" {
+  description = "The DNS entries for the VPC Endpoint for EC2 Autoscaling."
+  value       = flatten(aws_vpc_endpoint.ec2_autoscaling.*.dns_entry)
+}
+
 output "vpc_endpoint_transferserver_id" {
   description = "The ID of VPC endpoint for transferserver"
   value       = concat(aws_vpc_endpoint.transferserver.*.id, [""])[0]
diff --git a/variables.tf b/variables.tf
@@ -209,7 +209,7 @@ variable "create_elasticache_subnet_route_table" {
 }
 
 variable "create_database_subnet_group" {
-  description = "Controls if database subnet group should be created"
+  description = "Controls if database subnet group should be created (n.b. database_subnets must also be set)"
   type        = bool
   default     = true
 }
@@ -579,6 +579,31 @@ variable "ec2messages_endpoint_subnet_ids" {
   default     = []
 }
 
+
+variable "enable_ec2_autoscaling_endpoint" {
+  description = "Should be true if you want to provision an EC2 Autoscaling endpoint to the VPC"
+  type        = bool
+  default     = false
+}
+
+variable "ec2_autoscaling_endpoint_security_group_ids" {
+  description = "The ID of one or more security groups to associate with the network interface for EC2 Autoscaling endpoint"
+  type        = list(string)
+  default     = []
+}
+
+variable "ec2_autoscaling_endpoint_private_dns_enabled" {
+  description = "Whether or not to associate a private hosted zone with the specified VPC for EC2 Autoscaling endpoint"
+  type        = bool
+  default     = false
+}
+
+variable "ec2_autoscaling_endpoint_subnet_ids" {
+  description = "The ID of one or more subnets in which to create a network interface for EC2 Autoscaling endpoint. Only a single subnet within an AZ is supported. If omitted, private subnets will be used."
+  type        = list(string)
+  default     = []
+}
+
 variable "enable_ecr_api_endpoint" {
   description = "Should be true if you want to provision an ecr api endpoint to the VPC"
   type        = bool
diff --git a/vpc-endpoints.tf b/vpc-endpoints.tf
@@ -295,6 +295,29 @@ resource "aws_vpc_endpoint" "ec2messages" {
   tags                = local.vpce_tags
 }
 
+###############################
+# VPC Endpoint for EC2 Autoscaling
+###############################
+data "aws_vpc_endpoint_service" "ec2_autoscaling" {
+  count = var.create_vpc && var.enable_ec2_autoscaling_endpoint ? 1 : 0
+
+  service = "autoscaling"
+}
+
+resource "aws_vpc_endpoint" "ec2_autoscaling" {
+  count = var.create_vpc && var.enable_ec2_autoscaling_endpoint ? 1 : 0
+
+  vpc_id            = local.vpc_id
+  service_name      = data.aws_vpc_endpoint_service.ec2_autoscaling[0].service_name
+  vpc_endpoint_type = "Interface"
+
+  security_group_ids  = var.ec2_autoscaling_endpoint_security_group_ids
+  subnet_ids          = coalescelist(var.ec2_autoscaling_endpoint_subnet_ids, aws_subnet.private.*.id)
+  private_dns_enabled = var.ec2_autoscaling_endpoint_private_dns_enabled
+  tags                = local.vpce_tags
+}
+
+
 ###################################
 # VPC Endpoint for Transfer Server
 ###################################
