Fixing issues

Author: jnonino

README.md

@@ -19,6 +19,7 @@ Check valid versions on:
             vpc_id              = module.networking.vpc_id
             task_definition_arn = module.td.aws_ecs_task_definition_td_arn
             container_port      = module.td.container_port
+            ecs_cluster_name    = module.ecs-cluster.aws_ecs_cluster_cluster_name
             ecs_cluster_arn     = module.ecs-cluster.aws_ecs_cluster_cluster_arn
             subnets             = module.networking.private_subnets_ids
         }
@@ -32,8 +33,10 @@ Check the section "Other modules that you may need to use this module" for detai
 * region: AWS Region the infrastructure is hosted in.
 * vpc_id: ID of the VPC.
 * task_definition_arn: (Required) The full ARN of the task definition that you want to run in your service.
+* ecs_cluster_name = Name of the ECS cluster.
 * ecs_cluster_arn: ARN of an ECS cluster.
 * subnets: The subnets associated with the task or service.
+* container_name: Name of the running container.
 * container_port: Port on which the container is listening.
 * desired_count: (Optional) The number of instances of the task definition to place and keep running. Defaults to 1.
 * platform_version: (Optional) The platform version on which to run your service. Defaults to LATEST. More information about Fargate platform versions can be found in the AWS ECS User Guide.
@@ -92,7 +95,7 @@ The ECS cluster module should look like this:
 
         module "ecs-cluster": 
             source       = "jnonino/ecs-cluster/aws"
-            version      = "1.0.0"
+            version      = "1.0.1"
             name_preffix = var.name_preffix
             profile      = var.profile
             region       = var.region

main.tf

@@ -15,17 +15,6 @@ resource "aws_kms_key" "encryption_key" {
   enable_key_rotation = true
 }
 
-# ---------------------------------------------------------------------------------------------------------------------
-# AWS Cloudwatch Logs
-# ---------------------------------------------------------------------------------------------------------------------
-module "aws_cw_logs" {
-  source  = "jnonino/cloudwatch-logs/aws"
-  version = "1.0.2"
-  logs_path                   = local.log_options["awslogs-group"]
-  profile                     = var.profile
-  region                      = var.region
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # AWS SECURITY GROUP - ECS Tasks, allow traffic only from Load Balancer
 # ---------------------------------------------------------------------------------------------------------------------
@@ -65,10 +54,30 @@ resource "aws_ecs_service" "service" {
   deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent
   enable_ecs_managed_tags            = var.enable_ecs_managed_tags
   propagate_tags                     = var.propagate_tags
-  ordered_placement_strategy         = var.ordered_placement_strategy
+  dynamic "ordered_placement_strategy" {
+    for_each = var.ordered_placement_strategy
+    content {
+      type  = ordered_placement_strategy.value.type
+      field = lookup(ordered_placement_strategy.value, "field", null)
+    }
+  }
   health_check_grace_period_seconds  = var.health_check_grace_period_seconds
-  placement_constraints              = var.placement_constraints
-  service_registries                 = var.service_registries
+  dynamic "placement_constraints" {
+    for_each = var.placement_constraints
+    content {
+      expression = lookup(placement_constraints.value, "expression", null)
+      type       = placement_constraints.value.type
+    }
+  }
+  dynamic "service_registries" {
+    for_each = var.service_registries
+    content {
+      registry_arn   = service_registries.value.registry_arn
+      port           = lookup(service_registries.value, "port", null)
+      container_name = lookup(service_registries.value, "container_name", null)
+      container_port = lookup(service_registries.value, "container_port", null)
+    }
+  }
   network_configuration {
     security_groups  =[aws_security_group.ecs_tasks_sg.id]
     subnets          = var.subnets
@@ -110,7 +119,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu_high" {
   statistic           = "Maximum"
   threshold           = "85"
   dimensions = {
-    ClusterName = aws_ecs_cluster.cluster.name
+    ClusterName = var.ecs_cluster_name
     ServiceName = aws_ecs_service.service.name
   }
   alarm_actions = [aws_appautoscaling_policy.scale_up_policy.arn]
@@ -129,7 +138,7 @@ resource "aws_cloudwatch_metric_alarm" "cpu_low" {
   statistic           = "Average"
   threshold           = "10"
   dimensions = {
-    ClusterName = aws_ecs_cluster.cluster.name
+    ClusterName = var.ecs_cluster_name
     ServiceName = aws_ecs_service.service.name
   }
   alarm_actions = [aws_appautoscaling_policy.scale_down_policy.arn]
@@ -142,7 +151,7 @@ resource "aws_appautoscaling_policy" "scale_up_policy" {
   name               = "${var.name_preffix}-scale-up-policy"
   depends_on         = [aws_appautoscaling_target.scale_target]
   service_namespace  = "ecs"
-  resource_id        = "service/${aws_ecs_cluster.cluster.name}/${aws_ecs_service.service.name}"
+  resource_id        = "service/${var.ecs_cluster_name}/${aws_ecs_service.service.name}"
   scalable_dimension = "ecs:service:DesiredCount"
   step_scaling_policy_configuration {
     adjustment_type         = "ChangeInCapacity"
@@ -162,7 +171,7 @@ resource "aws_appautoscaling_policy" "scale_down_policy" {
   name               = "${var.name_preffix}-scale-down-policy"
   depends_on         = [aws_appautoscaling_target.scale_target]
   service_namespace  = "ecs"
-  resource_id        = "service/${aws_ecs_cluster.cluster.name}/${aws_ecs_service.service.name}"
+  resource_id        = "service/${var.ecs_cluster_name}/${aws_ecs_service.service.name}"
   scalable_dimension = "ecs:service:DesiredCount"
   step_scaling_policy_configuration {
     adjustment_type         = "ChangeInCapacity"
@@ -180,7 +189,7 @@ resource "aws_appautoscaling_policy" "scale_down_policy" {
 # ---------------------------------------------------------------------------------------------------------------------
 resource "aws_appautoscaling_target" "scale_target" {
   service_namespace  = "ecs"
-  resource_id        = "service/${aws_ecs_cluster.cluster.name}/${aws_ecs_service.service.name}"
+  resource_id        = "service/${var.ecs_cluster_name}/${aws_ecs_service.service.name}"
   scalable_dimension = "ecs:service:DesiredCount"
   role_arn           = aws_iam_role.ecs_autoscale_role.arn
   min_capacity       = 1

variables.tf

@@ -30,6 +30,10 @@ variable "task_definition_arn" {
   description = "(Required) The full ARN of the task definition that you want to run in your service."
 }
 
+variable "ecs_cluster_name" {
+  description = "Name of the ECS cluster"
+}
+
 variable "ecs_cluster_arn" {
   description = "ARN of an ECS cluster"
 }
@@ -39,6 +43,10 @@ variable "subnets" {
   type        = list
 }
 
+variable "container_name" {
+  description = "Name of the running container"
+}
+
 variable "container_port" {
   description = "Port on which the container is listening"
 }