Add support for multiple containers (#24)

* Add ability to pass multiple container definitions

* Make container_name and container_image optional

Author: jcity

.terraform.lock.hcl

@@ -67,10 +67,11 @@ In order to run all checks at any point run the following command:
 | <a name="input_container_cpu"></a> [container\_cpu](#input\_container\_cpu) | (Optional) The number of cpu units to reserve for the container. This is optional for tasks using Fargate launch type and the total amount of container\_cpu of all containers in a task will need to be lower than the task-level cpu value | `number` | `1024` | no |
 | <a name="input_container_definition"></a> [container\_definition](#input\_container\_definition) | Container definition overrides which allows for extra keys or overriding existing keys. | `map(any)` | `{}` | no |
 | <a name="input_container_depends_on"></a> [container\_depends\_on](#input\_container\_depends\_on) | The dependencies defined for container startup and shutdown. A container can contain multiple dependencies. When a dependency is defined for container startup, for container shutdown it is reversed. The condition can be one of START, COMPLETE, SUCCESS or HEALTHY | <pre>list(object({<br>    containerName = string<br>    condition     = string<br>  }))</pre> | `[]` | no |
-| <a name="input_container_image"></a> [container\_image](#input\_container\_image) | The image used to start the container. Images in the Docker Hub registry available by default | `string` | n/a | yes |
+| <a name="input_container_image"></a> [container\_image](#input\_container\_image) | The image used to start the container. Images in the Docker Hub registry available by default | `string` | `null` | no |
 | <a name="input_container_memory"></a> [container\_memory](#input\_container\_memory) | (Optional) The amount of memory (in MiB) to allow the container to use. This is a hard limit, if the container attempts to exceed the container\_memory, the container is killed. This field is optional for Fargate launch type and the total amount of container\_memory of all containers in a task will need to be lower than the task memory value | `number` | `4096` | no |
 | <a name="input_container_memory_reservation"></a> [container\_memory\_reservation](#input\_container\_memory\_reservation) | (Optional) The amount of memory (in MiB) to reserve for the container. If container needs to exceed this threshold, it can do so up to the set container\_memory hard limit | `number` | `2048` | no |
-| <a name="input_container_name"></a> [container\_name](#input\_container\_name) | The name of the container. Up to 255 characters ([a-z], [A-Z], [0-9], -, \_ allowed) | `string` | n/a | yes |
+| <a name="input_container_name"></a> [container\_name](#input\_container\_name) | The name of the container. Up to 255 characters ([a-z], [A-Z], [0-9], -, \_ allowed) | `string` | `null` | no |
+| <a name="input_containers"></a> [containers](#input\_containers) | Container definitions to use for the task. If this is used, all other container options will be ignored. | `list(any)` | `[]` | no |
 | <a name="input_disable_networking"></a> [disable\_networking](#input\_disable\_networking) | When this parameter is true, networking is disabled within the container. | `bool` | `null` | no |
 | <a name="input_dns_search_domains"></a> [dns\_search\_domains](#input\_dns\_search\_domains) | Container DNS search domains. A list of DNS search domains that are presented to the container | `list(string)` | `[]` | no |
 | <a name="input_dns_servers"></a> [dns\_servers](#input\_dns\_servers) | Container DNS servers. This is a list of strings specifying the IP addresses of the DNS servers | `list(string)` | `[]` | no |

README.md

@@ -0,0 +1,23 @@
+module "container-definition-1" {
+  source          = "cloudposse/ecs-container-definition/aws"
+  version         = "0.58.1"
+  container_name  = "container-1"
+  container_image = "ubuntu-1"
+}
+
+module "container-definition-2" {
+  source          = "cloudposse/ecs-container-definition/aws"
+  version         = "0.58.1"
+  container_name  = "container-2"
+  container_image = "ubuntu-2"
+}
+
+module "td" {
+  source      = "../../"
+  name_prefix = "multiple-containers"
+
+  containers = [
+    module.container-definition-1.json_map_object,
+    module.container-definition-2.json_map_object,
+  ]
+}

examples/multiple-containers/.terraform.lock.hcl

@@ -0,0 +1,19 @@
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 4"
+    }
+  }
+}
+
+provider "aws" {
+  region                      = "us-east-1"
+  skip_credentials_validation = true
+  skip_requesting_account_id  = true
+  skip_metadata_api_check     = true
+  s3_use_path_style           = true
+  access_key                  = "mock_access_key"
+  secret_key                  = "mock_secret_key"
+}

examples/multiple-containers/main.tf

@@ -80,7 +80,7 @@ module "container_definition" {
 # Task Definition
 resource "aws_ecs_task_definition" "td" {
   family                = "${var.name_prefix}-td"
-  container_definitions = "[${module.container_definition.json_map_encoded}]"
+  container_definitions = length(var.containers) == 0 ? "[${module.container_definition.json_map_encoded}]" : jsonencode(var.containers)
   task_role_arn         = var.task_role_arn == null ? aws_iam_role.ecs_task_execution_role.arn : var.task_role_arn
   execution_role_arn    = aws_iam_role.ecs_task_execution_role.arn
   network_mode          = "awsvpc"

examples/multiple-containers/mock_provider.tf

@@ -16,11 +16,13 @@ variable "tags" {
 #------------------------------------------------------------------------------
 variable "container_name" {
   type        = string
+  default     = null
   description = "The name of the container. Up to 255 characters ([a-z], [A-Z], [0-9], -, _ allowed)"
 }
 
 variable "container_image" {
   type        = string
+  default     = null
   description = "The image used to start the container. Images in the Docker Hub registry available by default"
 }
 
@@ -42,6 +44,12 @@ variable "container_definition" {
   default     = {}
 }
 
+variable "containers" {
+  type        = list(any)
+  description = "Container definitions to use for the task. If this is used, all other container options will be ignored."
+  default     = []
+}
+
 variable "port_mappings" {
   description = "The port mappings to configure for the container. This is a list of maps. Each map should contain \"containerPort\", \"hostPort\", and \"protocol\", where \"protocol\" is one of \"tcp\" or \"udp\". If using containers in a task with the awsvpc or host network mode, the hostPort can either be left blank or set to the same value as the containerPort"
   type = list(object({