feat: add backwards compatibility to the service block

terraform-aws-modules · Feb 9, 2024 · c4d091f · c4d091f
1 parent bbd9ae9
commit c4d091f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/examples/fargate/main.tf b/examples/fargate/main.tf
@@ -126,16 +126,14 @@ module "ecs_service" {
 
   service_connect_configuration = {
     namespace = aws_service_discovery_http_namespace.this.arn
-    service = [
-      {
-        client_alias = {
-          port     = local.container_port
-          dns_name = local.container_name
-        }
-        port_name      = local.container_name
-        discovery_name = local.container_name
+    service = {
+      client_alias = {
+        port     = local.container_port
+        dns_name = local.container_name
       }
-    ]
+      port_name      = local.container_name
+      discovery_name = local.container_name
+    }
   }
 
   load_balancer = {

diff --git a/modules/service/main.tf b/modules/service/main.tf
@@ -153,7 +153,7 @@ resource "aws_ecs_service" "this" {
       namespace = lookup(service_connect_configuration.value, "namespace", null)
 
       dynamic "service" {
-        for_each = try(service_connect_configuration.value.service, [])
+        for_each = try(lookup(service_connect_configuration.value.service, "port_name") != null ? [service_connect_configuration.value.service] : [], try(service_connect_configuration.value.service, []))
 
         content {
 
@@ -339,7 +339,7 @@ resource "aws_ecs_service" "ignore_task_definition" {
       namespace = lookup(service_connect_configuration.value, "namespace", null)
 
       dynamic "service" {
-        for_each = try(service_connect_configuration.value.service, [])
+        for_each = try(lookup(service_connect_configuration.value.service, "port_name") != null ? [service_connect_configuration.value.service] : [], try(service_connect_configuration.value.service, []))
 
         content {