Add support for registering multiple target groups with a service (#29)

* Add support for registering multiple target groups with a service

Read more: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html

* Lint fixes

* Missing comment

* Update README

* Use 'for_each' instead of 'count'

Author: Abdul Wahid

.gitignore

@@ -4,4 +4,5 @@ errored.tfstate
 crash.log
 terraform.tfstate
 *.tfstate*
-terraform.tfvars
+terraform.tfvars
+*.terraform.lock.hcl

README.md

@@ -1,12 +1,13 @@
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/umotif-public/terraform-aws-ecs-fargate?style=social)
+<!-- markdownlint-disable MD041 -->
+[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/umotif-public/terraform-aws-ecs-fargate?style=social)](https://github.com/umotif-public/terraform-aws-ecs-fargate/releases/latest)
 
-# terraform-aws-ecs-fargate
+# Terraform AWS ECS Fargate
 
-Terraform module to create AWS ECS FARGATE services. Module support both FARGATE and FARGATE-SPOT capacity provider settings.
+Terraform module to create [AWS ECS FARGATE](https://aws.amazon.com/fargate/) services. Module supports both `FARGATE` and `FARGATE-SPOT` capacity provider settings.
 
 ## Terraform versions
 
-Terraform 0.13. Pin module version to `~> v5.0`. Submit pull-requests to `master` branch.
+Terraform 0.13. Pin module version to `~> v6.0`. Submit pull-requests to `master` branch.
 
 ## Usage
 
@@ -30,12 +31,11 @@ resource "aws_ecs_cluster" "cluster" {
 
 module "ecs-fargate" {
   source = "umotif-public/ecs-fargate/aws"
-  version = "~> 5.1.0"
+  version = "~> 6.0.0"
 
   name_prefix        = "ecs-fargate-example"
   vpc_id             = "vpc-abasdasd132"
   private_subnet_ids = ["subnet-abasdasd132123", "subnet-abasdasd132123132"]
-  lb_arn             = "arn:aws:asdasdasdasdasdasad"
 
   cluster_id         = aws_ecs_cluster.cluster.id
 
@@ -46,6 +46,13 @@ module "ecs-fargate" {
   task_container_port             = 80
   task_container_assign_public_ip = true
 
+  target_groups = [
+    {
+      target_group_name = "tg-fargate-example"
+      container_port    = 80
+    }
+  ]
+
   health_check = {
     port = "traffic-port"
     path = "/"
@@ -67,6 +74,7 @@ Module is to be used with Terraform > 0.13.
 * [ECS Fargate](https://github.com/umotif-public/terraform-aws-ecs-fargate/tree/master/examples/core)
 * [ECS Fargate Spot](https://github.com/umotif-public/terraform-aws-ecs-fargate/tree/master/examples/fargate-spot)
 * [ECS Fargate with EFS](https://github.com/umotif-public/terraform-aws-ecs-fargate/tree/master/examples/fargate-efs)
+* [ECS Service with multiple target groups](https://github.com/umotif-public/terraform-aws-ecs-fargate/tree/master/examples/multiple-target-groups)
 
 ## Authors
 
@@ -94,14 +102,13 @@ Module managed by [Marcin Cuber](https://github.com/marcincuber) [LinkedIn](http
 | cluster\_id | The Amazon Resource Name (ARN) that identifies the cluster. | `string` | n/a | yes |
 | container\_name | Optional name for the container to be used instead of name\_prefix. | `string` | `""` | no |
 | create\_repository\_credentials\_iam\_policy | Set to true if you are specifying `repository_credentials` variable, it will attach IAM policy with necessary permissions to task role. | `bool` | `false` | no |
-| deployment\_controller\_type | Type of deployment controller. Valid values: CODE\_DEPLOY, ECS. | `string` | `"ECS"` | no |
+| deployment\_controller\_type | Type of deployment controller. Valid values: CODE\_DEPLOY, ECS, EXTERNAL. Default: ECS. | `string` | `"ECS"` | no |
 | deployment\_maximum\_percent | The upper limit of the number of running tasks that can be running in a service during a deployment | `number` | `200` | no |
 | deployment\_minimum\_healthy\_percent | The lower limit of the number of running tasks that must remain running and healthy in a service during a deployment | `number` | `50` | no |
 | desired\_count | The number of instances of the task definitions to place and keep running. | `number` | `1` | no |
 | force\_new\_deployment | Enable to force a new task deployment of the service. This can be used to update tasks to use a newer Docker image with same image/tag combination (e.g. myimage:latest), roll Fargate tasks onto a newer platform version. | `bool` | `false` | no |
 | health\_check | A health block containing health check settings for the target group. Overrides the defaults. | `map(string)` | n/a | yes |
 | health\_check\_grace\_period\_seconds | Seconds to ignore failing load balancer health checks on newly instantiated tasks to prevent premature shutdown, up to 7200. Only valid for services configured to use load balancers. | `number` | `300` | no |
-| lb\_arn | Arn for the LB for which the service should be attach to. | `string` | n/a | yes |
 | load\_balanced | Whether the task should be loadbalanced. | `bool` | `true` | no |
 | log\_retention\_in\_days | Number of days the logs will be retained in CloudWatch. | `number` | `30` | no |
 | logs\_kms\_key | The KMS key ARN to use to encrypt container logs. | `string` | `""` | no |
@@ -116,7 +123,7 @@ Module managed by [Marcin Cuber](https://github.com/marcincuber) [LinkedIn](http
 | service\_registry\_arn | ARN of aws\_service\_discovery\_service resource | `string` | `""` | no |
 | sg\_name\_prefix | A prefix used for Security group name. | `string` | `""` | no |
 | tags | A map of tags (key-value pairs) passed to resources. | `map(string)` | `{}` | no |
-| target\_group\_name | The name for the tasks target group | `string` | `""` | no |
+| target\_groups | The name of the target groups to associate with ecs service | `any` | `[]` | no |
 | task\_container\_assign\_public\_ip | Assigned public IP to the container. | `bool` | `false` | no |
 | task\_container\_command | The command that is passed to the container. | `list(string)` | `[]` | no |
 | task\_container\_cpu | Amount of CPU to reserve for the container. | `number` | `null` | no |

examples/core/main.tf

@@ -5,33 +5,26 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.63"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
+data "aws_vpc" "default" {
+  default = true
+}
 
-  enable_nat_gateway = false
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
 }
 
 #####
 # ALB
 #####
 module "alb" {
   source  = "umotif-public/alb/aws"
-  version = "~> 1.0"
+  version = "~> 2.0"
 
   name_prefix        = "alb-example"
   load_balancer_type = "application"
   internal           = false
-  vpc_id             = module.vpc.vpc_id
-  subnets            = module.vpc.public_subnets
+  vpc_id             = data.aws_vpc.default.id
+  subnets            = data.aws_subnet_ids.all.ids
 }
 
 resource "aws_lb_listener" "alb_80" {
@@ -41,7 +34,7 @@ resource "aws_lb_listener" "alb_80" {
 
   default_action {
     type             = "forward"
-    target_group_arn = module.fargate.target_group_arn
+    target_group_arn = module.fargate.target_group_arn[0]
   }
 }
 
@@ -93,9 +86,8 @@ module "fargate" {
   name_prefix = "ecs-fargate-example"
   # sg_name_prefix     = "my-security-group-name" # uncomment if you want to name security group with specific name
 
-  vpc_id             = module.vpc.vpc_id
-  private_subnet_ids = module.vpc.public_subnets
-  lb_arn             = module.alb.arn
+  vpc_id             = data.aws_vpc.default.id
+  private_subnet_ids = data.aws_subnet_ids.all.ids
   cluster_id         = aws_ecs_cluster.cluster.id
 
   wait_for_steady_state = true
@@ -109,6 +101,12 @@ module "fargate" {
   task_container_port             = 80
   task_container_assign_public_ip = true
 
+  target_groups = [
+    {
+      container_port = 80
+    }
+  ]
+
   health_check = {
     port = "traffic-port"
     path = "/"
@@ -129,7 +127,7 @@ module "fargate" {
 resource "aws_security_group" "allow_sg_test" {
   name        = "allow_sg_test"
   description = "Allow sg inbound traffic"
-  vpc_id      = module.vpc.vpc_id
+  vpc_id      = data.aws_vpc.default.id
 }
 
 resource "aws_security_group_rule" "test_sg_ingress" {

examples/fargate-efs/main.tf

@@ -5,33 +5,26 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.63"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
+data "aws_vpc" "default" {
+  default = true
+}
 
-  enable_nat_gateway = false
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
 }
 
 #####
 # ALB
 #####
 module "alb" {
   source  = "umotif-public/alb/aws"
-  version = "~> 1.0"
+  version = "~> 2.0"
 
   name_prefix        = "alb-example"
   load_balancer_type = "application"
   internal           = false
-  vpc_id             = module.vpc.vpc_id
-  subnets            = module.vpc.public_subnets
+  vpc_id             = data.aws_vpc.default.id
+  subnets            = data.aws_subnet_ids.all.ids
 }
 
 resource "aws_lb_listener" "alb_80" {
@@ -41,7 +34,7 @@ resource "aws_lb_listener" "alb_80" {
 
   default_action {
     type             = "forward"
-    target_group_arn = module.fargate.target_group_arn
+    target_group_arn = module.fargate.target_group_arn[0]
   }
 }
 
@@ -99,9 +92,8 @@ module "fargate" {
   source = "../../"
 
   name_prefix        = "ecs-fargate-example"
-  vpc_id             = module.vpc.vpc_id
-  private_subnet_ids = module.vpc.public_subnets
-  lb_arn             = module.alb.arn
+  vpc_id             = data.aws_vpc.default.id
+  private_subnet_ids = data.aws_subnet_ids.all.ids
   cluster_id         = aws_ecs_cluster.cluster.id
 
   platform_version = "1.4.0"
@@ -113,6 +105,12 @@ module "fargate" {
   task_container_port             = 80
   task_container_assign_public_ip = true
 
+  target_groups = [
+    {
+      container_port = 80
+    }
+  ]
+
   health_check = {
     port = "traffic-port"
     path = "/"

examples/fargate-spot/main.tf

@@ -5,33 +5,26 @@ provider "aws" {
 #####
 # VPC and subnets
 #####
-module "vpc" {
-  source  = "terraform-aws-modules/vpc/aws"
-  version = "~> 2.63"
-
-  name = "simple-vpc"
-
-  cidr = "10.0.0.0/16"
-
-  azs             = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]
-  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
-  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
+data "aws_vpc" "default" {
+  default = true
+}
 
-  enable_nat_gateway = false
+data "aws_subnet_ids" "all" {
+  vpc_id = data.aws_vpc.default.id
 }
 
 #####
 # ALB
 #####
 module "alb" {
   source  = "umotif-public/alb/aws"
-  version = "~> 1.0"
+  version = "~> 2.0"
 
   name_prefix        = "alb-example"
   load_balancer_type = "application"
   internal           = false
-  vpc_id             = module.vpc.vpc_id
-  subnets            = module.vpc.public_subnets
+  vpc_id             = data.aws_vpc.default.id
+  subnets            = data.aws_subnet_ids.all.ids
 }
 
 resource "aws_lb_listener" "alb_80" {
@@ -41,7 +34,7 @@ resource "aws_lb_listener" "alb_80" {
 
   default_action {
     type             = "forward"
-    target_group_arn = module.fargate.target_group_arn
+    target_group_arn = module.fargate.target_group_arn[0]
   }
 }
 
@@ -88,10 +81,10 @@ module "fargate" {
   source = "../../"
 
   name_prefix        = "ecs-fargate-example"
-  vpc_id             = module.vpc.vpc_id
-  private_subnet_ids = module.vpc.public_subnets
-  lb_arn             = module.alb.arn
-  cluster_id         = aws_ecs_cluster.cluster.id
+  vpc_id             = data.aws_vpc.default.id
+  private_subnet_ids = data.aws_subnet_ids.all.ids
+
+  cluster_id = aws_ecs_cluster.cluster.id
 
   task_container_image   = "marcincuber/2048-game:latest"
   task_definition_cpu    = 256
@@ -100,6 +93,12 @@ module "fargate" {
   task_container_port             = 80
   task_container_assign_public_ip = true
 
+  target_groups = [
+    {
+      container_port = 80
+    }
+  ]
+
   health_check = {
     port = "traffic-port"
     path = "/"