Skip to content
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

Refactor config aggregation bucket to use s3 module #825

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Refactor config aggregation bucket to use s3 module #825

Show file tree
Hide file tree
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
36 changes: 16 additions & 20 deletions modules/config-aggregation-bucket/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ data "aws_caller_identity" "current" {}

locals {
caller_identity = data.aws_caller_identity.current
bucket_policy_allowed_object_prefix = formatlist("${aws_s3_bucket.bucket.arn}/AWSLogs/%s/Config/*", concat([local.caller_identity.id], var.enrolled_account_ids))
bucket_policy_allowed_object_prefix = formatlist("${module.bucket.bucket.arn}/AWSLogs/%s/Config/*", concat([local.caller_identity.id], var.enrolled_account_ids))
}

# S3 bucket policy for a logging bucket in another account
Expand All @@ -20,7 +20,7 @@ data "aws_iam_policy_document" "bucket_policy" {
sid = "AWSConfigBucketPermissionsCheck"
effect = "Allow"
actions = ["s3:GetBucketAcl"]
resources = [aws_s3_bucket.bucket.arn]
resources = [module.bucket.bucket.arn]

principals {
type = "Service"
Expand All @@ -33,7 +33,7 @@ data "aws_iam_policy_document" "bucket_policy" {
sid = "AWSConfigBucketExistenceCheck"
effect = "Allow"
actions = ["s3:ListBucket"]
resources = [aws_s3_bucket.bucket.arn]
resources = [module.bucket.bucket.arn]

principals {
type = "Service"
Expand Down Expand Up @@ -61,32 +61,28 @@ data "aws_iam_policy_document" "bucket_policy" {
}
}

resource "aws_s3_bucket" "bucket" {
module "bucket" {
source = "../s3"

bucket_prefix = var.bucket_prefix
acl = "private"

# NB: AWS Config can't deliver to buckets with object lock turned on, which is why
# it's not configured.
bucket_acl = "private"

attach_policy = true
policy = data.aws_iam_policy_document.bucket_policy.json

server_side_encryption_configuration {
rule {
enable_versioning = true

server_side_encryption_configuration = {
rule = {
# You can't use a different KMS key as Config stores objects already encrypted with
# the AWS managed S3 KMS key
apply_server_side_encryption_by_default {
apply_server_side_encryption_by_default = {
kms_master_key_id = "aws/s3"
sse_algorithm = "aws:kms"
}
}
}

versioning {
enabled = true
}

tags = var.tags
}

resource "aws_s3_bucket_policy" "bucket_policy" {
bucket = aws_s3_bucket.bucket.id
policy = data.aws_iam_policy_document.bucket_policy.json
additional_tags = var.tags
}
4 changes: 2 additions & 2 deletions modules/config-aggregation-bucket/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
output "s3_bucket_arn" {
value = aws_s3_bucket.bucket.arn
value = module.bucket.bucket.arn
}

output "s3_bucket_name" {
value = aws_s3_bucket.bucket.bucket
value = module.bucket.bucket.bucket
}