Merge pull request #6 from tomarv2/develop

Pulling refs/heads/develop into main

Author: tomarv2

.github/workflows/stale-actions.yml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.64.0
+    rev: v1.76.0
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
@@ -12,14 +12,13 @@ repos:
           - '--args=--only=terraform_documented_outputs'
           - '--args=--only=terraform_documented_variables'
           - '--args=--only=terraform_typed_variables'
-          #- '--args=--only=terraform_module_pinned_source'
           - '--args=--only=terraform_naming_convention'
           - '--args=--only=terraform_required_providers'
           - '--args=--only=terraform_standard_module_structure'
           - '--args=--only=terraform_workspace_remote'
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -31,7 +30,7 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: '2.0.914'
+    rev: '2.1.280'
     hooks:
     - id: checkov
       verbose: true

.pre-commit-config.yaml

@@ -18,7 +18,7 @@
 ### Versions
 
 - Module tested for Terraform 1.0.1.
-- AWS provider version [3.74](https://registry.terraform.io/providers/hashicorp/aws/latest)
+- AWS provider version [4.35](https://registry.terraform.io/providers/hashicorp/aws/latest)
 - `main` branch: Provider versions not pinned to keep up with Terraform releases.
 - `tags` releases: Tags are pinned with versions (use <a href="https://github.com/tomarv2/terraform-aws-target-group/tags" alt="GitHub tag">
         <img src="https://img.shields.io/github/v/tag/tomarv2/terraform-aws-target-group" /></a> ).
@@ -114,13 +114,13 @@ Please refer to examples directory [link](examples) for references.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.74 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.35 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.74 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.35 |
 
 ## Modules
 
@@ -140,24 +140,14 @@ Please refer to examples directory [link](examples) for references.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_deploy_target_group"></a> [deploy\_target\_group](#input\_deploy\_target\_group) | Feature flag, true or false | `bool` | `true` | no |
-| <a name="input_deregistration_delay"></a> [deregistration\_delay](#input\_deregistration\_delay) | deregistration delay | `string` | `"300"` | no |
-| <a name="input_healthcheck_interval"></a> [healthcheck\_interval](#input\_healthcheck\_interval) | health check interval | `string` | `""` | no |
-| <a name="input_healthcheck_matcher"></a> [healthcheck\_matcher](#input\_healthcheck\_matcher) | healthcheck matcher (e.g. 200) | `string` | `""` | no |
-| <a name="input_healthcheck_path"></a> [healthcheck\_path](#input\_healthcheck\_path) | target group health check path | `string` | `""` | no |
-| <a name="input_healthcheck_timeout"></a> [healthcheck\_timeout](#input\_healthcheck\_timeout) | health check timeout | `string` | `""` | no |
-| <a name="input_healthy_threshold"></a> [healthy\_threshold](#input\_healthy\_threshold) | target group health check threshold | `string` | `""` | no |
-| <a name="input_lb_port"></a> [lb\_port](#input\_lb\_port) | load balancer port | `list(any)` | <pre>[<br>  80<br>]</pre> | no |
-| <a name="input_lb_protocol"></a> [lb\_protocol](#input\_lb\_protocol) | load balancer protocol | `string` | `"HTTP"` | no |
-| <a name="input_prjid"></a> [prjid](#input\_prjid) | Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply' | `string` | n/a | yes |
-| <a name="input_stickiness"></a> [stickiness](#input\_stickiness) | Target group sticky configuration | <pre>object({<br>    cookie_duration = number<br>    enabled         = bool<br>  })</pre> | `null` | no |
-| <a name="input_target_type"></a> [target\_type](#input\_target\_type) | target type | `string` | `"instance"` | no |
-| <a name="input_teamid"></a> [teamid](#input\_teamid) | Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply' | `string` | n/a | yes |
-| <a name="input_unhealthy_threshold"></a> [unhealthy\_threshold](#input\_unhealthy\_threshold) | target group unhealthy health check threshold | `string` | `""` | no |
+| <a name="input_config"></a> [config](#input\_config) | Target groups configuration | `map(any)` | `{}` | no |
+| <a name="input_extra_tags"></a> [extra\_tags](#input\_extra\_tags) | Additional tags to associate | `map(string)` | `{}` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| <a name="output_target_group_arn"></a> [target\_group\_arn](#output\_target\_group\_arn) | Target group arn |
+| <a name="output_arn"></a> [arn](#output\_arn) | Target group ARN |
+| <a name="output_config"></a> [config](#output\_config) | Target group configuration |
+| <a name="output_port"></a> [port](#output\_port) | Target group port |
 <!-- END_TF_DOCS -->

README.md

@@ -0,0 +1,41 @@
+terraform {
+  required_version = ">= 1.0.1"
+  required_providers {
+    aws = {
+      version = "~> 4.35"
+    }
+  }
+}
+
+provider "aws" {
+  region = var.region
+}
+
+module "target_group" {
+  source = "../"
+
+  config = {
+    demotg = {
+      protocol             = "HTTP"
+      port                 = 80
+      healthcheck_path     = "/"
+      healthy_threshold    = "2"
+      healthcheck_matcher  = "200"
+      healthcheck_timeout  = "15"
+      unhealthy_threshold  = "3"
+      healthcheck_interval = "30"
+    }
+    demotg1 = {
+      protocol             = "HTTP"
+      port                 = 80
+      healthcheck_path     = "/"
+      healthy_threshold    = "2"
+      healthcheck_matcher  = "200"
+      healthcheck_timeout  = "15"
+      unhealthy_threshold  = "3"
+      healthcheck_interval = "30"
+    }
+  }
+  teamid = var.teamid
+  prjid  = var.prjid
+}

examples/main.tf

@@ -0,0 +1,4 @@
+output "target_group_arn" {
+  description = "Target group ARN"
+  value       = module.target_group.arn
+}

examples/outputs.tf

@@ -1,11 +1,13 @@
 variable "teamid" {
   description = "Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
   type        = string
+  default     = "demo"
 }
 
 variable "prjid" {
   description = "Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
   type        = string
+  default     = "project"
 }
 
 variable "region" {

examples/sample/main.tf

@@ -1,35 +1,30 @@
-# target group
-# https://github.com/cloudposse/terraform-aws-alb-ingress/issues/24
 resource "aws_lb_target_group" "target_group" {
-  count = var.deploy_target_group != false ? length(var.lb_port) : 0
+  for_each = var.config
 
-
-  name     = "${var.teamid}-${var.prjid}-${var.lb_port[count.index]}"
-  port     = element(var.lb_port, count.index)
-  protocol = var.lb_protocol
-
-  vpc_id = module.global.vpc[local.account_id][local.region]
-  tags   = merge(local.shared_tags)
-
-  deregistration_delay = var.deregistration_delay
-  target_type          = var.target_type
+  name                 = each.key
+  port                 = each.value.port
+  protocol             = each.value.protocol
+  vpc_id               = try(each.value.vpc_id, module.global.vpc[local.account_id][local.region])
+  tags                 = merge(local.shared_tags, var.extra_tags)
+  deregistration_delay = try(each.value.deregistration_delay, "300")
+  target_type          = try(each.value.target_type, "instance")
 
   health_check {
-    interval            = var.healthcheck_interval == "" ? null : var.healthcheck_interval
-    path                = var.healthcheck_path == "" ? null : var.healthcheck_path
-    healthy_threshold   = var.healthy_threshold == "" ? null : var.healthy_threshold
-    unhealthy_threshold = var.unhealthy_threshold == "" ? null : var.unhealthy_threshold
-    timeout             = var.healthcheck_timeout == "" ? null : var.healthcheck_timeout
-    protocol            = var.lb_protocol == "" ? null : var.lb_protocol
-    matcher             = var.healthcheck_matcher == "" ? null : var.healthcheck_matcher
+    interval            = try(each.value.healthcheck_interval, null)
+    path                = try(each.value.healthcheck_path, null)
+    healthy_threshold   = try(each.value.healthy_threshold, null)
+    unhealthy_threshold = try(each.value.unhealthy_threshold, null)
+    timeout             = try(each.value.healthcheck_timeout, null)
+    protocol            = try(each.value.lb_protoco, null)
+    matcher             = try(each.value.healthcheck_matcher, null)
   }
 
   dynamic "stickiness" {
-    for_each = var.stickiness == null ? [] : [var.stickiness]
+    for_each = try(each.value.stickiness, null) == null ? [] : [each.value.stickiness]
     content {
       type            = "lb_cookie"
       cookie_duration = stickiness.value.cookie_duration
-      enabled         = var.lb_protocol == "TCP" ? false : stickiness.value.enabled
+      enabled         = try(each.value.protocol, null) == "TCP" ? false : stickiness.value.enabled
     }
   }
 }

examples/sample/outputs.tf

@@ -1,4 +1,13 @@
-output "target_group_arn" {
-  description = "Target group arn"
-  value       = aws_lb_target_group.target_group.*.arn
+output "arn" {
+  description = "Target group ARN"
+  value       = [for target_group in aws_lb_target_group.target_group : target_group.arn]
 }
+
+output "port" {
+  description = "Target group port"
+  value       = [for target_group in aws_lb_target_group.target_group : target_group.port]
+}
+output "config" {
+  description = "Target group configuration"
+  value       = aws_lb_target_group.target_group
+}