Fixing issues with new dependencies

Author: jnonino

README.md

@@ -17,7 +17,7 @@ Check versions for this module on:
 
         module "td" {
     	      source          = "cn-terraform/ecs-fargate-task-definition/aws"
-            version         = "1.0.4"
+            version         = "1.0.5"
             name_preffix    = var.name_preffix
             profile         = var.profile
             region          = var.region
@@ -54,6 +54,9 @@ Check versions for this module on:
 * working_directory: (Optional) The working directory to run commands inside the container.
 * placement_constraints: (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".
 * proxy_configuration: (Optional) The proxy configuration details for the App Mesh proxy. This is a list of maps, where each map should contain "container_name", "properties" and "type"
+* system_controls: 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 = \"\"}"
+* firelens_configuration: 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
+* log_configuration: Log configuration options to send to a custom log driver for the container. For more details, see https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_LogConfiguration.html
 
 ## Output values
 

main.tf

@@ -6,17 +6,6 @@ provider "aws" {
   region  = var.region
 }
 
-# ---------------------------------------------------------------------------------------------------------------------
-# AWS Cloudwatch Logs
-# ---------------------------------------------------------------------------------------------------------------------
-module "aws_cw_logs" {
-  source    = "cn-terraform/cloudwatch-logs/aws"
-  version   = "1.0.3"
-  logs_path = local.log_options["awslogs-group"]
-  profile   = var.profile
-  region    = var.region
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # AWS ECS Task Execution Role
 # ---------------------------------------------------------------------------------------------------------------------
@@ -52,18 +41,20 @@ module "container_definition" {
   environment                  = var.environment
   secrets                      = var.secrets
   readonly_root_filesystem     = var.readonly_root_filesystem
-  log_driver                   = local.log_driver
-  log_options                  = local.log_options
   mount_points                 = var.mount_points
   dns_servers                  = var.dns_servers
   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
   start_timeout                = var.start_timeout
   stop_timeout                 = var.stop_timeout
+  system_controls              = var.system_controls
+  firelens_configuration       = var.firelens_configuration
+  log_configuration            = var.log_configuration
 }
 
 # Task Definition

variables.tf

@@ -67,6 +67,12 @@ variable "dns_servers" {
   default     = []
 }
 
+variable "docker_labels" {
+  type        = map(string)
+  description = "The configuration options to send to the `docker_labels`"
+  default     = null
+}
+
 variable "entrypoint" {
   type        = list
   description = "(Optional) The entry point that is passed to the container"
@@ -85,10 +91,27 @@ variable "essential" {
   default     = "true"
 }
 
+# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_FirelensConfiguration.html
+variable "firelens_configuration" {
+  type = object({
+    type    = string
+    options = map(string)
+  })
+  description = "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"
+  default     = null
+}
+
+# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_HealthCheck.html
 variable "healthcheck" {
-  type        = map
-  description = "(Optional) A map containing command (string), 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)"
-  default     = {}
+  type = object({
+    command     = list(string)
+    retries     = number
+    timeout     = number
+    interval    = number
+    startPeriod = number
+  })
+  description = "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)"
+  default     = null
 }
 
 variable "links" {
@@ -97,13 +120,18 @@ variable "links" {
   default     = []
 }
 
-locals {
-  log_driver = "awslogs"
-  log_options = {
-    "awslogs-region"        = var.region
-    "awslogs-group"         = "/ecs/service/${var.name_preffix}"
-    "awslogs-stream-prefix" = "ecs"
-  }
+# https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_LogConfiguration.html
+variable "log_configuration" {
+  type = object({
+    logDriver = string
+    options   = map(string)
+    secretOptions = list(object({
+      name      = string
+      valueFrom = string
+    }))
+  })
+  description = "Log configuration options to send to a custom log driver for the container. For more details, see https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_LogConfiguration.html"
+  default     = null
 }
 
 variable "mount_points" {
@@ -121,7 +149,7 @@ locals {
     },
   ]
 }
-
+	
 variable "readonly_root_filesystem" {
   type        = string
   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"
@@ -145,6 +173,12 @@ variable "start_timeout" {
   default     = 30
 }
 
+variable "system_controls" {
+  type        = list(map(string))
+  description = "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 = \"\"}"
+  default     = null
+}
+
 variable "stop_timeout" {
   description = "(Optional) Timeout in seconds between sending SIGTERM and SIGKILL to container"
   default     = 30