shotcut cert var

Author: LeoDiazL

operations/deployment/terraform/aws/bitovi_main.tf

@@ -177,12 +177,13 @@ module "aws_lb" {
   aws_r53_domain_name     = var.aws_r53_domain_name
   # Certs
   #aws_certificates_selected_arn = var.aws_r53_enable_cert && var.aws_r53_domain_name != "" ? module.aws_certificates[0].selected_arn : ""
+  aws_certificate_enabled       = var.aws_r53_enable_cert && length(module.aws_certificates) > 0 ? true : false
   aws_certificates_selected_arn = try(module.aws_certificates[0].selected_arn, "")
   # Others
   aws_resource_identifier            = var.aws_resource_identifier
   aws_resource_identifier_supershort = var.aws_resource_identifier_supershort
   # Module dependencies
-  depends_on = [module.vpc, module.ec2, module.aws_certificates]
+  #depends_on = [module.vpc, module.ec2, module.aws_certificates]
 
   providers = {
     aws = aws.lb

operations/deployment/terraform/modules/aws/lb/aws_lb.tf

@@ -148,7 +148,7 @@ resource "aws_alb_listener" "lb_listener" {
 }
 
 resource "aws_alb_listener" "http_redirect" {
-  count             = var.aws_alb_redirect_enable && var.aws_certificates_selected_arn != "" ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
+  count             = var.aws_alb_redirect_enable && var.aws_certificate_enabled ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -169,7 +169,7 @@ resource "aws_alb_listener" "http_redirect" {
 }
 
 resource "aws_alb_listener" "http_forward" {
-  count             = var.aws_alb_redirect_enable && !var.aws_alb_www_to_apex_redirect && var.aws_certificates_selected_arn == "" ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
+  count             = var.aws_alb_redirect_enable && !var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -185,7 +185,7 @@ resource "aws_alb_listener" "http_forward" {
 }
 
 resource "aws_alb_listener" "http_www_redirect" {
-  count             = var.aws_alb_redirect_enable && var.aws_alb_www_to_apex_redirect && var.aws_certificates_selected_arn == "" ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
+  count             = var.aws_alb_redirect_enable && var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "80"
   protocol          = "HTTP"
@@ -269,7 +269,7 @@ resource "aws_security_group_rule" "incoming_alb_https" {
 ###
 
 resource "aws_alb_listener" "https_redirect" {
-  count             = var.aws_alb_redirect_enable && var.aws_certificates_selected_arn == "" ? 1 : 0 #!contains(local.alb_listen_port, 443) ? 1 : 0 : 0
+  count             = var.aws_alb_redirect_enable && var.aws_certificate_enabled ? 1 : 0 #!contains(local.alb_listen_port, 443) ? 1 : 0 : 0
   load_balancer_arn = aws_lb.vm_alb.arn
   port              = "443"
   protocol          = "HTTPS"

operations/deployment/terraform/modules/aws/lb/aws_lb_vars.tf

@@ -18,6 +18,7 @@ variable "aws_alb_access_log_expire" {}
 variable "aws_vpc_selected_id" {}
 variable "aws_vpc_subnet_selected" {}
 variable "aws_instance_server_id" {}
+variable "aws_certificate_enabled" {}
 variable "aws_certificates_selected_arn" {}
 variable "aws_alb_target_sg_id" {}
 variable "aws_r53_domain_name" {}