fix: Remove coalesce() to ensure value precedence is honored (#307)

bryantbiggs · web-flow · commit da354d9a37ca · 2025-07-09T10:13:30.000-05:00
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -39,10 +39,6 @@ module "ecs" {
     FARGATE_SPOT = {
       weight = 50
     }
-    ASG = {
-      weight = 50
-      base   = 20
-    }
   }
 
   autoscaling_capacity_providers = {
@@ -77,6 +73,8 @@ module "ecs" {
             type = "fluentbit"
           }
           memoryReservation = 50
+
+          cloudwatch_log_group_retention_in_days = 30
         }
 
         (local.container_name) = {
@@ -98,6 +96,14 @@ module "ecs" {
             }
           ]
 
+          capacity_provider_strategy = {
+            ASG = {
+              base              = 20
+              capacity_provider = "ASG"
+              weight            = 50
+            }
+          }
+
           # Example image used requires access to write to root filesystem
           readonlyRootFilesystem = false
 
@@ -135,11 +141,6 @@ module "ecs" {
               dns_name = local.container_name
             }
 
-            timeout = {
-              idle_timeout_seconds        = 20
-              per_request_timeout_seconds = 30
-            }
-
             port_name      = local.container_name
             discovery_name = local.container_name
           }
@@ -178,7 +179,6 @@ module "ecs" {
       security_group_egress_rules = {
         all = {
           cidr_ipv4   = "0.0.0.0/0"
-          to_port     = 0
           ip_protocol = "-1"
         }
       }
diff --git a/modules/service/main.tf b/modules/service/main.tf
@@ -702,57 +702,57 @@ module "container_definition" {
   operating_system_family = var.runtime_platform.operating_system_family
 
   # Container Definition
-  command                = try(coalesce(each.value.command, var.container_definition_defaults.command), null)
-  cpu                    = try(coalesce(each.value.cpu, var.container_definition_defaults.cpu), null)
-  dependsOn              = try(coalesce(each.value.dependsOn, var.container_definition_defaults.dependsOn), null)
-  disableNetworking      = try(coalesce(each.value.disableNetworking, var.container_definition_defaults.disableNetworking), null)
-  dnsSearchDomains       = try(coalesce(each.value.dnsSearchDomains, var.container_definition_defaults.dnsSearchDomains), null)
-  dnsServers             = try(coalesce(each.value.dnsServers, var.container_definition_defaults.dnsServers), null)
-  dockerLabels           = try(coalesce(each.value.dockerLabels, var.container_definition_defaults.dockerLabels), null)
-  dockerSecurityOptions  = try(coalesce(each.value.dockerSecurityOptions, var.container_definition_defaults.dockerSecurityOptions), null)
-  entrypoint             = try(coalesce(each.value.entrypoint, var.container_definition_defaults.entrypoint), null)
-  environment            = try(coalesce(each.value.environment, var.container_definition_defaults.environment), null)
-  environmentFiles       = try(coalesce(each.value.environmentFiles, var.container_definition_defaults.environmentFiles), null)
-  essential              = try(coalesce(each.value.essential, var.container_definition_defaults.essential), null)
-  extraHosts             = try(coalesce(each.value.extraHosts, var.container_definition_defaults.extraHosts), null)
-  firelensConfiguration  = try(coalesce(each.value.firelensConfiguration, var.container_definition_defaults.firelensConfiguration), null)
-  healthCheck            = try(coalesce(each.value.healthCheck, var.container_definition_defaults.healthCheck), null)
-  hostname               = try(coalesce(each.value.hostname, var.container_definition_defaults.hostname), null)
-  image                  = try(coalesce(each.value.image, var.container_definition_defaults.image), null)
-  interactive            = try(coalesce(each.value.interactive, var.container_definition_defaults.interactive), null)
-  links                  = try(coalesce(each.value.links, var.container_definition_defaults.links), null)
-  linuxParameters        = try(coalesce(each.value.linuxParameters, var.container_definition_defaults.linuxParameters), null)
-  logConfiguration       = try(coalesce(each.value.logConfiguration, var.container_definition_defaults.logConfiguration), null)
-  memory                 = try(coalesce(each.value.memory, var.container_definition_defaults.memory), null)
-  memoryReservation      = try(coalesce(each.value.memoryReservation, var.container_definition_defaults.memoryReservation), null)
-  mountPoints            = try(coalesce(each.value.mountPoints, var.container_definition_defaults.mountPoints), null)
+  command                = try(each.value.command, var.container_definition_defaults.command, null)
+  cpu                    = try(each.value.cpu, var.container_definition_defaults.cpu, null)
+  dependsOn              = try(each.value.dependsOn, var.container_definition_defaults.dependsOn, null)
+  disableNetworking      = try(each.value.disableNetworking, var.container_definition_defaults.disableNetworking, null)
+  dnsSearchDomains       = try(each.value.dnsSearchDomains, var.container_definition_defaults.dnsSearchDomains, null)
+  dnsServers             = try(each.value.dnsServers, var.container_definition_defaults.dnsServers, null)
+  dockerLabels           = try(each.value.dockerLabels, var.container_definition_defaults.dockerLabels, null)
+  dockerSecurityOptions  = try(each.value.dockerSecurityOptions, var.container_definition_defaults.dockerSecurityOptions, null)
+  entrypoint             = try(each.value.entrypoint, var.container_definition_defaults.entrypoint, null)
+  environment            = try(each.value.environment, var.container_definition_defaults.environment, null)
+  environmentFiles       = try(each.value.environmentFiles, var.container_definition_defaults.environmentFiles, null)
+  essential              = try(each.value.essential, var.container_definition_defaults.essential, null)
+  extraHosts             = try(each.value.extraHosts, var.container_definition_defaults.extraHosts, null)
+  firelensConfiguration  = try(each.value.firelensConfiguration, var.container_definition_defaults.firelensConfiguration, null)
+  healthCheck            = try(each.value.healthCheck, var.container_definition_defaults.healthCheck, null)
+  hostname               = try(each.value.hostname, var.container_definition_defaults.hostname, null)
+  image                  = try(each.value.image, var.container_definition_defaults.image, null)
+  interactive            = try(each.value.interactive, var.container_definition_defaults.interactive, null)
+  links                  = try(each.value.links, var.container_definition_defaults.links, null)
+  linuxParameters        = try(each.value.linuxParameters, var.container_definition_defaults.linuxParameters, null)
+  logConfiguration       = try(each.value.logConfiguration, var.container_definition_defaults.logConfiguration, null)
+  memory                 = try(each.value.memory, var.container_definition_defaults.memory, null)
+  memoryReservation      = try(each.value.memoryReservation, var.container_definition_defaults.memoryReservation, null)
+  mountPoints            = try(each.value.mountPoints, var.container_definition_defaults.mountPoints, null)
   name                   = coalesce(each.value.name, each.key)
-  portMappings           = try(coalesce(each.value.portMappings, var.container_definition_defaults.portMappings), null)
-  privileged             = try(coalesce(each.value.privileged, var.container_definition_defaults.privileged), null)
-  pseudoTerminal         = try(coalesce(each.value.pseudoTerminal, var.container_definition_defaults.pseudoTerminal), null)
-  readonlyRootFilesystem = try(coalesce(each.value.readonlyRootFilesystem, var.container_definition_defaults.readonlyRootFilesystem), null)
-  repositoryCredentials  = try(coalesce(each.value.repositoryCredentials, var.container_definition_defaults.repositoryCredentials), null)
-  resourceRequirements   = try(coalesce(each.value.resourceRequirements, var.container_definition_defaults.resourceRequirements), null)
-  restartPolicy          = try(coalesce(each.value.restartPolicy, var.container_definition_defaults.restartPolicy), null)
-  secrets                = try(coalesce(each.value.secrets, var.container_definition_defaults.secrets), null)
-  startTimeout           = try(coalesce(each.value.startTimeout, var.container_definition_defaults.startTimeout), null)
-  stopTimeout            = try(coalesce(each.value.stopTimeout, var.container_definition_defaults.stopTimeout), null)
-  systemControls         = try(coalesce(each.value.systemControls, var.container_definition_defaults.systemControls), null)
-  ulimits                = try(coalesce(each.value.ulimits, var.container_definition_defaults.ulimits), null)
-  user                   = try(coalesce(each.value.user, var.container_definition_defaults.user), null)
-  versionConsistency     = try(coalesce(each.value.versionConsistency, var.container_definition_defaults.versionConsistency), null)
-  volumesFrom            = try(coalesce(each.value.volumesFrom, var.container_definition_defaults.volumesFrom), null)
-  workingDirectory       = try(coalesce(each.value.workingDirectory, var.container_definition_defaults.workingDirectory), null)
+  portMappings           = try(each.value.portMappings, var.container_definition_defaults.portMappings, null)
+  privileged             = try(each.value.privileged, var.container_definition_defaults.privileged, null)
+  pseudoTerminal         = try(each.value.pseudoTerminal, var.container_definition_defaults.pseudoTerminal, null)
+  readonlyRootFilesystem = try(each.value.readonlyRootFilesystem, var.container_definition_defaults.readonlyRootFilesystem, null)
+  repositoryCredentials  = try(each.value.repositoryCredentials, var.container_definition_defaults.repositoryCredentials, null)
+  resourceRequirements   = try(each.value.resourceRequirements, var.container_definition_defaults.resourceRequirements, null)
+  restartPolicy          = try(each.value.restartPolicy, var.container_definition_defaults.restartPolicy, null)
+  secrets                = try(each.value.secrets, var.container_definition_defaults.secrets, null)
+  startTimeout           = try(each.value.startTimeout, var.container_definition_defaults.startTimeout, null)
+  stopTimeout            = try(each.value.stopTimeout, var.container_definition_defaults.stopTimeout, null)
+  systemControls         = try(each.value.systemControls, var.container_definition_defaults.systemControls, null)
+  ulimits                = try(each.value.ulimits, var.container_definition_defaults.ulimits, null)
+  user                   = try(each.value.user, var.container_definition_defaults.user, null)
+  versionConsistency     = try(each.value.versionConsistency, var.container_definition_defaults.versionConsistency, null)
+  volumesFrom            = try(each.value.volumesFrom, var.container_definition_defaults.volumesFrom, null)
+  workingDirectory       = try(each.value.workingDirectory, var.container_definition_defaults.workingDirectory, null)
 
   # CloudWatch Log Group
   service                                = var.name
-  enable_cloudwatch_logging              = try(coalesce(each.value.enable_cloudwatch_logging, var.container_definition_defaults.enable_cloudwatch_logging), null)
-  create_cloudwatch_log_group            = try(coalesce(each.value.create_cloudwatch_log_group, var.container_definition_defaults.create_cloudwatch_log_group), null)
-  cloudwatch_log_group_name              = try(coalesce(each.value.cloudwatch_log_group_name, var.container_definition_defaults.cloudwatch_log_group_name), null)
-  cloudwatch_log_group_use_name_prefix   = try(coalesce(each.value.cloudwatch_log_group_use_name_prefix, var.container_definition_defaults.cloudwatch_log_group_use_name_prefix), null)
-  cloudwatch_log_group_class             = try(coalesce(each.value.cloudwatch_log_group_class, var.container_definition_defaults.cloudwatch_log_group_class), null)
-  cloudwatch_log_group_retention_in_days = try(coalesce(each.value.cloudwatch_log_group_retention_in_days, var.container_definition_defaults.cloudwatch_log_group_retention_in_days), null)
-  cloudwatch_log_group_kms_key_id        = try(coalesce(each.value.cloudwatch_log_group_kms_key_id, var.container_definition_defaults.cloudwatch_log_group_kms_key_id), null)
+  enable_cloudwatch_logging              = try(each.value.enable_cloudwatch_logging, var.container_definition_defaults.enable_cloudwatch_logging, null)
+  create_cloudwatch_log_group            = try(each.value.create_cloudwatch_log_group, var.container_definition_defaults.create_cloudwatch_log_group, null)
+  cloudwatch_log_group_name              = try(each.value.cloudwatch_log_group_name, var.container_definition_defaults.cloudwatch_log_group_name, null)
+  cloudwatch_log_group_use_name_prefix   = try(each.value.cloudwatch_log_group_use_name_prefix, var.container_definition_defaults.cloudwatch_log_group_use_name_prefix, null)
+  cloudwatch_log_group_class             = try(each.value.cloudwatch_log_group_class, var.container_definition_defaults.cloudwatch_log_group_class, null)
+  cloudwatch_log_group_retention_in_days = try(each.value.cloudwatch_log_group_retention_in_days, var.container_definition_defaults.cloudwatch_log_group_retention_in_days, null)
+  cloudwatch_log_group_kms_key_id        = try(each.value.cloudwatch_log_group_kms_key_id, var.container_definition_defaults.cloudwatch_log_group_kms_key_id, null)
 
   tags = var.tags
 }

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,6 @@ module "ecs" {`
`39`	`39`	`FARGATE_SPOT = {`
`40`	`40`	`weight = 50`
`41`	`41`	`}`
`42`		`- ASG = {`
`43`		`- weight = 50`
`44`		`- base = 20`
`45`		`- }`
`46`	`42`	`}`
`47`	`43`
`48`	`44`	`autoscaling_capacity_providers = {`
`@@ -77,6 +73,8 @@ module "ecs" {`
`77`	`73`	`type = "fluentbit"`
`78`	`74`	`}`
`79`	`75`	`memoryReservation = 50`
	`76`	`+`
	`77`	`+ cloudwatch_log_group_retention_in_days = 30`
`80`	`78`	`}`
`81`	`79`
`82`	`80`	`(local.container_name) = {`
`@@ -98,6 +96,14 @@ module "ecs" {`
`98`	`96`	`}`
`99`	`97`	`]`
`100`	`98`
	`99`	`+ capacity_provider_strategy = {`
	`100`	`+ ASG = {`
	`101`	`+ base = 20`
	`102`	`+ capacity_provider = "ASG"`
	`103`	`+ weight = 50`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`101`	`107`	`# Example image used requires access to write to root filesystem`
`102`	`108`	`readonlyRootFilesystem = false`
`103`	`109`
`@@ -135,11 +141,6 @@ module "ecs" {`
`135`	`141`	`dns_name = local.container_name`
`136`	`142`	`}`
`137`	`143`
`138`		`- timeout = {`
`139`		`- idle_timeout_seconds = 20`
`140`		`- per_request_timeout_seconds = 30`
`141`		`- }`
`142`		`-`
`143`	`144`	`port_name = local.container_name`
`144`	`145`	`discovery_name = local.container_name`
`145`	`146`	`}`
`@@ -178,7 +179,6 @@ module "ecs" {`
`178`	`179`	`security_group_egress_rules = {`
`179`	`180`	`all = {`
`180`	`181`	`cidr_ipv4 = "0.0.0.0/0"`
`181`		`- to_port = 0`
`182`	`182`	`ip_protocol = "-1"`
`183`	`183`	`}`
`184`	`184`	`}`