Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ The extension reads the existing `DD_SITE` and `DD_API_KEY_SECRET_ARN` environme
| dd_enrich_cloudwatch_tags | Enrich logs from CloudWatch with log group tags via Datadog backend (requires Resource Collection enabled). Mutually exclusive with `dd_fetch_log_group_tags` | `bool` | `null` |
| dd_fetch_lambda_tags | Fetch Lambda tags | `bool` | `null` |
| dd_fetch_log_group_tags | **(Deprecated in favor of dd_enrich_cloudwatch_tags)** Fetch Log Group tags | `bool` | `null` |
| dd_fetch_step_functions_tags | Fetch Step Functions tags | `bool` | `null` |
| dd_fetch_s3_tags | **(Deprecated in favor of dd_enrich_s3_tags)** Fetch S3 bucket tags | `bool` | `null` |

### Log Processing
Expand Down
2 changes: 0 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module "iam" {
dd_allowed_kms_keys = var.dd_allowed_kms_keys
dd_s3_log_bucket_arns = var.dd_s3_log_bucket_arns
dd_fetch_lambda_tags = var.dd_fetch_lambda_tags
dd_fetch_step_functions_tags = var.dd_fetch_step_functions_tags
dd_fetch_log_group_tags = var.dd_fetch_log_group_tags
dd_fetch_s3_tags = var.dd_fetch_s3_tags
dd_use_vpc = var.dd_use_vpc
Expand Down Expand Up @@ -251,7 +250,6 @@ resource "aws_lambda_function" "forwarder" {
DD_FETCH_LAMBDA_TAGS = var.dd_fetch_lambda_tags != null ? tostring(var.dd_fetch_lambda_tags) : null
DD_FETCH_LOG_GROUP_TAGS = var.dd_fetch_log_group_tags != null ? tostring(var.dd_fetch_log_group_tags) : null
DD_FETCH_S3_TAGS = var.dd_fetch_s3_tags != null ? tostring(var.dd_fetch_s3_tags) : null
DD_FETCH_STEP_FUNCTIONS_TAGS = var.dd_fetch_step_functions_tags != null ? tostring(var.dd_fetch_step_functions_tags) : null
DD_NO_SSL = var.dd_no_ssl
DD_URL = var.dd_url
DD_PORT = var.dd_port
Expand Down
4 changes: 2 additions & 2 deletions modules/iam/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ resource "aws_iam_role_policy" "forwarder_policy" {
}
] : [],

# Tag fetching permissions (Lambda and Step Functions)
coalesce(var.dd_fetch_lambda_tags, false) || coalesce(var.dd_fetch_step_functions_tags, false) || coalesce(var.dd_fetch_s3_tags, false) ? [
# Tag fetching permissions (Lambda and S3)
coalesce(var.dd_fetch_lambda_tags, false) || coalesce(var.dd_fetch_s3_tags, false) ? [
{
Effect = "Allow"
Action = ["tag:GetResources"]
Expand Down
5 changes: 0 additions & 5 deletions modules/iam/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ variable "dd_fetch_lambda_tags" {
description = "Whether to fetch Lambda tags"
}

variable "dd_fetch_step_functions_tags" {
type = bool
default = null
description = "Whether to fetch Step Functions tags"
}
variable "dd_fetch_s3_tags" {
type = bool
default = null
Expand Down
5 changes: 0 additions & 5 deletions tests/enhanced_features.tftest.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ run "enhanced_features_env_vars_test" {
error_message = "DD_FETCH_LOG_GROUP_TAGS should be true when enabled"
}

assert {
condition = aws_lambda_function.forwarder.environment[0].variables.DD_FETCH_STEP_FUNCTIONS_TAGS == "true"
error_message = "DD_FETCH_STEP_FUNCTIONS_TAGS should be true when enabled"
}

# Test trace and log forwarding configuration
assert {
condition = aws_lambda_function.forwarder.environment[0].variables.DD_TRACE_ENABLED == "false"
Expand Down
6 changes: 0 additions & 6 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,6 @@ variable "dd_fetch_log_group_tags" {
description = "(deprecated in favor of dd_enrich_cloudwatch_tags) Let the forwarder fetch Log Group tags using ListTagsForResource and apply them to logs, metrics and traces. If set to true, permission logs:ListTagsForResource will be automatically added to the Lambda execution IAM role."
}

variable "dd_fetch_step_functions_tags" {
type = bool
default = null
description = "Let the forwarder fetch Step Functions tags using GetResources API calls and apply them to logs, metrics and traces. If set to true, permission tag:GetResources will be automatically added to the Lambda execution IAM role."
}

variable "dd_fetch_s3_tags" {
type = bool
default = null
Expand Down
Loading