bugfix ECS Service to use Datadog-Configuration Component #1135 (#1138

)
cloudposse · Oct 3, 2024 · 6313fe7 · 6313fe7
1 parent abc493d
commit 6313fe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/ecs-service/datadog-agent.tf b/modules/ecs-service/datadog-agent.tf
@@ -40,8 +40,8 @@ locals {
     logDriver = "awsfirelens"
     options = var.datadog_agent_sidecar_enabled ? {
       Name           = "datadog",
-      apikey         = one(module.datadog_configuration[*].datadog_app_key),
-      Host           = format("http-intake.logs.%s", one(module.datadog_configuration[*].datadog_site))
+      apikey         = module.datadog_configuration.datadog_api_key,
+      Host           = format("http-intake.logs.%s", module.datadog_configuration.datadog_site)
       dd_service     = module.this.name,
       dd_tags        = local.all_dd_tags,
       dd_source      = "ecs",
@@ -87,8 +87,8 @@ module "datadog_container_definition" {
   essential        = true
   map_environment = {
     "ECS_FARGATE"                          = var.task.launch_type == "FARGATE" ? true : false
-    "DD_API_KEY"                           = one(module.datadog_configuration[*].datadog_api_key)
-    "DD_SITE"                              = one(module.datadog_configuration[*].datadog_site)
+    "DD_API_KEY"                           = module.datadog_configuration.datadog_api_key
+    "DD_SITE"                              = module.datadog_configuration.datadog_site
     "DD_ENV"                               = module.this.stage
     "DD_LOGS_ENABLED"                      = true
     "DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL" = true

diff --git a/modules/ecs-service/remote-state.tf b/modules/ecs-service/remote-state.tf
@@ -141,7 +141,6 @@ data "jq_query" "service_domain_query" {
 }
 
 module "datadog_configuration" {
-  count   = var.datadog_agent_sidecar_enabled ? 1 : 0
   source  = "../datadog-configuration/modules/datadog_keys"
   enabled = true
   context = module.this.context