Skip to content

Commit 19cbccc

Browse files
committed
feat(s3): add KMS key resources and update SSE configuration
Added KMS key resources for ecr_viewer and logging. Updated S3 bucket server-side encryption configuration to reference the new KMS keys.
1 parent 68a17ec commit 19cbccc

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

s3.tf

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
resource "aws_kms_key" "ecr_viewer" {
2+
enable_key_rotation = true
3+
}
4+
5+
resource "aws_kms_key" "logging" {
6+
enable_key_rotation = true
7+
}
8+
19
resource "aws_s3_bucket" "ecr_viewer" {
210
bucket = local.s3_viewer_bucket_name
311
force_destroy = true
@@ -12,13 +20,12 @@ resource "aws_s3_bucket_public_access_block" "ecr_viewer" {
1220
restrict_public_buckets = true
1321
}
1422

15-
# https://avd.aquasec.com/misconfig/aws/s3/avd-aws-0132/
16-
# trivy:ignore:AVD-AWS-0132
1723
resource "aws_s3_bucket_server_side_encryption_configuration" "ecr_viewer" {
1824
bucket = aws_s3_bucket.ecr_viewer.bucket
1925
rule {
2026
apply_server_side_encryption_by_default {
21-
sse_algorithm = "aws:kms"
27+
kms_master_key_id = aws_kms_key.ecr_viewer.arn
28+
sse_algorithm = "aws:kms"
2229
}
2330
}
2431
}
@@ -49,13 +56,12 @@ resource "aws_s3_bucket_public_access_block" "logging" {
4956
restrict_public_buckets = true
5057
}
5158

52-
# https://avd.aquasec.com/misconfig/aws/s3/avd-aws-0132/
53-
# trivy:ignore:AVD-AWS-0132
5459
resource "aws_s3_bucket_server_side_encryption_configuration" "logging" {
5560
bucket = aws_s3_bucket.logging.bucket
5661
rule {
5762
apply_server_side_encryption_by_default {
58-
sse_algorithm = "aws:kms"
63+
kms_master_key_id = aws_kms_key.logging.arn
64+
sse_algorithm = "aws:kms"
5965
}
6066
}
6167
}

0 commit comments

Comments
 (0)