adding ec2

Author: Arunsai14

README.md

@@ -59,22 +59,38 @@ In your main Terraform configuration file (e.g., main.tf), you can use the modul
 
 
 ```hcl
+################################################################################
+## ecs cluster
+################################################################################
+
 module "ecs_cluster" {
-  source = "./modules/ecs_cluster"
-
-  ecs_cluster = {
-    name                        = var.ecs_cluster.name
-    configuration               = var.ecs_cluster.configuration
-    create_cloudwatch_log_group = var.ecs_cluster.create_cloudwatch_log_group
-    service_connect_defaults    = var.ecs_cluster.service_connect_defaults
-    settings                    = var.ecs_cluster.settings
-  }
-
-  capacity_provider = {
-    autoscaling_capacity_providers        = var.capacity_provider.autoscaling_capacity_providers
-    default_capacity_provider_use_fargate = var.capacity_provider.default_capacity_provider_use_fargate
-    fargate_capacity_providers            = var.capacity_provider.fargate_capacity_providers
-  }
+  source = "../../"
+
+  ecs_cluster       = local.ecs_cluster
+  capacity_provider = local.capacity_provider
+  ecs_service       = local.ecs_service
+  tags              = module.tags.tags
+}
+
+################################################################################
+## ecs services and task
+################################################################################
+
+module "ecs_services" {
+  for_each = local.ecs_services
+
+  source           = "../../"
+  ecs_cluster      = each.value.ecs_cluster
+  ecs_cluster_name = local.ecs_cluster.name
+  ecs_service      = each.value.ecs_service
+  task             = each.value.task
+  lb_data          = each.value.lb_data
+  vpc_id           = data.aws_vpc.default.id
+  target_group_arn = module.alb.target_group_arn
+  environment      = var.environment
+  tags             = module.tags.tags
+  depends_on       = [module.ecs_cluster, module.alb]
+
 }
 ```
 
@@ -133,9 +149,9 @@ No resources.
 |------|-------------|------|---------|:--------:|
 | <a name="input_asg"></a> [asg](#input\_asg) | Auto Scaling Group configuration | <pre>object({<br>    name                = optional(string, null)<br>    min_size            = number<br>    max_size            = number<br>    desired_capacity    = optional(number)<br>    vpc_zone_identifier = optional(list(string))<br><br>    health_check_type         = optional(string)<br>    health_check_grace_period = optional(number, 300)<br>    protect_from_scale_in     = optional(bool)<br>    default_cooldown          = optional(number)<br><br>    instance_refresh = optional(object({<br>      strategy = string<br>      preferences = optional(object({<br>        min_healthy_percentage = optional(number)<br>      }))<br>    }))<br>  })</pre> | `null` | no |
 | <a name="input_capacity_provider"></a> [capacity\_provider](#input\_capacity\_provider) | Configuration settings for the ECS capacity providers, including the capacity providers used for autoscaling and Fargate. This variable defines the properties of each capacity provider and how they are managed, such as scaling policies and termination protection. | <pre>object({<br>    autoscaling_capacity_providers = map(object({<br>      name                           = optional(string)<br>      auto_scaling_group_arn         = string<br>      managed_termination_protection = optional(string, "DISABLED")<br>      managed_draining               = optional(string, "ENABLED")<br>      managed_scaling = optional(object({<br>        instance_warmup_period    = optional(number)<br>        maximum_scaling_step_size = optional(number)<br>        minimum_scaling_step_size = optional(number)<br>        status                    = optional(string)<br>        target_capacity           = optional(number)<br>      }))<br>      tags = optional(map(string), {})<br>    }))<br>    use_fargate                = bool<br>    fargate_capacity_providers = any<br>  })</pre> | `null` | no |
-| <a name="input_ecs_cluster"></a> [ecs\_cluster](#input\_ecs\_cluster) | The ECS-specific values to use such as cluster, service, and repository names.<br><br>Keys:<br>  - cluster\_name: The name of the ECS cluster.<br>  - cluster\_configuration: The execute command configuration for the cluster.<br>  - cluster\_settings: A list of cluster settings (e.g., container insights). Default is an empty list.<br>  - cluster\_service\_connect\_defaults: Configures a default Service Connect namespace.<br>  - create\_cloudwatch\_log\_group: Boolean flag to specify whether to create a CloudWatch log group for the ECS cluster. | <pre>object({<br>    name           = optional(string)<br>    create_cluster = optional(bool, true)<br>    configuration = optional(object({<br>      execute_command_configuration = optional(object({<br>        kms_key_id = optional(string, "")<br>        logging    = optional(string, "DEFAULT")<br>        log_configuration = optional(object({<br>          cloudwatch_encryption_enabled = optional(bool, null)<br>          log_group_name                = optional(string, null)<br>          log_group_retention_in_days   = optional(number, null)<br>          log_group_kms_key_id          = optional(string, null)<br>          log_group_tags                = optional(map(string), null)<br>          s3_bucket_name                = optional(string, null)<br>          s3_bucket_encryption_enabled  = optional(bool, null)<br>          s3_key_prefix                 = optional(string, null)<br>        }), {})<br>      }), {})<br>    }), {})<br>    create_cloudwatch_log_group = optional(bool, true)<br>    service_connect_defaults    = optional(map(string), null)<br>    settings                    = optional(any, null)<br>    tags                        = optional(map(string), null)<br>  })</pre> | n/a | yes |
+| <a name="input_ecs_cluster"></a> [ecs\_cluster](#input\_ecs\_cluster) | The ECS-specific values to use such as cluster, service, and repository names.<br><br>Keys:<br>  - cluster\_name: The name of the ECS cluster.<br>  - cluster\_configuration: The execute command configuration for the cluster.<br>  - cluster\_settings: A list of cluster settings (e.g., container insights). Default is an empty list.<br>  - cluster\_service\_connect\_defaults: Configures a default Service Connect namespace.<br>  - create\_cloudwatch\_log\_group: Boolean flag to specify whether to create a CloudWatch log group for the ECS cluster. | <pre>object({<br>    name   = optional(string)<br>    create = optional(bool, true)<br>    configuration = optional(object({<br>      execute_command_configuration = optional(object({<br>        kms_key_id = optional(string, "")<br>        logging    = optional(string, "DEFAULT")<br>        log_configuration = optional(object({<br>          cloudwatch_encryption_enabled = optional(bool, null)<br>          log_group_name                = optional(string, null)<br>          log_group_retention_in_days   = optional(number, null)<br>          log_group_kms_key_id          = optional(string, null)<br>          log_group_tags                = optional(map(string), null)<br>          s3_bucket_name                = optional(string, null)<br>          s3_bucket_encryption_enabled  = optional(bool, null)<br>          s3_key_prefix                 = optional(string, null)<br>        }), {})<br>      }), {})<br>    }), {})<br>    create_cloudwatch_log_group = optional(bool, true)<br>    service_connect_defaults    = optional(map(string), null)<br>    settings                    = optional(any, null)<br>    tags                        = optional(map(string), null)<br>  })</pre> | n/a | yes |
 | <a name="input_ecs_cluster_name"></a> [ecs\_cluster\_name](#input\_ecs\_cluster\_name) | Name of the ECS cluster | `string` | `null` | no |
-| <a name="input_ecs_service"></a> [ecs\_service](#input\_ecs\_service) | The ECS-specific values to use such as cluster, service, and repository names. | <pre>object({<br>    cluster_name             = optional(string)<br>    service_name             = optional(string)<br>    repository_name          = optional(string)<br>    enable_load_balancer     = optional(bool, false)<br>    aws_lb_target_group_name = optional(string)<br>    ecs_subnets              = optional(list(string))<br>    create_service           = optional(bool, false)<br>  })</pre> | n/a | yes |
+| <a name="input_ecs_service"></a> [ecs\_service](#input\_ecs\_service) | The ECS-specific values to use such as cluster, service, and repository names. | <pre>object({<br>    cluster_name             = optional(string)<br>    service_name             = optional(string)<br>    repository_name          = optional(string)<br>    enable_load_balancer     = optional(bool, false)<br>    aws_lb_target_group_name = optional(string)<br>    ecs_subnets              = optional(list(string))<br>    create                   = optional(bool, false)<br>  })</pre> | n/a | yes |
 | <a name="input_environment"></a> [environment](#input\_environment) | The environment associated with the ECS service | `string` | `null` | no |
 | <a name="input_launch_template"></a> [launch\_template](#input\_launch\_template) | n/a | <pre>object({<br>    name = string<br>    block_device_mappings = optional(list(object({<br>      device_name = string<br>      ebs = optional(object({<br>        volume_size = number<br>      }))<br>    })), [])<br><br>    cpu_options = optional(object({<br>      core_count       = number<br>      threads_per_core = number<br>    }), null)<br><br>    disable_api_stop        = optional(bool, false)<br>    disable_api_termination = optional(bool, false)<br>    ebs_optimized           = optional(bool, false)<br><br>    elastic_gpu_specifications = optional(list(object({<br>      type = string<br>    })), [])<br><br>    iam_instance_profile = optional(object({<br>      name = string<br>    }), null)<br><br>    image_id                             = optional(string, null)<br>    instance_initiated_shutdown_behavior = optional(string, "stop")<br><br>    instance_type = optional(string, null)<br>    kernel_id     = optional(string, null)<br>    key_name      = optional(string, null)<br><br>    monitoring = optional(object({<br>      enabled = bool<br>    }), null)<br><br>    network_interfaces = optional(list(object({<br>      associate_public_ip_address = optional(bool, null)<br>      ipv4_prefixes               = optional(list(string), [])<br>      ipv6_prefixes               = optional(list(string), [])<br>      ipv4_addresses              = optional(list(string), [])<br>      ipv6_addresses              = optional(list(string), [])<br>      network_interface_id        = optional(string, null)<br>      private_ip_address          = optional(string, null)<br>      security_groups             = optional(list(string), [])<br>      subnet_id                   = optional(string, null)<br>    })), [])<br><br>    placement = optional(object({<br>      availability_zone = string<br>    }), null)<br><br>    vpc_security_group_ids = optional(list(string), [])<br><br>    tag_specifications = optional(list(object({<br>      resource_type = string<br>      tags          = map(string)<br>    })), [])<br><br>    user_data = optional(string, null)<br>  })</pre> | `null` | no |
 | <a name="input_lb_data"></a> [lb\_data](#input\_lb\_data) | ALB-related information (listening port, deletion protection, security group) | <pre>object({<br>    listener_port        = number<br>    deregistration_delay = optional(number)<br>    security_group_id    = optional(string)<br>  })</pre> | `null` | no |

docs/module-usage-guide/README.md

@@ -27,11 +27,33 @@ Before using this module, ensure you have the following:
 To use the module in your Terraform configuration, include the following source block:
 
 ```hcl
+
+##########################################
+## ecs cluster with ec2
+##########################################
 module "arc-ecs" {
   source  = "sourcefuse/arc-ecs/aws"
   version = "1.5.0"
-  # insert the 6 required variables here
+  ecs_cluster       = local.ecs_cluster
+  capacity_provider = local.capacity_provider
+  ecs_service       = local.ecs_service
+  launch_template   = local.launch_template
+  asg               = local.asg
+  tags              = module.tags.tags
+}
+
+##########################################
+## ecs cluster with fargate
+##########################################
+module "ecs_cluster" {
+  source  = "sourcefuse/arc-ecs/aws"
+  version = "1.5.0"
+  ecs_cluster       = local.ecs_cluster
+  capacity_provider = local.capacity_provider
+  ecs_service       = local.ecs_service
+  tags              = module.tags.tags
 }
+
 ```
 
 Refer to the [Terraform Registry](https://registry.terraform.io/modules/sourcefuse/arc-ecs/aws/latest) for the latest version.
@@ -41,7 +63,7 @@ Refer to the [Terraform Registry](https://registry.terraform.io/modules/sourcefu
 Integrate the module with your existing Terraform mono repo configuration, follow the steps below:
 
 1. Create a new folder in `terraform/` named `ecs`.
-2. Create the required files, see the [examples](https://github.com/sourcefuse/terraform-aws-arc-ecs/tree/main/example) to base off of.
+2. Create the required files, see the [examples](https://github.com/sourcefuse/terraform-aws-arc-ecs/tree/main/examples) to base off of.
 3. Configure with your backend
   - Create the environment backend configuration file: `config.<environment>.hcl`
     - **region**: Where the backend resides
@@ -74,7 +96,7 @@ For a list of outputs, see the README [Outputs](https://github.com/sourcefuse/te
 
 ### Basic Usage
 
-For basic usage, see the [example](https://github.com/sourcefuse/terraform-aws-arc-ecs/tree/main/example) folder.
+For basic usage, see the [example](https://github.com/sourcefuse/terraform-aws-arc-ecs/tree/main/examples) folder.
 
 This example will create:
 

examples/ecs-ec2/main.tf

@@ -28,6 +28,10 @@ module "tags" {
   }
 }
 
+################################################################################
+## ecs cluster
+################################################################################
+
 module "ecs_cluster" {
   source = "../../"
 
@@ -39,6 +43,10 @@ module "ecs_cluster" {
   tags              = module.tags.tags
 }
 
+################################################################################
+## ecs services and task
+################################################################################
+
 module "ecs_services" {
   for_each = local.ecs_services
 

examples/ecs-fargate/locals.tf

@@ -3,7 +3,7 @@ locals {
 
   ecs_cluster = {
     name                        = "arc-ecs-fargate-poc"
-    create_cluster              = true
+    create                      = true
     create_cloudwatch_log_group = true
     service_connect_defaults    = {}
     settings                    = []
@@ -28,15 +28,15 @@ locals {
     }
   }
   ecs_service = {
-    create_service = false
+    create = false
   }
 
   ############################### ECS Services ################################
 
   ecs_services = {
     service1 = {
       ecs_cluster = {
-        create_cluster = false
+        create = false
       }
       ecs_service = {
         cluster_name             = "arc-ecs-module-poc-1"
@@ -45,7 +45,7 @@ locals {
         ecs_subnets              = data.aws_subnets.private.ids
         enable_load_balancer     = true
         aws_lb_target_group_name = "arc-poc-alb-tg"
-        create_service           = true
+        create                   = true
       }
 
       task = {
@@ -67,7 +67,7 @@ locals {
 
     service2 = { # FIXED: Changed from duplicate "service1" to "service2"
       ecs_cluster = {
-        create_cluster = false
+        create = false
       }
       ecs_service = {
         cluster_name             = "arc-ecs-module-poc-2"
@@ -76,7 +76,7 @@ locals {
         ecs_subnets              = data.aws_subnets.private.ids
         enable_load_balancer     = true
         aws_lb_target_group_name = "arc-poc-alb-tg"
-        create_service           = true
+        create                   = true
       }
 
       task = {

examples/ecs-fargate/main.tf

@@ -28,6 +28,9 @@ module "tags" {
   }
 }
 
+################################################################################
+## ecs cluster
+################################################################################
 
 module "ecs_cluster" {
   source = "../../"
@@ -38,6 +41,10 @@ module "ecs_cluster" {
   tags              = module.tags.tags
 }
 
+################################################################################
+## ecs services and task
+################################################################################
+
 module "ecs_services" {
   for_each = local.ecs_services
 

main.tf

@@ -4,7 +4,7 @@
 
 module "ecs_cluster" {
   source = "./modules/ecs-cluster"
-  count  = var.ecs_cluster.create_cluster ? 1 : 0
+  count  = var.ecs_cluster.create ? 1 : 0
   ecs_cluster = {
     name                        = var.ecs_cluster.name
     configuration               = var.ecs_cluster.configuration
@@ -29,7 +29,7 @@ module "ecs_cluster" {
 ################################################################################
 
 module "ecs_service" {
-  count  = var.ecs_service.create_service ? 1 : 0
+  count  = var.ecs_service.create ? 1 : 0
   source = "./modules/ecs-service"
 
   vpc_id           = var.vpc_id

variables.tf

@@ -9,8 +9,8 @@ variable "tags" {
 
 variable "ecs_cluster" {
   type = object({
-    name           = optional(string)
-    create_cluster = optional(bool, true)
+    name   = optional(string)
+    create = optional(bool, true)
     configuration = optional(object({
       execute_command_configuration = optional(object({
         kms_key_id = optional(string, "")
@@ -188,7 +188,7 @@ variable "ecs_service" {
     enable_load_balancer     = optional(bool, false)
     aws_lb_target_group_name = optional(string)
     ecs_subnets              = optional(list(string))
-    create_service           = optional(bool, false)
+    create                   = optional(bool, false)
   })
   description = "The ECS-specific values to use such as cluster, service, and repository names."
 }