From 9501c4efc31ffd3b43f7eae3d68873619dac8458 Mon Sep 17 00:00:00 2001
From: Sergei Ugdyzhekov <sergei.ugdyzhekov@jetbrains.com>
Date: Mon, 4 Oct 2021 19:41:48 +0200
Subject: [PATCH] feat: arm64 support

---
 README.md    | 37 ++++++++++++++++++++++++++++++++-----
 variables.tf | 10 +++++++++-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e829c41..c067a3e 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ Features:
 * Default ECS task role allows creating a log group.
 * Default security group for ECS nodes allow inbound connections from configurable list of network CIDRs.
 * It's possible to specify additional security groups for ECS nodes.
-* Latest ECS Optimized AMI.
+* Latest ECS Optimized AMI with `amd64` or `arm64` architectures.
 * Additional EBS disks.
+* ASG lifecycle hooks.
 
 ## Usage
 
@@ -21,10 +22,13 @@ module "example_ecs_cluster" {
   source              = "github.com/jetbrains-infra/terraform-aws-ecs-cluster?ref=vX.X.X" // see https://github.com/jetbrains-infra/terraform-aws-ecs-cluster/releases
   cluster_name        = "FooBar"
   spot                = true
+  arm64               = true
+  
   instance_types = {
     "t3a.large"  = 1
     "t3a.xlarge" = 2
   }
+  
   target_capacity = 100
 
   // subnets with ALB and bastion host e.g..
@@ -36,10 +40,27 @@ module "example_ecs_cluster" {
   ebs_disks = {
     "/dev/sda" = 100
   }
-  subnets_ids         = [
+  
+  subnets_ids = [
     aws_subnet.private_subnet_1.id,
     aws_subnet.private_subnet_2.id
   ]
+  
+  lifecycle_hooks = [
+    {
+      name                    = "Example"
+      lifecycle_transition    = "autoscaling:EC2_INSTANCE_LAUNCHING"
+      default_result          = "CONTINUE"
+      heartbeat_timeout       = 2000
+      role_arn                = aws_iam_role.example.arn
+      notification_target_arn = "arn:aws:sqs:us-east-1:444455556666:queue1"
+      notification_metadata   = <<EOF
+{
+  "foo": "bar"
+}
+EOF
+    }
+  ]
 }
 ```
 
@@ -49,13 +70,18 @@ module "example_ecs_cluster" {
   source              = "github.com/jetbrains-infra/terraform-aws-ecs-cluster?ref=vX.X.X" // see https://github.com/jetbrains-infra/terraform-aws-ecs-cluster/releases
   cluster_name        = "FooBar"
   spot                = false
+  arm64               = false
+  
   instance_types = {
     "t3a.small"  = 2
   }
-  target_capacity    = 100
-  security_group_ids = []
+  
+  target_capacity     = 100
+  security_group_ids  = []
   // subnets with ALB and bastion host e.g..
   trusted_cidr_blocks = []
+  lifecycle_hooks     = []
+  
   subnets_ids         = [
     aws_subnet.private_subnet_1.id,
     aws_subnet.private_subnet_2.id
@@ -74,4 +100,5 @@ module "example_ecs_cluster" {
 * `iam_instance_profile_name` -  IAM instance profile name
 * `iam_instance_role_name` - IAM instance role name
 * `security_group_id` - security group id
-* `security_group_name` - security group name
\ No newline at end of file
+* `security_group_name` - security group name
+* `capacity_provider_name` - capacity provider name (the same name for ASG)
\ No newline at end of file
diff --git a/variables.tf b/variables.tf
index 5d235aa..36525eb 100644
--- a/variables.tf
+++ b/variables.tf
@@ -20,6 +20,9 @@ variable "protect_from_scale_in" {
 data "aws_ssm_parameter" "ecs_ami" {
   name = "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id"
 }
+data "aws_ssm_parameter" "ecs_ami_arm64" {
+  name = "/aws/service/ecs/optimized-ami/amazon-linux-2/arm64/recommended/image_id"
+}
 variable "spot" {
   description = "Choose should we use spot instances or on-demand to poulate ECS cluster."
   type        = bool
@@ -66,6 +69,11 @@ variable "lifecycle_hooks" {
   }))
   default = []
 }
+variable "arm64" {
+  description = "ECS node architecture"
+  default     = false
+  type        = bool
+}
 
 locals {
   vpc_id                  = data.aws_subnet.default.vpc_id
@@ -74,7 +82,7 @@ locals {
   trusted_cidr_blocks     = var.trusted_cidr_blocks
   instance_types          = var.instance_types
   sg_ids                  = distinct(concat(var.security_group_ids, [aws_security_group.ecs_nodes.id]))
-  ami_id                  = data.aws_ssm_parameter.ecs_ami.value
+  ami_id                  = var.arm64 ? data.aws_ssm_parameter.ecs_ami_arm64.value : data.aws_ssm_parameter.ecs_ami.value
   spot                    = var.spot == true ? 0 : 100
   lifecycle_hooks         = var.lifecycle_hooks
   target_capacity         = var.target_capacity