Skip to content

Commit b8b7a4f

Browse files
wfrcedArtem Gorbatiukbryantbiggs
authored
fix: Set either name or name_prefix for fargate_fluentbit log group, not both (#219)
Co-authored-by: Artem Gorbatiuk <[email protected]> Co-authored-by: Bryant Biggs <[email protected]>
1 parent a60accd commit b8b7a4f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,14 +2181,15 @@ module "external_secrets" {
21812181
################################################################################
21822182

21832183
locals {
2184-
fargate_fluentbit_policy_name = try(var.fargate_fluentbit_cw_log_group.create, true) ? try(var.fargate_fluentbit.policy_name, "${var.cluster_name}-fargate-fluentbit-logs") : null
2184+
fargate_fluentbit_policy_name = try(var.fargate_fluentbit_cw_log_group.create, true) ? try(var.fargate_fluentbit.policy_name, "${var.cluster_name}-fargate-fluentbit-logs") : null
2185+
fargate_fluentbit_cw_log_group_name = try(var.fargate_fluentbit_cw_log_group.name, "/${var.cluster_name}/fargate-fluentbit-logs")
21852186
}
21862187

21872188
resource "aws_cloudwatch_log_group" "fargate_fluentbit" {
21882189
count = try(var.fargate_fluentbit_cw_log_group.create, true) && var.enable_fargate_fluentbit ? 1 : 0
21892190

2190-
name = try(var.fargate_fluentbit_cw_log_group.name, null)
2191-
name_prefix = try(var.fargate_fluentbit_cw_log_group.name_prefix, "/${var.cluster_name}/fargate-fluentbit-logs")
2191+
name = try(var.fargate_fluentbit_cw_log_group.use_name_prefix, true) ? null : local.fargate_fluentbit_cw_log_group_name
2192+
name_prefix = try(var.fargate_fluentbit_cw_log_group.use_name_prefix, true) ? local.fargate_fluentbit_cw_log_group_name : null
21922193
retention_in_days = try(var.fargate_fluentbit_cw_log_group.retention, 90)
21932194
kms_key_id = try(var.fargate_fluentbit_cw_log_group.kms_key_arn, null)
21942195
skip_destroy = try(var.fargate_fluentbit_cw_log_group.skip_destroy, false)

0 commit comments

Comments
 (0)