Skip to content

Commit

Permalink
Bugfix issue with ALB bucket output name and name in general (#247)
Browse files Browse the repository at this point in the history
  • Loading branch information
gugaiz authored Sep 7, 2023
1 parent 9697073 commit 79c464b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
locals {
enabled = module.this.enabled
partition = join("", data.aws_partition.current[*].partition)
enabled = module.this.enabled
partition = join("", data.aws_partition.current[*].partition)
s3_bucket_access_log_name = var.s3_bucket_access_log_bucket_name != "" ? var.s3_bucket_access_log_bucket_name : "${module.this.id}-alb-logs-${random_string.elb_logs_suffix.result}"
}
data "aws_partition" "current" {
Expand Down Expand Up @@ -1103,7 +1104,7 @@ module "elb_logs" {
source = "cloudposse/lb-s3-bucket/aws"
version = "0.19.0"
enabled = var.enable_loadbalancer_logs && local.enabled && var.tier == "WebServer" && var.environment_type == "LoadBalanced" && var.loadbalancer_type != "network" && !var.loadbalancer_is_shared ? true : false
name = "${module.this.id}-alb-logs-${random_string.elb_logs_suffix.result}"
name = local.s3_bucket_access_log_name
force_destroy = var.force_destroy
versioning_enabled = var.s3_bucket_versioning_enabled
context = module.this.context
Expand Down
2 changes: 1 addition & 1 deletion outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ output "load_balancers" {
}

output "load_balancer_log_bucket" {
value = var.enable_loadbalancer_logs ? "${module.this.id}-eb-loadbalancer-logs-${random_string.elb_logs_suffix.result}" : null
value = var.enable_loadbalancer_logs ? local.s3_bucket_access_log_name : null
description = "Name of bucket where Load Balancer logs are stored (if enabled)"
}

Expand Down

0 comments on commit 79c464b

Please sign in to comment.