From 9d9442313c9d3e032432b413714afb34ddf3d6c4 Mon Sep 17 00:00:00 2001 From: Mohsen Sarmadi Date: Wed, 4 Apr 2018 17:46:53 +0100 Subject: [PATCH 1/4] Making logging configurable --- main.tf | 2 +- variables.tf | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index b341dc8..d4fa37d 100644 --- a/main.tf +++ b/main.tf @@ -11,7 +11,7 @@ resource "aws_lb" "application" { tags = "${merge(var.tags, map("Name", var.load_balancer_name))}" access_logs { - enabled = true + enabled = "${var.log_enable}" bucket = "${var.log_bucket_name}" prefix = "${var.log_location_prefix}" } diff --git a/variables.tf b/variables.tf index a901c43..4c0c0da 100644 --- a/variables.tf +++ b/variables.tf @@ -80,6 +80,11 @@ variable "load_balancer_update_timeout" { default = "10m" } +variable "log_enable" { + description = "Enable logging" + default = false +} + variable "log_bucket_name" { description = "S3 bucket (externally created) for storing load balancer access logs." } From d87a3bfea55f7afe862e536fce983f3840446768 Mon Sep 17 00:00:00 2001 From: Mohsen Sarmadi Date: Wed, 4 Apr 2018 17:47:15 +0100 Subject: [PATCH 2/4] Setting a default for bucket name --- variables.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/variables.tf b/variables.tf index 4c0c0da..e7298a3 100644 --- a/variables.tf +++ b/variables.tf @@ -87,6 +87,7 @@ variable "log_enable" { variable "log_bucket_name" { description = "S3 bucket (externally created) for storing load balancer access logs." + default = "" } variable "log_location_prefix" { From 01b36a0c83c41eea5900648bb2fcc1b58958dc69 Mon Sep 17 00:00:00 2001 From: Mohsen Sarmadi Date: Thu, 5 Apr 2018 16:48:33 +0100 Subject: [PATCH 3/4] set the default to true --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index e7298a3..cd2304f 100644 --- a/variables.tf +++ b/variables.tf @@ -82,7 +82,7 @@ variable "load_balancer_update_timeout" { variable "log_enable" { description = "Enable logging" - default = false + default = true } variable "log_bucket_name" { From 8802ca9febf0808d0883e53907c3f7f8826bdd24 Mon Sep 17 00:00:00 2001 From: Mohsen Sarmadi Date: Thu, 5 Apr 2018 17:36:58 +0100 Subject: [PATCH 4/4] Adding the new variable into tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e386c8..8f53377 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ script: - - terraform init - terraform fmt -check=true - - terraform validate -var "region=${AWS_REGION}" -var "subnets=[]" -var "vpc_id=vpc-abcde012" -var "load_balancer_name=my-lb" -var "log_bucket_name=my-log-bucket" -var "security_groups=[]" + - terraform validate -var "region=${AWS_REGION}" -var "subnets=[]" -var "vpc_id=vpc-abcde012" -var "load_balancer_name=my-lb" -var "log_enable=true" -var "log_bucket_name=my-log-bucket" -var "security_groups=[]" - docker run --rm -v $(pwd):/app/ --workdir=/app/ -t wata727/tflint --error-with-issues - cd examples/alb_test_fixture - terraform init