feat: added acm module and new github-action

clouddrove · Jul 20, 2023 · d29f980 · d29f980
1 parent 976e2bd
commit d29f980
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 75 deletions.
diff --git a/_example/alb/example.tf b/_example/alb/example.tf
@@ -30,11 +30,10 @@ module "public_subnets" {
   environment = "test"
   label_order = ["name", "environment"]
 
-
   availability_zones = ["eu-west-1b", "eu-west-1c"]
+  type               = "public"
   vpc_id             = module.vpc.vpc_id
   cidr_block         = module.vpc.vpc_cidr_block
-  type               = "public"
   igw_id             = module.vpc.igw_id
   ipv6_cidr_block    = module.vpc.ipv6_cidr_block
 }
@@ -50,7 +49,6 @@ module "http_https" {
   environment = "test"
   label_order = ["name", "environment"]
 
-
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = ["0.0.0.0/0"]
   allowed_ports = [80, 443]
@@ -85,9 +83,8 @@ module "iam-role" {
   label_order = ["name", "environment"]
 
   assume_role_policy = data.aws_iam_policy_document.default.json
-
-  policy_enabled = true
-  policy         = data.aws_iam_policy_document.iam-policy.json
+  policy_enabled     = true
+  policy             = data.aws_iam_policy_document.iam-policy.json
 }
 
 data "aws_iam_policy_document" "default" {
@@ -125,26 +122,21 @@ module "ec2" {
   environment = "test"
   label_order = ["name", "environment"]
 
-  instance_count = 2
-  ami            = "ami-08d658f84a6d84a80"
-  instance_type  = "t2.nano"
-  monitoring     = true
-  tenancy        = "default"
-
+  instance_count              = 2
+  ami                         = "ami-08d658f84a6d84a80"
+  instance_type               = "t2.nano"
+  monitoring                  = true
+  tenancy                     = "default"
   vpc_security_group_ids_list = [module.ssh.security_group_ids, module.http_https.security_group_ids]
   subnet_ids                  = tolist(module.public_subnets.public_subnet_id)
-
+  iam_instance_profile        = module.iam-role.name
   assign_eip_address          = true
   associate_public_ip_address = true
-
-  instance_profile_enabled = true
-  iam_instance_profile     = module.iam-role.name
-
-
-  ebs_optimized      = false
-  ebs_volume_enabled = true
-  ebs_volume_type    = "gp2"
-  ebs_volume_size    = 30
+  instance_profile_enabled    = true
+  ebs_optimized               = false
+  ebs_volume_enabled          = true
+  ebs_volume_type             = "gp2"
+  ebs_volume_size             = 30
 }
 
 module "acm" {
@@ -176,19 +168,16 @@ module "alb" {
   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
+  listener_certificate_arn   = module.acm.arn
   enable_deletion_protection = false
   with_target_group          = true
-
-  target_id = module.ec2.instance_id
-  vpc_id    = module.vpc.vpc_id
-
-  https_enabled            = true
-  http_enabled             = true
-  https_port               = 443
-  listener_type            = "forward"
-  listener_certificate_arn = module.acm.arn
-  target_group_port        = 80
-
+  https_enabled              = true
+  http_enabled               = true
+  https_port                 = 443
+  listener_type              = "forward"
+  target_group_port          = 80
   target_groups = [
     {
       backend_protocol     = "HTTP"
@@ -208,4 +197,4 @@ module "alb" {
       }
     }
   ]
-}
+}
diff --git a/_example/clb/example.tf b/_example/clb/example.tf
@@ -31,9 +31,9 @@ module "public_subnets" {
   label_order = ["name", "environment"]
 
   availability_zones = ["eu-west-1b", "eu-west-1c"]
+  type               = "public"
   vpc_id             = module.vpc.vpc_id
   cidr_block         = module.vpc.vpc_cidr_block
-  type               = "public"
   igw_id             = module.vpc.igw_id
   ipv6_cidr_block    = module.vpc.ipv6_cidr_block
 }
@@ -83,9 +83,8 @@ module "iam-role" {
   label_order = ["name", "environment"]
 
   assume_role_policy = data.aws_iam_policy_document.default.json
-
-  policy_enabled = true
-  policy         = data.aws_iam_policy_document.iam-policy.json
+  policy_enabled     = true
+  policy             = data.aws_iam_policy_document.iam-policy.json
 }
 
 data "aws_iam_policy_document" "default" {
@@ -123,21 +122,17 @@ module "ec2" {
   environment = "test"
   label_order = ["name", "environment"]
 
-  instance_count = 2
-  ami            = "ami-08d658f84a6d84a80"
-  instance_type  = "t2.nano"
-  monitoring     = false
-  tenancy        = "default"
-
+  instance_count              = 2
+  ami                         = "ami-08d658f84a6d84a80"
+  instance_type               = "t2.nano"
+  monitoring                  = false
+  tenancy                     = "default"
   vpc_security_group_ids_list = [module.ssh.security_group_ids, module.http_https.security_group_ids]
   subnet_ids                  = tolist(module.public_subnets.public_subnet_id)
-
+  iam_instance_profile        = module.iam-role.name
   assign_eip_address          = true
   associate_public_ip_address = true
-
-  instance_profile_enabled = true
-  iam_instance_profile     = module.iam-role.name
-
+  instance_profile_enabled    = true
 
   ebs_optimized      = false
   ebs_volume_enabled = true
@@ -159,8 +154,6 @@ module "clb" {
   security_groups    = [module.ssh.security_group_ids, module.http_https.security_group_ids]
   subnets            = module.public_subnets.public_subnet_id
   with_target_group  = true
-
-
   listeners = [
     {
       lb_port            = 22000
@@ -177,7 +170,6 @@ module "clb" {
       ssl_certificate_id = null
     }
   ]
-
   health_check_target              = "TCP:4444"
   health_check_timeout             = 10
   health_check_interval            = 30

diff --git a/_example/nlb/example.tf b/_example/nlb/example.tf
@@ -31,9 +31,9 @@ module "public_subnets" {
   label_order = ["name", "environment"]
 
   availability_zones = ["eu-west-1b", "eu-west-1c"]
+  type               = "public"
   vpc_id             = module.vpc.vpc_id
   cidr_block         = module.vpc.vpc_cidr_block
-  type               = "public"
   igw_id             = module.vpc.igw_id
   ipv6_cidr_block    = module.vpc.ipv6_cidr_block
 }
@@ -49,7 +49,6 @@ module "http-https" {
   environment = "test"
   label_order = ["name", "environment"]
 
-
   vpc_id        = module.vpc.vpc_id
   allowed_ip    = ["0.0.0.0/0"]
   allowed_ports = [80, 443]
@@ -123,25 +122,21 @@ module "ec2" {
   environment = "test"
   label_order = ["name", "environment"]
 
-  instance_count = 1
-  ami            = "ami-08d658f84a6d84a80"
-  instance_type  = "t2.nano"
-  monitoring     = false
-  tenancy        = "default"
-
+  instance_count              = 1
+  ami                         = "ami-08d658f84a6d84a80"
+  instance_type               = "t2.nano"
+  monitoring                  = false
+  tenancy                     = "default"
   vpc_security_group_ids_list = [module.ssh.security_group_ids, module.http-https.security_group_ids]
   subnet_ids                  = tolist(module.public_subnets.public_subnet_id)
-
+  iam_instance_profile        = module.iam-role.name
   assign_eip_address          = true
   associate_public_ip_address = true
-
-  instance_profile_enabled = true
-  iam_instance_profile     = module.iam-role.name
-
-  ebs_optimized      = false
-  ebs_volume_enabled = true
-  ebs_volume_type    = "gp2"
-  ebs_volume_size    = 30
+  instance_profile_enabled    = true
+  ebs_optimized               = false
+  ebs_volume_enabled          = true
+  ebs_volume_type             = "gp2"
+  ebs_volume_size             = 30
 }
 
 ##-----------------------------------------------------------------------------
@@ -156,21 +151,17 @@ module "nlb" {
   load_balancer_type         = "network"
   instance_count             = module.ec2.instance_count
   subnets                    = module.public_subnets.public_subnet_id
+  target_id                  = module.ec2.instance_id
+  vpc_id                     = module.vpc.vpc_id
   enable_deletion_protection = false
   with_target_group          = true
-
-  target_id = module.ec2.instance_id
-  vpc_id    = module.vpc.vpc_id
-
   http_tcp_listeners = [
     {
       port               = 80
       protocol           = "TCP"
       target_group_index = 0
     },
   ]
-
-
   target_groups = [
     {
       backend_protocol = "TCP"