Skip to content

feat(cloudlogs): improve support for empty kms key #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2025
Merged

feat(cloudlogs): improve support for empty kms key #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/integrations/cloud-logs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ locals {
is_cross_account = var.bucket_account_id != null && var.bucket_account_id != data.aws_caller_identity.current.account_id

# KMS variables
kms_account_id = split(":", var.kms_key_arn)[3]
need_kms_policy = var.bucket_account_id != null && var.bucket_account_id != local.kms_account_id
kms_account_id = var.kms_key_arn != null && var.kms_key_arn != "" ? split(":", var.kms_key_arn)[3] : null
need_kms_policy = var.bucket_account_id != null && local.kms_account_id != null && var.bucket_account_id != local.kms_account_id

# Role variables
role_name = split("/", var.role_arn)[1]
Expand Down Expand Up @@ -152,7 +152,7 @@ data "aws_iam_policy_document" "cloudlogs_s3_access" {
}

dynamic "statement" {
for_each = var.kms_key_arn != null ? [1] : []
for_each = var.kms_key_arn != null && var.kms_key_arn != "" ? [1] : []
content {
sid = "CloudlogsKMSDecrypt"

Expand Down