Merge pull request #88 from cmassey-berico/master

plus3it · Oct 30, 2020 · d3ff0a0 · d3ff0a0
2 parents 9782b42 + 8bd38f7
commit d3ff0a0
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 123 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,6 @@
 [bumpversion]
-current_version = 1.0.2
+current_version = 2.0.0
 commit = True
 message = Bumps version to {new_version}
 tag = False
 tag_name = {new_version}
-
diff --git a/README.md b/README.md
@@ -23,7 +23,6 @@ Terraform module to create a VPN Connection
 | amazon\_side\_asn | ASN for the Amazon side of the VPN gateway | `string` | `"64512"` | no |
 | cgw\_bgp\_asn | BGP ASN of the customer gateway | `string` | `null` | no |
 | cgw\_ip\_addresses | List of IP addresses of the customer gateways | `list(string)` | `[]` | no |
-| create\_vpn\_connection | Controls whether to create the VPN resources | `bool` | `true` | no |
 | destination\_cidr\_blocks | List of CIDR blocks to route through the VPN Connection | `list` | `[]` | no |
 | name | Name tag to associate to all resources that support tags | `string` | `null` | no |
 | propagating\_route\_table\_count | Number of route tables in the list of progagating\_route\_table\_ids | `string` | `"0"` | no |

diff --git a/main.tf b/main.tf
@@ -1,14 +1,10 @@
-provider "aws" {
-}
-
 locals {
   vgw_name = var.name == null ? "VGW" : "VGW_${var.name}"
   cgw_name = var.name == null ? "CGW" : "CGW_${var.name}"
   vpn_name = var.name == null ? "VPN" : "VPN_${var.name}"
 }
 
 resource "aws_vpn_gateway" "this" {
-  count = var.create_vpn_connection ? 1 : 0
 
   vpc_id          = var.vpc_id
   amazon_side_asn = var.amazon_side_asn
@@ -21,7 +17,7 @@ resource "aws_vpn_gateway" "this" {
 }
 
 resource "aws_customer_gateway" "this" {
-  count = var.create_vpn_connection ? length(var.cgw_ip_addresses) : 0
+  count = length(var.cgw_ip_addresses)
 
   bgp_asn    = var.cgw_bgp_asn
   ip_address = var.cgw_ip_addresses[count.index]
@@ -35,9 +31,9 @@ resource "aws_customer_gateway" "this" {
 }
 
 resource "aws_vpn_connection" "this" {
-  count = var.create_vpn_connection ? length(var.cgw_ip_addresses) : 0
+  count = length(var.cgw_ip_addresses)
 
-  vpn_gateway_id      = aws_vpn_gateway.this[0].id
+  vpn_gateway_id      = aws_vpn_gateway.this.id
   customer_gateway_id = aws_customer_gateway.this[count.index].id
   type                = "ipsec.1"
   static_routes_only  = var.static_routes_only
@@ -50,15 +46,15 @@ resource "aws_vpn_connection" "this" {
 }
 
 resource "aws_vpn_connection_route" "this" {
-  count = var.create_vpn_connection ? length(var.destination_cidr_blocks) : 0
+  count = length(var.destination_cidr_blocks)
 
   destination_cidr_block = var.destination_cidr_blocks[count.index]
   vpn_connection_id      = aws_vpn_connection.this[0].id
 }
 
 resource "aws_vpn_gateway_route_propagation" "this" {
-  count = var.create_vpn_connection ? var.propagating_route_table_count : 0
+  count = var.propagating_route_table_count
 
-  vpn_gateway_id = aws_vpn_gateway.this[0].id
+  vpn_gateway_id = aws_vpn_gateway.this.id
   route_table_id = var.propagating_route_table_ids[count.index]
 }
diff --git a/outputs.tf b/outputs.tf
@@ -1,6 +1,6 @@
 output "vpn_gateway_id" {
   description = "ID of the VPN Gateway"
-  value       = join("", aws_vpn_gateway.this.*.id)
+  value       = aws_vpn_gateway.this.id
 }
 
 output "customer_gateway_ids" {

diff --git a/tests/create_customer_gateway/README.md b/tests/create_customer_gateway/README.md
diff --git a/tests/create_customer_gateway/main.tf b/tests/create_customer_gateway/main.tf
@@ -26,9 +26,8 @@ module "example" {
     aws = aws
   }
 
-  create_vpn_connection = true
-  name                  = "tardigrade-vpc-connection-${random_string.this.result}"
-  vpc_id                = module.vpc.vpc_id
-  cgw_ip_addresses      = ["19.1.1.1", "19.1.1.2"]
-  cgw_bgp_asn           = "64511"
+  name             = "tardigrade-vpc-connection-${random_string.this.result}"
+  vpc_id           = module.vpc.vpc_id
+  cgw_ip_addresses = ["19.1.1.1", "19.1.1.2"]
+  cgw_bgp_asn      = "64511"
 }
diff --git a/tests/create_customer_gateway/versions.tf b/tests/create_customer_gateway/versions.tf
diff --git a/tests/create_vpn_gateway/README.md b/tests/create_vpn_gateway/README.md
diff --git a/tests/create_vpn_gateway/main.tf b/tests/create_vpn_gateway/main.tf
@@ -26,7 +26,6 @@ module "example" {
     aws = aws
   }
 
-  create_vpn_connection = true
-  name                  = "tardigrade-vpn-connection-${random_string.this.result}"
-  vpc_id                = module.vpc.vpc_id
+  name   = "tardigrade-vpn-connection-${random_string.this.result}"
+  vpc_id = module.vpc.vpc_id
 }
diff --git a/tests/create_vpn_gateway/versions.tf b/tests/create_vpn_gateway/versions.tf
diff --git a/tests/no_create/README.md b/tests/no_create/README.md
diff --git a/tests/no_create/main.tf b/tests/no_create/main.tf
diff --git a/tests/no_create/versions.tf b/tests/no_create/versions.tf
diff --git a/variables.tf b/variables.tf
@@ -1,9 +1,3 @@
-variable "create_vpn_connection" {
-  description = "Controls whether to create the VPN resources"
-  type        = bool
-  default     = true
-}
-
 variable "name" {
   description = "Name tag to associate to all resources that support tags"
   type        = string