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

feat: Cloudtrail logging for s3 events #333

Merged
merged 2 commits into from
Jan 30, 2025
Merged

feat: Cloudtrail logging for s3 events #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6311b6
feat: Cloudtrail logging for s3 events
shivawandb Jan 30, 2025
f8a98e4
feat: Cloudtrail logging for s3 events
shivawandb Jan 30, 2025
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
16 changes: 8 additions & 8 deletions modules/cloudtrail/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "aws_s3_bucket" "cloudtrail_logs" {

# S3 Bucket Policy for CloudTrail
resource "aws_s3_bucket_policy" "cloudtrail_logs" {
bucket = aws_s3_bucket.cloudtrail_logs[0].id
bucket = aws_s3_bucket.cloudtrail_logs.id

policy = jsonencode({
Version = "2012-10-17",
Expand All @@ -21,7 +21,7 @@ resource "aws_s3_bucket_policy" "cloudtrail_logs" {
Service = "cloudtrail.amazonaws.com"
},
Action = "s3:PutObject",
Resource = "arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs[0].id}/*",
Resource = "arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs.id}/*",
Condition = {
StringEquals = {
"s3:x-amz-acl" = "bucket-owner-full-control"
Expand All @@ -39,7 +39,7 @@ resource "aws_s3_bucket_policy" "cloudtrail_logs" {
"s3:GetBucketAcl",
"s3:PutBucketAcl"
],
Resource = "arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs[0].id}"
Resource = "arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs.id}"
},
# Deny all HTTP (insecure) access
{
Expand All @@ -48,8 +48,8 @@ resource "aws_s3_bucket_policy" "cloudtrail_logs" {
Principal = "*",
Action = "s3:*",
Resource = [
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs[0].id}",
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs[0].id}/*"
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs.id}",
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs.id}/*"
],
Condition = {
Bool = {
Expand All @@ -63,7 +63,7 @@ resource "aws_s3_bucket_policy" "cloudtrail_logs" {

# Lifecycle Rules for S3 Bucket
resource "aws_s3_bucket_lifecycle_configuration" "cloudtrail_logs" {
bucket = aws_s3_bucket.cloudtrail_logs[0].id
bucket = aws_s3_bucket.cloudtrail_logs.id

rule {
id = "TransitionToGlacier"
Expand All @@ -85,7 +85,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "cloudtrail_logs" {
# CloudTrail Configuration
resource "aws_cloudtrail" "s3_event_logs" {
name = "s3-events-cloudtrail"
s3_bucket_name = aws_s3_bucket.cloudtrail_logs[0].id
s3_bucket_name = aws_s3_bucket.cloudtrail_logs.id
include_global_service_events = var.include_global_service_events
is_multi_region_trail = var.multi_region_trail
enable_log_file_validation = var.enable_log_file_validation
Expand All @@ -97,7 +97,7 @@ resource "aws_cloudtrail" "s3_event_logs" {
data_resource {
type = "AWS::S3::Object"
values = [
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs[0].id}/*"
"arn:aws:s3:::${aws_s3_bucket.cloudtrail_logs.id}/*"
]
}
}
Expand Down
15 changes: 5 additions & 10 deletions modules/cloudtrail/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
output "cloudtrail_bucket_name" {
description = "Name of the S3 bucket storing CloudTrail logs specific to S3 events"
value = var.enable_cloudtrail_s3_logging ? aws_s3_bucket.cloudtrail_logs[0].bucket : null
value = aws_s3_bucket.cloudtrail_logs.bucket
}

output "cloudtrail_bucket_arn" {
description = "ARN of the S3 bucket storing CloudTrail logs specific to S3 events"
value = var.enable_cloudtrail_s3_logging ? aws_s3_bucket.cloudtrail_logs[0].arn : null
value = aws_s3_bucket.cloudtrail_logs.arn
}

output "cloudtrail_name" {
description = "Name of the CloudTrail instance"
value = var.enable_cloudtrail_s3_logging ? aws_cloudtrail.s3_event_logs[0].name : null
value = aws_cloudtrail.s3_event_logs.name
}

output "cloudtrail_arn" {
description = "ARN of the CloudTrail instance"
value = var.enable_cloudtrail_s3_logging ? aws_cloudtrail.s3_event_logs[0].arn : null
}

output "force_destroy_warning" {
description = "Warning message if force_destroy is enabled"
value = var.force_destroy ? "WARNING: The S3 bucket is configured to be forcefully destroyed." : null
}
value = aws_cloudtrail.s3_event_logs.arn
}
Loading