diff --git a/README.md b/README.md index 719dbc0..cb9efce 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/main.tf b/main.tf index b6dc285..08a06e3 100644 --- a/main.tf +++ b/main.tf @@ -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 @@ -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 diff --git a/modules/iam/main.tf b/modules/iam/main.tf index 5dfb7c5..efc7fa5 100644 --- a/modules/iam/main.tf +++ b/modules/iam/main.tf @@ -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"] diff --git a/modules/iam/variables.tf b/modules/iam/variables.tf index 044782e..7b7cb7c 100644 --- a/modules/iam/variables.tf +++ b/modules/iam/variables.tf @@ -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 diff --git a/tests/enhanced_features.tftest.hcl b/tests/enhanced_features.tftest.hcl index df29309..52f1501 100644 --- a/tests/enhanced_features.tftest.hcl +++ b/tests/enhanced_features.tftest.hcl @@ -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" diff --git a/variables.tf b/variables.tf index 9b4e5c9..0c37213 100644 --- a/variables.tf +++ b/variables.tf @@ -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