Skip to content

Fix cloudtrail s3 bucket name #82

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 7 commits into from
Oct 17, 2025
Merged

Fix cloudtrail s3 bucket name #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7cda741
Update S3 bucket resources and add cloudtrail_label module
goruha Oct 17, 2025
341d75c
Add query_override variable for Datadog archive
goruha Oct 17, 2025
0ace107
Refactor query assignment in main.tf
goruha Oct 17, 2025
4acc711
Update src/variables.tf
goruha Oct 17, 2025
023aff9
Update query_override variable type and nullability
goruha Oct 17, 2025
9799c5f
Apply suggestion from @github-actions[bot]
goruha Oct 17, 2025
d0d08de
Update main.tf
goruha Oct 17, 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
24 changes: 18 additions & 6 deletions src/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ locals {
ordered_ids = concat(local.non_catchall_ids, local.catchall_id)

policy = local.enabled ? jsondecode(data.aws_iam_policy_document.default[0].json) : null

# default datadog_logs_archive query.
default_query = join(" OR ", concat([join(":", ["env", var.stage]), join(":", ["account", local.aws_account_id])], var.additional_query_tags))
query = var.query_override == null ? local.default_query : var.query_override
}

# We use the http data source due to lack of a data source for datadog_logs_archive_order
Expand Down Expand Up @@ -61,7 +65,7 @@ data "aws_iam_policy_document" "default" {
]

resources = [
"arn:${local.aws_partition}:s3:::${module.this.id}-cloudtrail",
"arn:${local.aws_partition}:s3:::${module.cloudtrail_label.id}",
]
}

Expand All @@ -80,7 +84,7 @@ data "aws_iam_policy_document" "default" {
]

resources = [
"arn:${local.aws_partition}:s3:::${module.this.id}-cloudtrail/*",
"arn:${local.aws_partition}:s3:::${module.cloudtrail_label.id}/*",
]

condition {
Expand Down Expand Up @@ -115,7 +119,7 @@ data "aws_iam_policy_document" "default" {
]

resources = [
"arn:${local.aws_partition}:s3:::${module.this.id}-cloudtrail/*",
"arn:${local.aws_partition}:s3:::${module.cloudtrail_label.id}/*",
]

condition {
Expand Down Expand Up @@ -216,6 +220,15 @@ module "archive_bucket" {
context = module.this.context
}

module "cloudtrail_label" {
source = "cloudposse/label/null"
version = "0.25.0" # requires Terraform >= 0.13.0

name = "datadog-logs-archive-cloudtrail"
context = module.this.context
}


module "cloudtrail_s3_bucket" {
source = "cloudposse/s3-bucket/aws"
version = "4.10.0"
Expand All @@ -224,7 +237,6 @@ module "cloudtrail_s3_bucket" {

count = local.enabled ? 1 : 0

name = "datadog-logs-archive-cloudtrail"
acl = "private"
enabled = local.enabled
force_destroy = var.s3_force_destroy
Expand Down Expand Up @@ -282,7 +294,7 @@ module "cloudtrail_s3_bucket" {
# https://github.com/hashicorp/terraform/issues/5613
allow_ssl_requests_only = false

context = module.this.context
context = module.cloudtrail_label.context
}

module "cloudtrail" {
Expand Down Expand Up @@ -330,7 +342,7 @@ resource "datadog_logs_archive" "logs_archive" {
name = var.stage
include_tags = true
rehydration_tags = ["rehydrated:true"]
query = join(" OR ", concat([join(":", ["env", var.stage]), join(":", ["account", local.aws_account_id])], var.additional_query_tags))
query = local.query

s3_archive {
bucket = module.archive_bucket[0].bucket_id
Expand Down
6 changes: 6 additions & 0 deletions src/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ variable "region" {
description = "AWS Region"
}

variable "query_override" {
type = string
nullable = true
description = "Override query for datadog archive. If null would be used query 'env:{stage} OR account:{aws account id} OR {additional_query_tags}'"
}

variable "additional_query_tags" {
type = list(any)
description = "Additional tags to be used in the query for this archive"
Expand Down
Loading