Implements Sidecar support (#56)

Co-authored-by: Jared Darling <[email protected]>

Author: JaredDarling

examples/multiple-containers/main.tf

@@ -16,7 +16,7 @@ module "td" {
   source      = "../../"
   name_prefix = "multiple-containers"
 
-  containers = [
+  additional_containers = [
     module.container-definition-1.json_map_object,
     module.container-definition-2.json_map_object,
   ]

main.tf

@@ -39,7 +39,7 @@ module "container_definition" {
 
   command                      = var.command
   container_cpu                = var.container_cpu
-  container_definition         = var.container_definition
+  container_definition         = var.container_definition_overrides
   container_depends_on         = var.container_depends_on
   container_image              = var.container_image
   container_memory             = var.container_memory
@@ -83,15 +83,14 @@ module "container_definition" {
 
 # Task Definition
 resource "aws_ecs_task_definition" "td" {
-  container_definitions = length(var.containers) == 0 ? "[${module.container_definition.json_map_encoded}]" : jsonencode(var.containers)
-  family                = var.name_prefix
-
-  cpu                = var.container_cpu
-  task_role_arn      = var.task_role_arn == null ? aws_iam_role.ecs_task_execution_role[0].arn : var.task_role_arn
-  execution_role_arn = var.execution_role_arn == null ? aws_iam_role.ecs_task_execution_role[0].arn : var.execution_role_arn
-  ipc_mode           = var.ipc_mode
-  memory             = var.container_memory
-  network_mode       = "awsvpc" # awsvpc required for Fargate tasks
+  container_definitions = jsonencode(concat(var.additional_containers, [module.container_definition.json_map_object]))
+  cpu                   = var.container_cpu
+  execution_role_arn    = var.execution_role_arn == null ? aws_iam_role.ecs_task_execution_role[0].arn : var.execution_role_arn
+  family                = "${var.name_prefix}-td"
+  ipc_mode              = var.ipc_mode
+  memory                = var.container_memory
+  network_mode          = "awsvpc" # awsvpc required for Fargate tasks
+  task_role_arn         = var.task_role_arn == null ? aws_iam_role.ecs_task_execution_role[0].arn : var.task_role_arn
 
   runtime_platform {
     cpu_architecture        = var.runtime_platform_cpu_architecture

variables.tf

@@ -27,7 +27,7 @@ variable "container_cpu" {
   default     = 1024 # 1 vCPU
 }
 
-variable "container_definition" {
+variable "container_definition_overrides" {
   type        = map(any)
   description = "Container definition overrides which allows for extra keys or overriding existing keys."
   default     = {}
@@ -340,10 +340,10 @@ variable "working_directory" {
 #------------------------------------------------------------------------------
 # AWS ECS Task Definition Variables
 #------------------------------------------------------------------------------
-variable "containers" {
+variable "additional_containers" {
+  description = "Additional container definitions (sidecars) to use for the task."
+  default     = [] #Use json_map_object from outputs of cloudposse/ecs-container-definition/aws
   type        = any
-  description = "Container definitions to use for the task. If this is used, all other container options will be ignored."
-  default     = []
 }
 
 variable "ecs_task_execution_role_custom_policies" {