Merge pull request #4819 from nhsuk/service_connect_task_definition_configuration

Add service connect configuration for ECS deployment to task definition

Author: TheOneFromNorway

terraform/app/ecs.tf

@@ -58,6 +58,17 @@ module "web_service" {
   maximum_replica_count = var.maximum_web_replicas
   environment           = var.environment
   server_type           = "web"
+  service_connect_config = {
+    namespace = "TBD"
+    services = [
+      {
+        port_name      = "web-port"
+        discovery_name = "web"
+        port           = 4000
+        dns_name       = "web"
+      }
+    ]
+  }
 
   depends_on = [
     aws_iam_role.ecs_deploy,
@@ -97,6 +108,17 @@ module "sidekiq_service" {
   cluster_name = aws_ecs_cluster.cluster.name
   environment  = var.environment
   server_type  = "sidekiq"
+  service_connect_config = {
+    namespace = "TBD"
+    services = [
+      {
+        port_name      = "sidekiq-port"
+        discovery_name = "sidekiq"
+        port           = 4000
+        dns_name       = "sidekiq"
+      }
+    ]
+  }
 
   depends_on = [
     aws_rds_cluster_instance.core,

terraform/app/modules/ecs_service/main.tf

@@ -95,8 +95,10 @@ resource "aws_ecs_task_definition" "this" {
       readonlyRootFileSystem = true
       portMappings = [
         {
+          name          = var.service_connect_config != null && length(var.service_connect_config.services) > 0 ? var.service_connect_config.services[0].port_name : null
           containerPort = 4000
           hostPort      = 4000
+          protocol      = "tcp"
         }
       ]
       environment = concat(var.task_config.environment, [{ name = "SERVER_TYPE", value = var.server_type }])

terraform/app/modules/ecs_service/variables.tf

@@ -89,6 +89,21 @@ variable "network_params" {
   nullable    = false
 }
 
+variable "service_connect_config" {
+  type = object({
+    namespace = string
+    services = list(object({
+      port_name      = string
+      discovery_name = string
+      port           = number
+      dns_name       = string
+    }))
+  })
+  description = "Service Connect configuration for the ECS service. If this is not set, the service will not use Service Connect."
+  default     = null
+  nullable    = true
+}
+
 variable "loadbalancer" {
   type = object({
     target_group_blue            = string