Skip to content

Commit 4507108

Browse files
mohsen0brandonjbjelland
authored andcommitted
Revert "Making logging configurable (#60)" (#62)
This reverts commit dd8876d.
1 parent ec8c7be commit 4507108

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ script:
3030
-
3131
- terraform init
3232
- terraform fmt -check=true
33-
- 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=[]"
33+
- 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=[]"
3434
- docker run --rm -v $(pwd):/app/ --workdir=/app/ -t wata727/tflint --error-with-issues
3535
- cd examples/alb_test_fixture
3636
- terraform init

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resource "aws_lb" "application" {
1111
tags = "${merge(var.tags, map("Name", var.load_balancer_name))}"
1212

1313
access_logs {
14-
enabled = "${var.log_enable}"
14+
enabled = true
1515
bucket = "${var.log_bucket_name}"
1616
prefix = "${var.log_location_prefix}"
1717
}

variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,8 @@ variable "load_balancer_update_timeout" {
8080
default = "10m"
8181
}
8282

83-
variable "log_enable" {
84-
description = "Enable logging"
85-
default = true
86-
}
87-
8883
variable "log_bucket_name" {
8984
description = "S3 bucket (externally created) for storing load balancer access logs."
90-
default = ""
9185
}
9286

9387
variable "log_location_prefix" {

0 commit comments

Comments
 (0)