Merge pull request #44 from clouddrove/issue-244

fix: update main.tf, version.tf and github action and add locals in e…

.editorconfig

@@ -0,0 +1,30 @@
+# EditorConfig is awesome: http://EditorConfig.org
+# Uses editorconfig to maintain consistent coding styles
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[*.{tf,tfvars}]
+indent_size = 2
+indent_style = space
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[Makefile]
+tab_width = 2
+indent_style = tab
+
+[COMMIT_EDITMSG]
+max_line_length = 0

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # These owners will be the default owners for everything in the repo.
-*    @anmolnagpal @clouddrove/approvers @clouddrove-ci
+*       @anmolnagpal @clouddrove/approvers @clouddrove-ci

.github/workflows/auto_assignee.yml

@@ -1,14 +1,12 @@
 name: Auto Assign PRs
-
 on:
   pull_request:
     types: [opened, reopened]
-
   workflow_dispatch:
 jobs:
   assignee:
     uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
     with:
-      assignees: 'clouddrove-ci'
+      assignees: 'clouddrove-ci'

.github/workflows/readme.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - master
-
 jobs:
   readme:
     name: 'readme-create'
@@ -25,6 +24,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
       - name: 'pre-commit check errors'
         uses: pre-commit/[email protected]
         continue-on-error: true

.github/workflows/tflint.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
-  tflint:
-    uses: clouddrove/test-tfsec/.github/workflows/tflint.yaml@master
+  tf-lint:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
     secrets:
       GITHUB: ${{ secrets.GITHUB }}

.github/workflows/tfsec.yml

@@ -8,4 +8,4 @@ jobs:
     uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
     secrets: inherit
     with:
-      working_directory: '.'
+      working_directory: '.'

README.yaml

@@ -25,6 +25,9 @@ badges:
     image: "https://img.shields.io/badge/License-APACHE-blue.svg"
     url: "LICENSE.md"
 
+prerequesties:
+  - name: Terraform 1.5.3
+    url: https://learn.hashicorp.com/terraform/getting-started/install.html
 #  description of this project
 description: |-
   This terraform module is used to create ALB on AWS.
@@ -41,15 +44,16 @@ usage : |-
     module "alb" {
       source                     = "clouddrove/alb/aws"
       version                    = "1.4.0"
-      name                       = "alb"
+      name                       = local.name
       enable                     = true
       internal                   = true
       load_balancer_type         = "application"
       instance_count             = module.ec2.instance_count
-      security_groups            = [module.ssh.security_group_ids, module.http_https.security_group_ids]
       subnets                    = module.public_subnets.public_subnet_id
       target_id                  = module.ec2.instance_id
       vpc_id                     = module.vpc.vpc_id
+      allowed_ip                 = [module.vpc.vpc_cidr_block]
+      allowed_ports              = [3306]
       listener_certificate_arn   = module.acm.arn
       enable_deletion_protection = false
       with_target_group          = true
@@ -58,6 +62,34 @@ usage : |-
       https_port                 = 443
       listener_type              = "forward"
       target_group_port          = 80
+
+      http_tcp_listeners = [
+        {
+          port               = 80
+          protocol           = "TCP"
+          target_group_index = 0
+        },
+        {
+          port               = 81
+          protocol           = "TCP"
+          target_group_index = 0
+        },
+      ]
+      https_listeners = [
+        {
+          port               = 443
+          protocol           = "TLS"
+          target_group_index = 0
+          certificate_arn    = module.acm.arn
+        },
+        {
+          port               = 84
+          protocol           = "TLS"
+          target_group_index = 0
+          certificate_arn    = module.acm.arn
+        },
+      ]
+
       target_groups = [
         {
           backend_protocol     = "HTTP"
@@ -77,17 +109,24 @@ usage : |-
           }
         }
       ]
-    }
+
+      extra_ssl_certs = [
+        {
+          https_listener_index = 0
+          certificate_arn      = module.acm.arn
+        }
+      ]
+      }
   ```
 
   ### NLB Example
   ```hcl
     module "nlb" {
       source                     = "clouddrove/alb/aws"
       version                    = "1.4.0"
-      name                       = "nlb"
+      name                       = local.name
       enable                     = true
-      internal                   = true
+      internal                   = false
       load_balancer_type         = "network"
       instance_count             = module.ec2.instance_count
       subnets                    = module.public_subnets.public_subnet_id
@@ -101,6 +140,11 @@ usage : |-
           protocol           = "TCP"
           target_group_index = 0
         },
+        {
+          port               = 81
+          protocol           = "TCP"
+          target_group_index = 0
+        },
       ]
       target_groups = [
         {
@@ -109,11 +153,26 @@ usage : |-
           target_type      = "instance"
         },
         {
-          backend_protocol = "TLS"
-          backend_port     = 443
+          backend_protocol = "TCP"
+          backend_port     = 81
           target_type      = "instance"
         },
       ]
+
+      https_listeners = [
+        {
+          port               = 443
+          protocol           = "TLS"
+          target_group_index = 0
+          certificate_arn    = module.acm.arn
+        },
+        {
+          port               = 84
+          protocol           = "TLS"
+          target_group_index = 0
+          certificate_arn    = module.acm.arn
+        },
+      ]
     }
   ```
 
@@ -122,34 +181,35 @@ usage : |-
     module "clb" {
     source                     = "clouddrove/alb/aws"
     version                    = "1.4.0"
-    name                       = "clb"
-    load_balancer_type         = "classic"
-    clb_enable                 = true
-    internal                   = true
-    target_id                  = module.ec2.instance_id
-    security_groups            = [module.ssh.security_group_ids, module.http_https.security_group_ids]
-    subnets                    = module.public_subnets.public_subnet_id
-    with_target_group          = true
+
+    name               = local.name
+    load_balancer_type = "classic"
+    clb_enable         = true
+    internal           = true
+    vpc_id             = module.vpc.vpc_id
+    target_id          = module.ec2.instance_id
+    subnets            = module.public_subnets.public_subnet_id
+    with_target_group  = true
     listeners = [
       {
-        lb_port               = 22000
-        lb_protocol           = "TCP"
-        instance_port         = 22000
-        instance_protocol     = "TCP"
-        ssl_certificate_id    = null
+        lb_port            = 22000
+        lb_protocol        = "TCP"
+        instance_port      = 22000
+        instance_protocol  = "TCP"
+        ssl_certificate_id = null
       },
       {
-        lb_port              = 4444
-        lb_protocol          = "TCP"
-        instance_port        = 4444
-        instance_protocol    = "TCP"
-        ssl_certificate_id   = null
+        lb_port            = 4444
+        lb_protocol        = "TCP"
+        instance_port      = 4444
+        instance_protocol  = "TCP"
+        ssl_certificate_id = null
       }
     ]
     health_check_target              = "TCP:4444"
     health_check_timeout             = 10
     health_check_interval            = 30
     health_check_unhealthy_threshold = 5
     health_check_healthy_threshold   = 5
-   }
+    }
   ```