EIP module refactoring (#81)

* gateway and instance now use same EIP module
* formatting code
* readme rebuild

Author: maximmi

README.md

@@ -50,6 +50,8 @@ Terraform module to provision public and private [`subnets`](http://docs.aws.ama
 __Note:__ this module is intended for use with an existing VPC and existing Internet Gateway.
 To create a new VPC, use [terraform-aws-vpc](https://github.com/cloudposse/terraform-aws-vpc) module.
 
+__Note 2:__ EIP module first checks if `gateway` mode enabled, so takes precedence other `instance` in case both enabled (which is bad idea and won't work anyway)
+
 
 ---
 

README.yaml

@@ -66,6 +66,8 @@ description: |-
   __Note:__ this module is intended for use with an existing VPC and existing Internet Gateway.
   To create a new VPC, use [terraform-aws-vpc](https://github.com/cloudposse/terraform-aws-vpc) module.
 
+  __Note 2:__ EIP module first checks if `gateway` mode enabled, so takes precedence other `instance` in case both enabled (which is bad idea and won't work anyway)
+
 # How to use this project
 usage: |-
   ```hcl

nat-eip.tf

@@ -0,0 +1,13 @@
+locals {
+  nat_eip_count = "${local.nat_gateways_count > 0 ? local.nat_gateways_count : (local.nat_instance_count > 0 ? local.nat_instance_count : 0)}"
+}
+
+resource "aws_eip" "default" {
+  count = "${local.nat_eip_count}"
+  vpc   = true
+  tags  = "${merge(module.private_label.tags, map("Name", format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
+
+  lifecycle {
+    create_before_destroy = true
+  }
+}

nat-gateway.tf

@@ -1,28 +1,18 @@
 module "nat_label" {
   source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.11.1"
   context    = "${module.label.context}"
-  attributes = "${distinct(compact(concat(module.label.attributes,list("nat"))))}"
+  attributes = "${distinct(compact(concat(module.label.attributes, list("nat"))))}"
 }
 
 locals {
   nat_gateways_count = "${var.nat_gateway_enabled == "true" ? length(var.availability_zones) : 0}"
 }
 
-resource "aws_eip" "default" {
-  count = "${local.nat_gateways_count}"
-  vpc   = true
-  tags  = "${merge(module.private_label.tags, map("Name",format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
-
-  lifecycle {
-    create_before_destroy = true
-  }
-}
-
 resource "aws_nat_gateway" "default" {
   count         = "${local.nat_gateways_count}"
   allocation_id = "${element(aws_eip.default.*.id, count.index)}"
   subnet_id     = "${element(aws_subnet.public.*.id, count.index)}"
-  tags          = "${merge(module.nat_label.tags, map("Name",format("%s%s%s", module.nat_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
+  tags          = "${merge(module.nat_label.tags, map("Name", format("%s%s%s", module.nat_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
 
   lifecycle {
     create_before_destroy = true

nat-instance.tf

@@ -1,7 +1,7 @@
 module "nat_instance_label" {
   source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.11.1"
   context    = "${module.label.context}"
-  attributes = "${distinct(compact(concat(module.label.attributes,list("nat", "instance"))))}"
+  attributes = "${distinct(compact(concat(module.label.attributes, list("nat", "instance"))))}"
 }
 
 locals {
@@ -67,7 +67,7 @@ resource "aws_instance" "nat_instance" {
   instance_type          = "${var.nat_instance_type}"
   subnet_id              = "${element(aws_subnet.public.*.id, count.index)}"
   vpc_security_group_ids = ["${aws_security_group.nat_instance.id}"]
-  tags                   = "${merge(module.nat_instance_label.tags, map("Name",format("%s%s%s", module.nat_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
+  tags                   = "${merge(module.nat_instance_label.tags, map("Name", format("%s%s%s", module.nat_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
 
   # Required by NAT
   # https://docs.aws.amazon.com/vpc/latest/userguide/VPC_NAT_Instance.html#EIP_Disable_SrcDestCheck
@@ -80,20 +80,10 @@ resource "aws_instance" "nat_instance" {
   }
 }
 
-resource "aws_eip" "nat_instance" {
-  count = "${local.nat_instance_count}"
-  vpc   = true
-  tags  = "${merge(module.nat_instance_label.tags, map("Name",format("%s%s%s", module.nat_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
-
-  lifecycle {
-    create_before_destroy = true
-  }
-}
-
 resource "aws_eip_association" "nat_instance" {
   count         = "${local.nat_instance_count}"
   instance_id   = "${element(aws_instance.nat_instance.*.id, count.index)}"
-  allocation_id = "${element(aws_eip.nat_instance.*.id, count.index)}"
+  allocation_id = "${element(aws_eip.default.*.id, count.index)}"
 }
 
 resource "aws_route" "nat_instance" {

private.tf

@@ -1,8 +1,8 @@
 module "private_label" {
   source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.11.1"
   context    = "${module.label.context}"
-  attributes = "${compact(concat(module.label.attributes,list("private")))}"
-  tags       = "${merge(module.label.tags, map(var.subnet_type_tag_key, format(var.subnet_type_tag_value_format,"private")))}"
+  attributes = "${compact(concat(module.label.attributes, list("private")))}"
+  tags       = "${merge(module.label.tags, map(var.subnet_type_tag_key, format(var.subnet_type_tag_value_format, "private")))}"
 }
 
 locals {
@@ -15,7 +15,7 @@ resource "aws_subnet" "private" {
   availability_zone = "${element(var.availability_zones, count.index)}"
   cidr_block        = "${cidrsubnet(signum(length(var.cidr_block)) == 1 ? var.cidr_block : data.aws_vpc.default.cidr_block, ceil(log(local.private_subnet_count * 2, 2)), count.index)}"
 
-  tags = "${merge(module.private_label.tags, map("Name",format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
+  tags = "${merge(module.private_label.tags, map("Name", format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
 
   lifecycle {
     # Ignore tags added by kops or kubernetes
@@ -27,7 +27,7 @@ resource "aws_route_table" "private" {
   count  = "${length(var.availability_zones)}"
   vpc_id = "${data.aws_vpc.default.id}"
 
-  tags = "${merge(module.private_label.tags, map("Name",format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
+  tags = "${merge(module.private_label.tags, map("Name", format("%s%s%s", module.private_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
 }
 
 resource "aws_route_table_association" "private" {

public.tf

@@ -1,8 +1,8 @@
 module "public_label" {
   source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.11.1"
   context    = "${module.label.context}"
-  attributes = "${compact(concat(module.label.attributes,list("public")))}"
-  tags       = "${merge(module.label.tags, map(var.subnet_type_tag_key, format(var.subnet_type_tag_value_format,"public")))}"
+  attributes = "${compact(concat(module.label.attributes, list("public")))}"
+  tags       = "${merge(module.label.tags, map(var.subnet_type_tag_key, format(var.subnet_type_tag_value_format, "public")))}"
 }
 
 locals {
@@ -16,7 +16,7 @@ resource "aws_subnet" "public" {
   availability_zone       = "${element(var.availability_zones, count.index)}"
   cidr_block              = "${cidrsubnet(signum(length(var.cidr_block)) == 1 ? var.cidr_block : data.aws_vpc.default.cidr_block, ceil(log(local.public_subnet_count * 2, 2)), local.public_subnet_count + count.index)}"
   map_public_ip_on_launch = "${local.map_public_ip_on_launch}"
-  tags                    = "${merge(module.public_label.tags, map("Name",format("%s%s%s", module.public_label.id, var.delimiter, replace(element(var.availability_zones, count.index),"-",var.delimiter))))}"
+  tags                    = "${merge(module.public_label.tags, map("Name", format("%s%s%s", module.public_label.id, var.delimiter, replace(element(var.availability_zones, count.index), "-", var.delimiter))))}"
 
   lifecycle {
     # Ignore tags added by kops or kubernetes