diff --git a/main.tf b/main.tf index 24f4c25..54ac4a3 100755 --- a/main.tf +++ b/main.tf @@ -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" { @@ -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 diff --git a/outputs.tf b/outputs.tf index 186c0cc..092a8e7 100644 --- a/outputs.tf +++ b/outputs.tf @@ -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)" }