Remove lb name's postfix and update examples (#5)

Author: marcincuber

.gitignore

@@ -4,4 +4,5 @@ errored.tfstate
 crash.log
 terraform.tfstate
 *.tfstate*
-terraform.tfvars
+terraform.tfvars
+*.terraform.lock.hcl

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
     args: ['--allow-missing-credentials']
   - id: trailing-whitespace
 - repo: git://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.44.0
+  rev: v1.45.0
   hooks:
   - id: terraform_fmt
   - id: terraform_docs

CHANGELOG.md

@@ -5,7 +5,25 @@ All notable changes to this project will be documented in this file.
 <a name="unreleased"></a>
 ## [Unreleased]
 
-- Update docs + lock versions and add changelog
+- Remove lb name's postfix and update examples
+
+
+<a name="1.2.2"></a>
+## [1.2.2] - 2020-11-09
+
+- Update module to remove 0.14 limit ([#4](https://github.com/umotif-public/terraform-aws-alb/issues/4))
+
+
+<a name="1.2.1"></a>
+## [1.2.1] - 2020-08-05
+
+- Improve module versions + add alb access logs example ([#3](https://github.com/umotif-public/terraform-aws-alb/issues/3))
+
+
+<a name="1.2.0"></a>
+## [1.2.0] - 2020-04-21
+
+- Feature/updates ([#2](https://github.com/umotif-public/terraform-aws-alb/issues/2))
 - add git hooks and update docs
 - update docs
 
@@ -34,7 +52,10 @@ All notable changes to this project will be documented in this file.
 - Add default redirect and nlb example
 
 
-[Unreleased]: https://github.com/umotif-public/terraform-aws-alb/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/umotif-public/terraform-aws-alb/compare/1.2.2...HEAD
+[1.2.2]: https://github.com/umotif-public/terraform-aws-alb/compare/1.2.1...1.2.2
+[1.2.1]: https://github.com/umotif-public/terraform-aws-alb/compare/1.2.0...1.2.1
+[1.2.0]: https://github.com/umotif-public/terraform-aws-alb/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/umotif-public/terraform-aws-alb/compare/1.0.4...1.1.0
 [1.0.4]: https://github.com/umotif-public/terraform-aws-alb/compare/1.0.3...1.0.4
 [1.0.3]: https://github.com/umotif-public/terraform-aws-alb/compare/1.0.2...1.0.3

README.md

@@ -9,7 +9,7 @@ These types of resources are supported:
 
 ## Terraform versions
 
-Terraform 0.12. Pin module version to `~> v1.0`. Submit pull-requests to `master` branch.
+Terraform 0.12. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch.
 
 ## Usage
 
@@ -18,7 +18,7 @@ Terraform 0.12. Pin module version to `~> v1.0`. Submit pull-requests to `master
 ```hcl
 module "alb" {
   source = "umotif-public/alb/aws"
-  version = "~> 1.2.1"
+  version = "~> 2.0.0"
 
   name_prefix = "complete-alb"
 
@@ -43,23 +43,22 @@ module "alb" {
 ```hcl
 module "nlb" {
   source = "umotif-public/alb/aws"
-  version = "~> 1.2.1"
+  version = "~> 2.0.0"
 
-  name = "complete-nlb"
+  name_prefix = "complete-nlb"
 
   load_balancer_type = "network"
 
   vpc_id             = "vpc-abasdasd132"
   subnets            = ["subnet-abasdasd132123", "subnet-abasdasd132123132"]
 
   access_logs = {
-    bucket = "my-nlb-logs"
+    bucket = "nlb-logs"
   }
 
   tags = {
     Project = "Test"
   }
-
 }
 ```
 

examples/alb-with-s3-access-logs/data.tf

@@ -5,38 +5,26 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "2.44.0"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
-
-  enable_nat_gateway = false
-
-  tags = {
-    Environment = "test"
-  }
+data "aws_vpc" "default" {
+  default = true
 }
 
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
+}
 #####
 # Application Load Balancer
 #####
 module "alb" {
   source = "../../"
 
-  name_prefix = "example-with-access-logs"
+  name_prefix = "alb-example-access-logs"
 
   load_balancer_type = "application"
 
   internal = false
-  vpc_id   = module.vpc.vpc_id
-  subnets  = flatten([module.vpc.public_subnets])
+  vpc_id   = data.aws_vpc.default.id
+  subnets  = data.aws_subnet_ids.all.ids
 
   enable_http_to_https_redirect = true
   cidr_blocks_redirect          = ["10.10.0.0/16"]
@@ -94,7 +82,6 @@ locals {
 resource "aws_s3_bucket" "alb_access_logs" {
   bucket = "example-alb-access-logs-bucket"
   acl    = "private"
-  region = data.aws_region.current.name
 
   server_side_encryption_configuration {
     rule {

examples/alb-with-s3-access-logs/main.tf

@@ -5,38 +5,26 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "2.21.0"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
-
-  enable_nat_gateway = false
-
-  tags = {
-    Environment = "test"
-  }
+data "aws_vpc" "default" {
+  default = true
 }
 
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
+}
 #####
 # Application Load Balancer
 #####
 module "alb" {
   source = "../../"
 
-  name_prefix = "complete-example"
+  name_prefix = "complete-alb-example"
 
   load_balancer_type = "application"
 
   internal = false
-  vpc_id   = module.vpc.vpc_id
-  subnets  = flatten([module.vpc.public_subnets])
+  vpc_id   = data.aws_vpc.default.id
+  subnets  = data.aws_subnet_ids.all.ids
 
   enable_http_to_https_redirect = true
   cidr_blocks_redirect          = ["10.10.0.0/16"]
@@ -68,7 +56,6 @@ resource "aws_lb_listener" "alb_80_redirect_to_443" {
 #####
 # SGs
 #####
-
 resource "aws_security_group_rule" "alb_ingress_443" {
   security_group_id = module.alb.security_group_id
   type              = "ingress"

examples/alb/main.tf

@@ -5,25 +5,13 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "2.21.0"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
-
-  enable_nat_gateway = false
-
-  tags = {
-    Environment = "test"
-  }
+data "aws_vpc" "default" {
+  default = true
 }
 
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
+}
 # resource "aws_eip" "main" {
 #   count = length(module.vpc.public_subnets)
 
@@ -36,13 +24,12 @@ module "vpc" {
 module "nlb" {
   source = "../../"
 
-  name_prefix = "complete-example"
+  name_prefix = "complete-nlb-example"
 
   load_balancer_type = "network"
 
-  vpc_id = module.vpc.vpc_id
-
-  subnets = flatten([module.vpc.public_subnets])
+  vpc_id  = data.aws_vpc.default.id
+  subnets = data.aws_subnet_ids.all.ids
 
   //  Use `subnet_mapping` to attach EIPs and comment out `subnets`
   // subnet_mapping = [for i, eip in aws_eip.main : { allocation_id : eip.id, subnet_id : tolist(module.vpc.public_subnets)[i] }]

examples/nlb/main.tf

@@ -1,9 +1,5 @@
-locals {
-  name_prefix = "${var.name_prefix}-${var.load_balancer_type == "network" ? "nlb" : "alb"}"
-}
-
 resource "aws_lb" "main" {
-  name = local.name_prefix
+  name = var.name_prefix
 
   load_balancer_type = var.load_balancer_type
   internal           = var.internal
@@ -38,7 +34,7 @@ resource "aws_lb" "main" {
   tags = merge(
     var.tags,
     {
-      "Name" = local.name_prefix
+      "Name" = var.name_prefix
     },
   )
 
@@ -69,14 +65,14 @@ resource "aws_lb_listener" "frontend_http_to_https_redirect" {
 
 resource "aws_security_group" "main" {
   count       = var.load_balancer_type == "network" ? 0 : 1
-  name_prefix = "${local.name_prefix}-sg-"
+  name_prefix = "${var.name_prefix}-sg-"
   description = var.description
   vpc_id      = var.vpc_id
 
   tags = merge(
     var.tags,
     {
-      "Name" = "${local.name_prefix}-sg"
+      "Name" = "${var.name_prefix}-sg"
     },
   )