[ISSUE #13] Replacing count with for_each (#18)

* Replacing count with for_each

* Format change

* Fixing validation issues

* Fixing error with empty list

* Fixing error with empty list

* Fixing error with empty list

* Removing unneeded role

* Replacing count with for_each

* Replacing count with for_each

* Replacing count with for_each

Author: jnonino

autoscaling.tf

@@ -1,19 +1,3 @@
-#------------------------------------------------------------------------------
-# AWS ECS Auto Scale Role
-#------------------------------------------------------------------------------
-resource "aws_iam_role" "ecs_autoscale_role" {
-  name               = "${var.name_prefix}-ecs-autoscale-role"
-  assume_role_policy = file("${path.module}/files/iam/ecs_autoscale_iam_role.json")
-}
-
-resource "aws_iam_role_policy" "ecs_autoscale_role_policy" {
-  name = "${var.name_prefix}-ecs-autoscale-role-policy"
-  role = aws_iam_role.ecs_autoscale_role.id
-  policy = file(
-    "${path.module}/files/iam/ecs_autoscale_iam_role_policy.json",
-  )
-}
-
 #------------------------------------------------------------------------------
 # AWS Auto Scaling - CloudWatch Alarm CPU High
 #------------------------------------------------------------------------------
@@ -99,7 +83,6 @@ resource "aws_appautoscaling_target" "scale_target" {
   service_namespace  = "ecs"
   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       = var.scale_target_min_capacity
   max_capacity       = var.scale_target_max_capacity
 }

examples/test/main.tf

@@ -20,7 +20,7 @@ module "base-network" {
 
 module "load_balancer" {
   source          = "cn-terraform/ecs-alb/aws"
-  version         = "1.0.5"
+  version         = "1.0.6"
   name_prefix     = "test-alb"
   vpc_id          = module.base-network.vpc_id
   private_subnets = module.base-network.private_subnets_ids
@@ -48,6 +48,8 @@ module "service" {
   lb_arn                  = module.load_balancer.aws_lb_lb_arn
   lb_http_tgs_arns        = module.load_balancer.lb_http_tgs_arns
   lb_https_tgs_arns       = module.load_balancer.lb_https_tgs_arns
+  lb_http_tgs_ports       = module.load_balancer.lb_http_tgs_ports
+  lb_https_tgs_ports      = module.load_balancer.lb_https_tgs_ports
   lb_http_listeners_arns  = module.load_balancer.lb_http_listeners_arns
   lb_https_listeners_arns = module.load_balancer.lb_https_listeners_arns
   load_balancer_sg_id     = module.load_balancer.aws_security_group_lb_access_sg_id

files/iam/ecs_autoscale_iam_role.json

@@ -7,23 +7,23 @@ data "aws_lb" "lb" {
 }
 
 data "aws_lb_target_group" "lb_http_target_groups" {
-  count = length(var.lb_http_tgs_arns)
-  arn   = element(var.lb_http_tgs_arns, count.index)
+  for_each = var.lb_http_tgs_arns != null ? toset(var.lb_http_tgs_arns) : toset([])
+  arn      = each.key
 }
 
 data "aws_lb_target_group" "lb_https_target_groups" {
-  count = length(var.lb_https_tgs_arns)
-  arn   = element(var.lb_https_tgs_arns, count.index)
+  for_each = toset(var.lb_https_tgs_arns)
+  arn      = each.key
 }
 
 data "aws_lb_listener" "lb_http_listeners" {
-  count = length(var.lb_http_listeners_arns)
-  arn   = element(var.lb_http_listeners_arns, count.index)
+  for_each = var.lb_http_listeners_arns != null ? toset(var.lb_http_listeners_arns) : toset([])
+  arn      = each.key
 }
 
 data "aws_lb_listener" "lb_https_listeners" {
-  count = length(var.lb_https_listeners_arns)
-  arn   = element(var.lb_https_listeners_arns, count.index)
+  for_each = var.lb_https_listeners_arns != null ? toset(var.lb_https_listeners_arns) : toset([])
+  arn      = each.key
 }
 
 #------------------------------------------------------------------------------
@@ -111,21 +111,21 @@ resource "aws_security_group" "ecs_tasks_sg" {
 }
 
 resource "aws_security_group_rule" "ingress_through_http" {
-  count                    = length(data.aws_lb_target_group.lb_http_target_groups)
+  for_each                 = var.lb_http_tgs_ports != null ? toset(var.lb_http_tgs_ports) : toset([])
   security_group_id        = aws_security_group.ecs_tasks_sg.id
   type                     = "ingress"
-  from_port                = element(data.aws_lb_target_group.lb_http_target_groups.*.port, count.index)
-  to_port                  = element(data.aws_lb_target_group.lb_http_target_groups.*.port, count.index)
+  from_port                = each.key
+  to_port                  = each.key
   protocol                 = "tcp"
   source_security_group_id = var.load_balancer_sg_id
 }
 
 resource "aws_security_group_rule" "ingress_through_https" {
-  count                    = length(data.aws_lb_target_group.lb_https_target_groups)
+  for_each                 = var.lb_https_tgs_ports != null ? toset(var.lb_https_tgs_ports) : toset([])
   security_group_id        = aws_security_group.ecs_tasks_sg.id
   type                     = "ingress"
-  from_port                = element(data.aws_lb_target_group.lb_https_target_groups.*.port, count.index)
-  to_port                  = element(data.aws_lb_target_group.lb_https_target_groups.*.port, count.index)
+  from_port                = each.key
+  to_port                  = each.key
   protocol                 = "tcp"
   source_security_group_id = var.load_balancer_sg_id
 }

files/iam/ecs_autoscale_iam_role_policy.json

@@ -184,11 +184,21 @@ variable "lb_http_tgs_arns" {
   type        = list(string)
 }
 
+variable "lb_http_tgs_ports" {
+  description = "List of HTTP LB Target Group Ports"
+  type        = list(string)
+}
+
 variable "lb_https_tgs_arns" {
   description = "List of HTTPS LB Target Group ARNs"
   type        = list(string)
 }
 
+variable "lb_https_tgs_ports" {
+  description = "List of HTTPS LB Target Group Ports"
+  type        = list(string)
+}
+
 variable "lb_http_listeners_arns" {
   description = "List of HTTP LB Listeners ARNs"
   type        = list(string)