Skip to content

fix(cloud_logs): optional KMS encryption key #157

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
May 21, 2025
Merged

fix(cloud_logs): optional KMS encryption key #157

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
19 changes: 12 additions & 7 deletions modules/log_ingestion.s3.cft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,13 @@ Parameters:
AllowedPattern: 'arn:(aws|aws-us-gov):s3:::.*'
KMSKeyARN:
Type: String
Description: The ARN of the KMS key used to encrypt the S3 bucket.
Description: (Optional) The ARN of the KMS key used to encrypt the S3 bucket.
Default: ""
KMSAccountId:
Type: String
Description: The AWS Account ID that owns the KMS key.
AllowedPattern: '^[0-9]{12}$'
Description: (Optional) The AWS Account ID that owns the KMS key.
AllowedPattern: '(^$|^[0-9]{12}$)'
Default: ""
BucketAccountId:
Type: String
Description: The AWS Account ID that owns the S3 bucket, if different from the current account.
Expand Down Expand Up @@ -108,6 +109,14 @@ Parameters:
Conditions:
CreateSNSTopic: !Equals [ !Ref CreateTopic, "true" ]
HasKMSKey: !Not [ !Equals [ !Ref KMSKeyARN, "" ] ]
HasKMSAccountId: !Not [ !Equals [ !Ref KMSAccountId, "" ] ]

NeedKMSPolicy: !And [
!Condition HasKMSKey,
!Condition HasKMSAccountId,
!Not [ !Equals [ !Ref KMSAccountId, !Ref BucketAccountId ] ]
]

DeployStackSet: !Or [
!Not [ !Equals [ !Ref BucketAccountId, !Ref "AWS::AccountId" ] ],
!Not [ !Equals [ !Ref TopicAccountId, !Ref "AWS::AccountId" ] ]
Expand All @@ -118,10 +127,6 @@ Conditions:
!Not [ !Condition DeployStackSet ]
]

NeedKMSPolicy: !And [
!Not [ !Equals [ !Ref KMSKeyARN, "" ] ],
!Not [ !Equals [ !Ref KMSAccountId, !Ref BucketAccountId ] ]
]
IsTopicAccount: !Equals [ !Ref TopicAccountId, !Ref "AWS::AccountId" ]

Resources:
Expand Down
Loading