From dd8876d711a4309a804aa58fbd6d8fd6ed17c598 Mon Sep 17 00:00:00 2001 From: Mohsen Date: Mon, 9 Apr 2018 20:17:20 +0100 Subject: [PATCH] Making logging configurable (#60) * Making logging configurable * Setting a default for bucket name * set the default to true * Adding the new variable into tests --- .travis.yml | 2 +- main.tf | 2 +- variables.tf | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) 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 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..cd2304f 100644 --- a/variables.tf +++ b/variables.tf @@ -80,8 +80,14 @@ variable "load_balancer_update_timeout" { default = "10m" } +variable "log_enable" { + description = "Enable logging" + default = true +} + variable "log_bucket_name" { description = "S3 bucket (externally created) for storing load balancer access logs." + default = "" } variable "log_location_prefix" {