refactor: update ecs_kong to new version of ecs module

Author: Rahul-4480

README.md

@@ -75,18 +75,18 @@ This command will display the values of the stored parameters, ensuring they hav
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.59.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_ecs_exec_role"></a> [ecs\_exec\_role](#module\_ecs\_exec\_role) | ./modules/iam | n/a |
-| <a name="module_ecs_kong"></a> [ecs\_kong](#module\_ecs\_kong) | github.com/infraspecdev/terraform-aws-ecs-deployment | v1.1.1 |
+| <a name="module_ecs_kong"></a> [ecs\_kong](#module\_ecs\_kong) | infraspecdev/ecs-deployment/aws | ~> 2.0.0 |
 | <a name="module_ecs_node_security_group"></a> [ecs\_node\_security\_group](#module\_ecs\_node\_security\_group) | terraform-aws-modules/security-group/aws | ~> 5.1.2 |
 | <a name="module_ecs_task_security_group"></a> [ecs\_task\_security\_group](#module\_ecs\_task\_security\_group) | terraform-aws-modules/security-group/aws | ~> 5.1.2 |
 | <a name="module_github_runner"></a> [github\_runner](#module\_github\_runner) | ./modules/github-runner | n/a |
-| <a name="module_internal_alb_kong"></a> [internal\_alb\_kong](#module\_internal\_alb\_kong) | github.com/infraspecdev/terraform-aws-ecs-deployment//modules/alb | v1.1.1 |
+| <a name="module_internal_alb_kong"></a> [internal\_alb\_kong](#module\_internal\_alb\_kong) | infraspecdev/ecs-deployment/aws//modules/alb | ~> 2.0.0 |
 | <a name="module_internal_alb_security_group"></a> [internal\_alb\_security\_group](#module\_internal\_alb\_security\_group) | terraform-aws-modules/security-group/aws | ~> 5.1.2 |
 | <a name="module_kong_internal_dns_record"></a> [kong\_internal\_dns\_record](#module\_kong\_internal\_dns\_record) | ./modules/route-53-record | n/a |
 | <a name="module_kong_public_dns_record"></a> [kong\_public\_dns\_record](#module\_kong\_public\_dns\_record) | ./modules/route-53-record | n/a |
@@ -98,6 +98,7 @@ This command will display the values of the stored parameters, ensuring they hav
 
 | Name | Type |
 |------|------|
+| [aws_autoscaling_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/autoscaling_group) | data source |
 | [aws_ssm_parameter.ecs_node_ami](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
 | [aws_ssm_parameter.github](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
 | [aws_ssm_parameter.rds](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
@@ -107,37 +108,32 @@ This command will display the values of the stored parameters, ensuring they hav
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_asg_name"></a> [asg\_name](#input\_asg\_name) | Name of the auto scaling group | `string` | `"default"` | no |
 | <a name="input_backup_retention_period"></a> [backup\_retention\_period](#input\_backup\_retention\_period) | The number of days to retain backups | `number` | `1` | no |
 | <a name="input_backup_window"></a> [backup\_window](#input\_backup\_window) | The daily time range (in UTC) during which automated backups are created if they are enabled | `string` | `null` | no |
 | <a name="input_base_domain"></a> [base\_domain](#input\_base\_domain) | Base domain | `string` | n/a | yes |
-| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of the cluster | `string` | n/a | yes |
+| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of the cluster | `string` | `"default"` | no |
 | <a name="input_container_image"></a> [container\_image](#input\_container\_image) | Container image for kong | `string` | `"kong:3.7.1-ubuntu"` | no |
 | <a name="input_cpu_for_kong_task"></a> [cpu\_for\_kong\_task](#input\_cpu\_for\_kong\_task) | CPU required for kong task definiton | `number` | `256` | no |
 | <a name="input_create_db_subnet_group"></a> [create\_db\_subnet\_group](#input\_create\_db\_subnet\_group) | Whether to create a DB subnet group | `bool` | `true` | no |
 | <a name="input_db_allocated_storage"></a> [db\_allocated\_storage](#input\_db\_allocated\_storage) | The amount of allocated storage in GBs | `number` | `20` | no |
 | <a name="input_db_max_allocated_storage"></a> [db\_max\_allocated\_storage](#input\_db\_max\_allocated\_storage) | The maximum amount of allocated storage in GBs | `number` | `100` | no |
 | <a name="input_deletion_protection"></a> [deletion\_protection](#input\_deletion\_protection) | Whether to enable deletion protection | `bool` | `false` | no |
-| <a name="input_desired_capacity"></a> [desired\_capacity](#input\_desired\_capacity) | Desired capacity of auto scaling group | `number` | `2` | no |
 | <a name="input_desired_count_for_kong_service"></a> [desired\_count\_for\_kong\_service](#input\_desired\_count\_for\_kong\_service) | Desired count for kong service | `number` | `1` | no |
 | <a name="input_force_new_deployment"></a> [force\_new\_deployment](#input\_force\_new\_deployment) | Whether to force new deployment | `bool` | `true` | no |
-| <a name="input_instance_type_for_kong"></a> [instance\_type\_for\_kong](#input\_instance\_type\_for\_kong) | Instance type for kong | `string` | `"t2.micro"` | no |
-| <a name="input_key_name_for_kong"></a> [key\_name\_for\_kong](#input\_key\_name\_for\_kong) | Key name for to SSH into kong instance | `string` | `null` | no |
 | <a name="input_kong_admin_sub_domain_names"></a> [kong\_admin\_sub\_domain\_names](#input\_kong\_admin\_sub\_domain\_names) | List of kong admin sub domain names | `list(any)` | n/a | yes |
 | <a name="input_kong_public_sub_domain_names"></a> [kong\_public\_sub\_domain\_names](#input\_kong\_public\_sub\_domain\_names) | List of kong public sub domain names | `list(any)` | n/a | yes |
 | <a name="input_log_configuration_for_kong"></a> [log\_configuration\_for\_kong](#input\_log\_configuration\_for\_kong) | Log configuration for kong | `any` | `null` | no |
 | <a name="input_maintenance_window"></a> [maintenance\_window](#input\_maintenance\_window) | The window to perform maintenance in.Syntax:ddd:hh24:mi-ddd:hh24:mi | `string` | `null` | no |
 | <a name="input_manage_master_user_password"></a> [manage\_master\_user\_password](#input\_manage\_master\_user\_password) | Whether to manage master user password | `bool` | `false` | no |
 | <a name="input_managed_scaling_status"></a> [managed\_scaling\_status](#input\_managed\_scaling\_status) | Mangaed scaling | `string` | `"ENABLED"` | no |
-| <a name="input_max_size"></a> [max\_size](#input\_max\_size) | Min size of auto scaling group | `number` | `2` | no |
 | <a name="input_maximum_scaling_step_size"></a> [maximum\_scaling\_step\_size](#input\_maximum\_scaling\_step\_size) | Maximum scaling step size | `number` | `2` | no |
 | <a name="input_memory_for_kong_task"></a> [memory\_for\_kong\_task](#input\_memory\_for\_kong\_task) | Memory required for kong task definiton | `number` | `256` | no |
-| <a name="input_min_size"></a> [min\_size](#input\_min\_size) | Min size of auto scaling group | `number` | `1` | no |
 | <a name="input_minimum_scaling_step_size"></a> [minimum\_scaling\_step\_size](#input\_minimum\_scaling\_step\_size) | Minimum scaling step size | `number` | `1` | no |
 | <a name="input_multi_az"></a> [multi\_az](#input\_multi\_az) | Specifies if the RDS instance is multi-AZ | `bool` | `false` | no |
 | <a name="input_performance_insights_enabled"></a> [performance\_insights\_enabled](#input\_performance\_insights\_enabled) | Whether to enable performance insights | `bool` | `true` | no |
 | <a name="input_performance_insights_retention_period"></a> [performance\_insights\_retention\_period](#input\_performance\_insights\_retention\_period) | The retention period for performance insights | `number` | `7` | no |
 | <a name="input_private_subnet_ids"></a> [private\_subnet\_ids](#input\_private\_subnet\_ids) | List of private subnet id | `list(string)` | n/a | yes |
-| <a name="input_protect_from_scale_in"></a> [protect\_from\_scale\_in](#input\_protect\_from\_scale\_in) | Whether to protect from scale in | `bool` | `true` | no |
 | <a name="input_public_subnet_ids"></a> [public\_subnet\_ids](#input\_public\_subnet\_ids) | List of public subnet id | `list(string)` | n/a | yes |
 | <a name="input_rds_db_tags"></a> [rds\_db\_tags](#input\_rds\_db\_tags) | List of tags | `map(string)` | `{}` | no |
 | <a name="input_rds_instance_class"></a> [rds\_instance\_class](#input\_rds\_instance\_class) | The instance class to use | `string` | `"db.t3.micro"` | no |
@@ -147,4 +143,4 @@ This command will display the values of the stored parameters, ensuring they hav
 
 ## Outputs
 
-No outputs.
+No outputs.

data.tf

@@ -17,3 +17,7 @@ data "aws_ssm_parameter" "github" {
   name            = "/github-action/${each.value}"
   with_decryption = true
 }
+
+data "aws_autoscaling_group" "this" {
+  name = var.asg_name
+}

locals.tf

@@ -12,8 +12,6 @@ locals {
     port                 = 5432
   }
 
-
-
   ecs = {
     user_data        = <<EOF
     #!/bin/bash

main.tf

@@ -194,7 +194,9 @@ module "ecs_exec_role" {
 ################################################################################
 
 module "ecs_kong" {
-  source       = "github.com/infraspecdev/terraform-aws-ecs-deployment?ref=v1.1.1"
+  source  = "infraspecdev/ecs-deployment/aws"
+  version = "~> 2.0.0"
+
   vpc_id       = var.vpc_id
   cluster_name = var.cluster_name
 
@@ -248,31 +250,11 @@ module "ecs_kong" {
     ]
   }
 
-  autoscaling_group = {
-    name                  = local.kong.name
-    vpc_zone_identifier   = var.private_subnet_ids
-    desired_capacity      = var.desired_capacity
-    min_size              = var.min_size
-    max_size              = var.max_size
-    protect_from_scale_in = var.protect_from_scale_in
-    launch_template = {
-      name                   = local.kong.launch_template_name
-      image_id               = local.kong.image_id
-      instance_type          = var.instance_type_for_kong
-      vpc_security_group_ids = [module.ecs_node_security_group.security_group_id]
-      key_name               = var.key_name_for_kong
-      user_data              = local.ecs.user_data
-    }
-
-    iam_role_name               = local.kong.name
-    iam_role_policy_attachments = local.kong.iam_role_policy_attachments
-    iam_instance_profile_name   = local.kong.name
-
-  }
-
+  capacity_provider_default_auto_scaling_group_arn = data.aws_autoscaling_group.this.arn
   capacity_providers = {
     kong = {
-      name = local.kong.name
+      name                           = local.kong.name
+      managed_termination_protection = "DISABLED"
       managed_scaling = {
         maximum_scaling_step_size = var.maximum_scaling_step_size
         minimum_scaling_step_size = var.minimum_scaling_step_size
@@ -344,7 +326,9 @@ module "ecs_kong" {
 ################################################################################
 
 module "internal_alb_kong" {
-  source                     = "github.com/infraspecdev/terraform-aws-ecs-deployment//modules/alb?ref=v1.1.1"
+  source  = "infraspecdev/ecs-deployment/aws//modules/alb"
+  version = "~> 2.0.0"
+
   name                       = "${local.kong.name}-internal"
   internal                   = true
   subnets_ids                = var.private_subnet_ids

modules/github-runner/README.md

@@ -6,7 +6,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.53.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
 
 ## Modules
 
@@ -33,4 +33,4 @@ No modules.
 
 ## Outputs
 
-No outputs.
+No outputs.

modules/iam/README.md

@@ -6,7 +6,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.59.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
 
 ## Modules
 
@@ -34,4 +34,4 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_role_arn"></a> [role\_arn](#output\_role\_arn) | The ARN of the IAM role |
-| <a name="output_role_name"></a> [role\_name](#output\_role\_name) | The name of the IAM role |
+| <a name="output_role_name"></a> [role\_name](#output\_role\_name) | The name of the IAM role |

modules/route-53-record/README.md

@@ -6,7 +6,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.59.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
 
 ## Modules
 
@@ -34,4 +34,4 @@ No modules.
 | Name | Description |
 |------|-------------|
 | <a name="output_certificate_arn"></a> [certificate\_arn](#output\_certificate\_arn) | ARN of the base domain certificate |
-| <a name="output_zone_id"></a> [zone\_id](#output\_zone\_id) | ID of the Route 53 zone |
+| <a name="output_zone_id"></a> [zone\_id](#output\_zone\_id) | ID of the Route 53 zone |

variables.tf

@@ -46,6 +46,13 @@ variable "backup_retention_period" {
 variable "cluster_name" {
   description = "Name of the cluster"
   type        = string
+  default     = "default"
+}
+
+variable "asg_name" {
+  description = "Name of the auto scaling group"
+  type        = string
+  default     = "default"
 }
 
 variable "deletion_protection" {
@@ -141,24 +148,6 @@ variable "target_capacity" {
   default     = 100
 }
 
-variable "desired_capacity" {
-  description = "Desired capacity of auto scaling group"
-  type        = number
-  default     = 2
-}
-
-variable "min_size" {
-  description = "Min size of auto scaling group"
-  type        = number
-  default     = 1
-}
-
-variable "max_size" {
-  description = "Min size of auto scaling group"
-  type        = number
-  default     = 2
-}
-
 variable "container_image" {
   description = "Container image for kong"
   type        = string
@@ -189,26 +178,8 @@ variable "desired_count_for_kong_service" {
   default     = 1
 }
 
-variable "key_name_for_kong" {
-  description = "Key name for to SSH into kong instance"
-  type        = string
-  default     = null
-}
-
-variable "protect_from_scale_in" {
-  description = "Whether to protect from scale in"
-  type        = bool
-  default     = true
-}
-
 variable "force_new_deployment" {
   description = "Whether to force new deployment"
   type        = bool
   default     = true
 }
-
-variable "instance_type_for_kong" {
-  description = "Instance type for kong"
-  type        = string
-  default     = "t2.micro"
-}