Fixing formatting issues

Author: jnonino

main.tf

@@ -17,12 +17,13 @@ resource "aws_iam_role_policy_attachment" "ecs_task_execution_role_policy_attach
 # Container Definition
 module "container_definition" {
   source  = "cloudposse/ecs-container-definition/aws"
-  version = "0.41.0"
+  version = "0.45.2"
 
   container_name               = var.container_name
   container_image              = var.container_image
   container_memory             = var.container_memory
   container_memory_reservation = var.container_memory_reservation
+  # container_definition = var.container_definition
   port_mappings                = var.port_mappings
   healthcheck                  = var.healthcheck
   container_cpu                = var.container_cpu
@@ -31,23 +32,33 @@ module "container_definition" {
   command                      = var.command
   working_directory            = var.working_directory
   environment                  = var.environment
+  # extra_hosts = var.extra_hosts
+  # map_environment = var.map_environment
+  # environment_files = var.environment_files
   secrets                      = var.secrets
   readonly_root_filesystem     = var.readonly_root_filesystem
   linux_parameters             = var.linux_parameters
   log_configuration            = var.log_configuration
   firelens_configuration       = var.firelens_configuration
   mount_points                 = var.mount_points
   dns_servers                  = var.dns_servers
+  # dns_search_domains = var.dns_search_domains
   ulimits                      = var.ulimits
-  docker_labels                = var.docker_labels
   repository_credentials       = var.repository_credentials
   volumes_from                 = var.volumes_from
   links                        = var.links
   user                         = var.user
   container_depends_on         = var.container_depends_on
+  docker_labels                = var.docker_labels
   start_timeout                = var.start_timeout
   stop_timeout                 = var.stop_timeout
+  # privileged = var.
   system_controls              = var.system_controls
+  # hostname = var.hostname
+  # disable_networking = var.disable_networking
+  # interactive = var.interactive
+  # pseudo_terminal = var.pseudo_terminal
+  # docker_security_options = var.docker_security_options
 }
 
 # Task Definition

variables.tf

@@ -6,64 +6,86 @@ variable "name_prefix" {
 }
 
 #------------------------------------------------------------------------------
-# AWS ECS Container Definition Variables
+# AWS ECS Container Definition Variables for Cloudposse module
 #------------------------------------------------------------------------------
-variable "container_image" {
-  description = "The image used to start the container."
-}
+
 
 variable "container_name" {
   description = "The name of the container. Up to 255 characters ([a-z], [A-Z], [0-9], -, _ allowed)"
 }
 
-variable "command" {
-  description = "(Optional) The command that is passed to the container"
-  type        = list(string)
-  default     = null
+variable "container_image" {
+  description = "The image used to start the container."
 }
 
-variable "container_cpu" {
+variable "container_memory" {
   # https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
-  description = "(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"
-  default     = 1024 # 1 vCPU
+  description = "(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"
+  default     = 8192 # 8 GB
 }
 
-variable "container_depends_on" {
-  description = "(Optional) 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"
+variable "container_memory_reservation" {
+  # https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
+  description = "(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"
+  default     = 2048 # 2 GB
+}
+
+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({
-    containerName = string
-    condition     = string
+    containerPort = number
+    hostPort      = number
+    protocol      = string
   }))
+  default = [
+    {
+      containerPort = 80
+      hostPort      = 80
+      protocol      = "tcp"
+    }
+  ]
+}
+
+# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_HealthCheck.html
+variable "healthcheck" {
+  description = "(Optional) A map containing command (string), timeout, interval (duration in seconds), retries (1-10, number of times to retry before marking container unhealthy), and startPeriod (0-300, optional grace period to wait, in seconds, before failed healthchecks count toward retries)"
+  type = object({
+    command     = list(string)
+    retries     = number
+    timeout     = number
+    interval    = number
+    startPeriod = number
+  })
   default = null
 }
 
-variable "container_memory" {
+variable "container_cpu" {
   # https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
-  description = "(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"
-  default     = 8192 # 8 GB
+  description = "(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"
+  default     = 1024 # 1 vCPU
 }
 
-variable "container_memory_reservation" {
-  # https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-task-defs
-  description = "(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"
-  default     = 2048 # 2 GB
+variable "essential" {
+  description = "(Optional) Determines whether all other containers in a task are stopped, if this container fails or stops for any reason. Due to how Terraform type casts booleans in json it is required to double quote this value"
+  type        = bool
+  default     = true
 }
 
-variable "dns_servers" {
+variable "entrypoint" {
+  description = "(Optional) The entry point that is passed to the container"
   type        = list(string)
-  description = "(Optional) Container DNS servers. This is a list of strings specifying the IP addresses of the DNS servers"
   default     = null
 }
 
-variable "docker_labels" {
-  description = "(Optional) The configuration options to send to the `docker_labels`"
-  type        = map(string)
+variable "command" {
+  description = "(Optional) The command that is passed to the container"
+  type        = list(string)
   default     = null
 }
 
-variable "entrypoint" {
-  description = "(Optional) The entry point that is passed to the container"
-  type        = list(string)
+variable "working_directory" {
+  description = "(Optional) The working directory to run commands inside the container"
+  type        = string
   default     = null
 }
 
@@ -76,39 +98,19 @@ variable "environment" {
   default = []
 }
 
-variable "essential" {
-  description = "(Optional) Determines whether all other containers in a task are stopped, if this container fails or stops for any reason. Due to how Terraform type casts booleans in json it is required to double quote this value"
-  type        = bool
-  default     = true
-}
-
-# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_FirelensConfiguration.html
-variable "firelens_configuration" {
-  description = "(Optional) The FireLens configuration for the container. This is used to specify and configure a log router for container logs. For more details, see https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_FirelensConfiguration.html"
-  type = object({
-    type    = string
-    options = map(string)
-  })
-  default = null
-}
-
-# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_HealthCheck.html
-variable "healthcheck" {
-  description = "(Optional) A map containing command (string), timeout, interval (duration in seconds), retries (1-10, number of times to retry before marking container unhealthy), and startPeriod (0-300, optional grace period to wait, in seconds, before failed healthchecks count toward retries)"
-  type = object({
-    command     = list(string)
-    retries     = number
-    timeout     = number
-    interval    = number
-    startPeriod = number
-  })
+variable "secrets" {
+  description = "(Optional) The secrets to pass to the container. This is a list of maps"
+  type = list(object({
+    name      = string
+    valueFrom = string
+  }))
   default = null
 }
 
-variable "links" {
-  description = "(Optional) List of container names this container can communicate with without port mappings"
-  type        = list(string)
-  default     = null
+variable "readonly_root_filesystem" {
+  description = "(Optional) Determines whether a container is given read-only access to its root filesystem. Due to how Terraform type casts booleans in json it is required to double quote this value"
+  type        = bool
+  default     = false
 }
 
 # https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_LinuxParameters.html
@@ -152,6 +154,16 @@ variable "log_configuration" {
   default = null
 }
 
+# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_FirelensConfiguration.html
+variable "firelens_configuration" {
+  description = "(Optional) The FireLens configuration for the container. This is used to specify and configure a log router for container logs. For more details, see https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_FirelensConfiguration.html"
+  type = object({
+    type    = string
+    options = map(string)
+  })
+  default = null
+}
+
 variable "mount_points" {
   description = "(Optional) Container mount points. This is a list of maps, where each map should contain a `containerPath` and `sourceVolume`"
   type = list(object({
@@ -161,32 +173,20 @@ variable "mount_points" {
   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({
-    containerPort = number
-    hostPort      = number
-    protocol      = string
-  }))
-  default = [
-    {
-      containerPort = 80
-      hostPort      = 80
-      protocol      = "tcp"
-    }
-  ]
-}
-
-variable "task_role_arn" {
-  description = "(Optional) The ARN of IAM role that allows your Amazon ECS container task to make calls to other AWS services. If not specified, `aws_iam_role.ecs_task_execution_role.arn` is used"
-  type        = string
+variable "dns_servers" {
+  type        = list(string)
+  description = "(Optional) Container DNS servers. This is a list of strings specifying the IP addresses of the DNS servers"
   default     = null
 }
 
-variable "readonly_root_filesystem" {
-  description = "(Optional) Determines whether a container is given read-only access to its root filesystem. Due to how Terraform type casts booleans in json it is required to double quote this value"
-  type        = bool
-  default     = false
+variable "ulimits" {
+  description = "(Optional) Container ulimit settings. This is a list of maps, where each map should contain \"name\", \"hardLimit\" and \"softLimit\""
+  type = list(object({
+    name      = string
+    hardLimit = number
+    softLimit = number
+  }))
+  default = null
 }
 
 variable "repository_credentials" {
@@ -195,66 +195,68 @@ variable "repository_credentials" {
   default     = null
 }
 
-variable "secrets" {
-  description = "(Optional) The secrets to pass to the container. This is a list of maps"
+variable "volumes_from" {
+  description = "(Optional) A list of VolumesFrom maps which contain \"sourceContainer\" (name of the container that has the volumes to mount) and \"readOnly\" (whether the container can write to the volume)"
   type = list(object({
-    name      = string
-    valueFrom = string
+    sourceContainer = string
+    readOnly        = bool
   }))
   default = null
 }
 
-variable "start_timeout" {
-  description = "(Optional) Time duration (in seconds) to wait before giving up on resolving dependencies for a container."
-  default     = 30
-}
-
-variable "system_controls" {
-  description = "(Optional) A list of namespaced kernel parameters to set in the container, mapping to the --sysctl option to docker run. This is a list of maps: { namespace = \"\", value = \"\"}"
-  type        = list(map(string))
+variable "links" {
+  description = "(Optional) List of container names this container can communicate with without port mappings"
+  type        = list(string)
   default     = null
 }
 
-variable "stop_timeout" {
-  description = "(Optional) Timeout in seconds between sending SIGTERM and SIGKILL to container"
-  type        = number
-  default     = 30
+variable "user" {
+  description = "(Optional) The user to run as inside the container. Can be any of these formats: user, user:group, uid, uid:gid, user:gid, uid:group"
+  type        = string
+  default     = null
 }
 
-variable "ulimits" {
-  description = "(Optional) Container ulimit settings. This is a list of maps, where each map should contain \"name\", \"hardLimit\" and \"softLimit\""
+variable "container_depends_on" {
+  description = "(Optional) 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"
   type = list(object({
-    name      = string
-    hardLimit = number
-    softLimit = number
+    containerName = string
+    condition     = string
   }))
   default = null
 }
 
-variable "user" {
-  description = "(Optional) The user to run as inside the container. Can be any of these formats: user, user:group, uid, uid:gid, user:gid, uid:group"
-  type        = string
+variable "docker_labels" {
+  description = "(Optional) The configuration options to send to the `docker_labels`"
+  type        = map(string)
   default     = null
 }
 
-variable "volumes_from" {
-  description = "(Optional) A list of VolumesFrom maps which contain \"sourceContainer\" (name of the container that has the volumes to mount) and \"readOnly\" (whether the container can write to the volume)"
-  type = list(object({
-    sourceContainer = string
-    readOnly        = bool
-  }))
-  default = null
+variable "start_timeout" {
+  description = "(Optional) Time duration (in seconds) to wait before giving up on resolving dependencies for a container."
+  default     = 30
 }
 
-variable "working_directory" {
-  description = "(Optional) The working directory to run commands inside the container"
-  type        = string
+variable "stop_timeout" {
+  description = "(Optional) Timeout in seconds between sending SIGTERM and SIGKILL to container"
+  type        = number
+  default     = 30
+}
+
+variable "system_controls" {
+  description = "(Optional) A list of namespaced kernel parameters to set in the container, mapping to the --sysctl option to docker run. This is a list of maps: { namespace = \"\", value = \"\"}"
+  type        = list(map(string))
   default     = null
 }
 
 #------------------------------------------------------------------------------
 # AWS ECS Task Definition Variables
 #------------------------------------------------------------------------------
+variable "task_role_arn" {
+  description = "(Optional) The ARN of IAM role that allows your Amazon ECS container task to make calls to other AWS services. If not specified, `aws_iam_role.ecs_task_execution_role.arn` is used"
+  type        = string
+  default     = null
+}
+
 variable "placement_constraints" {
   description = "(Optional) A set of placement constraints rules that are taken into consideration during task placement. Maximum number of placement_constraints is 10. This is a list of maps, where each map should contain \"type\" and \"expression\""
   type        = list