From cfab2eb98369c0df15e333a8ac5904bb5aec613e Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 29 Dec 2025 18:43:25 -0300 Subject: [PATCH 1/9] Null-trying --- operations/deployment/terraform/aws/bitovi_main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 89d3572e9..3bc77d545 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -820,10 +820,10 @@ locals { alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null vm_url_candidates = [ - try(module.aws_route53[0].vm_url, null), + try(try(module.aws_route53[0].vm_url, null), local.alb_url, local.elb_url, - local.ec2_endpoint + local.ec2_endpoint,null) ] vm_url_first_nonempty = [for url in local.vm_url_candidates : url if url != null && url != ""][0] } From 3dc9d8023a26b0c2e71ee46ffbb2b98df7f2ecfb Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 29 Dec 2025 21:53:31 -0300 Subject: [PATCH 2/9] Fixing outputs --- operations/deployment/terraform/aws/bitovi_main.tf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 3bc77d545..ce280e12a 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -821,9 +821,9 @@ locals { vm_url_candidates = [ try(try(module.aws_route53[0].vm_url, null), - local.alb_url, - local.elb_url, - local.ec2_endpoint,null) + local.alb_url, + local.elb_url, + local.ec2_endpoint, null) ] vm_url_first_nonempty = [for url in local.vm_url_candidates : url if url != null && url != ""][0] } @@ -883,7 +883,8 @@ output "application_public_dns" { } output "vm_url" { - value = local.vm_url_first_nonempty + description = "Will print the best available URL for the VM, ALB, ELB or EC2 instance" + value = try(local.vm_url_first_nonempty, null) } # EFS From 195151e937d633c03a4abdae600713c507fe3f17 Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 29 Dec 2025 21:58:45 -0300 Subject: [PATCH 3/9] Fix vm_url_first_nonempty --- operations/deployment/terraform/aws/bitovi_main.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index ce280e12a..0e43fccda 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -825,8 +825,9 @@ locals { local.elb_url, local.ec2_endpoint, null) ] - vm_url_first_nonempty = [for url in local.vm_url_candidates : url if url != null && url != ""][0] + vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null } + # VPC output "aws_vpc_id" { value = module.vpc.aws_selected_vpc_id From e4c41e3a8384c6c3a0b1ecb922784fc431f9019e Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 29 Dec 2025 22:05:12 -0300 Subject: [PATCH 4/9] Fixing vm_url conditional --- .../deployment/terraform/aws/bitovi_main.tf | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 0e43fccda..23cc08c90 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -816,16 +816,12 @@ locals { ec2_public_endpoint = var.aws_ec2_instance_create ? (module.ec2[0].instance_public_dns != null ? module.ec2[0].instance_public_dns : module.ec2[0].instance_public_ip) : null ec2_private_endpoint = var.aws_ec2_instance_create ? (module.ec2[0].instance_private_dns != null ? module.ec2[0].instance_private_dns : module.ec2[0].instance_private_ip) : null ec2_endpoint = var.aws_ec2_instance_create ? (local.ec2_public_endpoint != null ? "${local.protocol}${local.ec2_public_endpoint}" : "${local.protocol}${local.ec2_private_endpoint}") : null - elb_url = try(module.aws_elb[0].aws_elb_dns_name, null) != null ? "${local.protocol}${module.aws_elb[0].aws_elb_dns_name}" : null - alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null - - vm_url_candidates = [ - try(try(module.aws_route53[0].vm_url, null), - local.alb_url, - local.elb_url, - local.ec2_endpoint, null) + elb_url = try(module.aws_elb[0].aws_elb_dns_name, null) != null && try(module.aws_elb[0].aws_elb_dns_name, null) != "" ? "${local.protocol}${module.aws_elb[0].aws_elb_dns_name}" : null + alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null && try(module.aws_lb[0].aws_alb_dns_name, null) != "" ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null + + vm_url = [ + try(module.aws_route53[0].vm_url, local.alb_url, local.elb_url, local.ec2_endpoint, null) ] - vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null } # VPC @@ -885,7 +881,7 @@ output "application_public_dns" { output "vm_url" { description = "Will print the best available URL for the VM, ALB, ELB or EC2 instance" - value = try(local.vm_url_first_nonempty, null) + value = try(local.vm_url, null) } # EFS From 92107c9cfb7a28bf025381127e721947eb2f0144 Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Tue, 30 Dec 2025 00:05:44 -0300 Subject: [PATCH 5/9] Go back --- operations/deployment/terraform/aws/bitovi_main.tf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 23cc08c90..1313d0607 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -816,12 +816,13 @@ locals { ec2_public_endpoint = var.aws_ec2_instance_create ? (module.ec2[0].instance_public_dns != null ? module.ec2[0].instance_public_dns : module.ec2[0].instance_public_ip) : null ec2_private_endpoint = var.aws_ec2_instance_create ? (module.ec2[0].instance_private_dns != null ? module.ec2[0].instance_private_dns : module.ec2[0].instance_private_ip) : null ec2_endpoint = var.aws_ec2_instance_create ? (local.ec2_public_endpoint != null ? "${local.protocol}${local.ec2_public_endpoint}" : "${local.protocol}${local.ec2_private_endpoint}") : null - elb_url = try(module.aws_elb[0].aws_elb_dns_name, null) != null && try(module.aws_elb[0].aws_elb_dns_name, null) != "" ? "${local.protocol}${module.aws_elb[0].aws_elb_dns_name}" : null - alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null && try(module.aws_lb[0].aws_alb_dns_name, null) != "" ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null + elb_url = try(module.aws_elb[0].aws_elb_dns_name, null) != null ? "${local.protocol}${module.aws_elb[0].aws_elb_dns_name}" : null + alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null - vm_url = [ + vm_url_candidates = [ try(module.aws_route53[0].vm_url, local.alb_url, local.elb_url, local.ec2_endpoint, null) ] + vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null } # VPC @@ -881,7 +882,7 @@ output "application_public_dns" { output "vm_url" { description = "Will print the best available URL for the VM, ALB, ELB or EC2 instance" - value = try(local.vm_url, null) + value = try(local.vm_url_first_nonempty, null) } # EFS From 5d39268eae9a5a7a156cac4541448a901be09321 Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Tue, 30 Dec 2025 00:09:09 -0300 Subject: [PATCH 6/9] Back 2 --- operations/deployment/terraform/aws/bitovi_main.tf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 1313d0607..736ed4aca 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -820,11 +820,13 @@ locals { alb_url = try(module.aws_lb[0].aws_alb_dns_name, null) != null ? "${local.protocol}${module.aws_lb[0].aws_alb_dns_name}" : null vm_url_candidates = [ - try(module.aws_route53[0].vm_url, local.alb_url, local.elb_url, local.ec2_endpoint, null) + try(try(module.aws_route53[0].vm_url, null), + local.alb_url, + local.elb_url, + local.ec2_endpoint, null) ] - vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null + vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null } - # VPC output "aws_vpc_id" { value = module.vpc.aws_selected_vpc_id From 4eb277e3e82a770eca4227eb3f9319736ed8203b Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Tue, 30 Dec 2025 00:35:53 -0300 Subject: [PATCH 7/9] Test #2 --- operations/deployment/terraform/aws/bitovi_main.tf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 736ed4aca..1f84b7b09 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -825,8 +825,13 @@ locals { local.elb_url, local.ec2_endpoint, null) ] - vm_url_first_nonempty = length(local.vm_url_candidates) > 0 ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] : null + vm_url_first_nonempty = ( + length([for url in local.vm_url_candidates : url if url != null && url != ""]) > 0 + ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] + : null + ) } + # VPC output "aws_vpc_id" { value = module.vpc.aws_selected_vpc_id From eacd5cd7c753f56f778354cac103306e961852cc Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 5 Jan 2026 07:07:02 -0300 Subject: [PATCH 8/9] Rollback aws_acm_certificates each.value --- .../terraform/modules/aws/certificates/aws_certificates.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf b/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf index 86d51aa87..fc6792e65 100644 --- a/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf +++ b/operations/deployment/terraform/modules/aws/certificates/aws_certificates.tf @@ -10,7 +10,7 @@ data "aws_acm_certificate" "issued" { "wildcard" = "*.${var.aws_r53_domain_name}", "sub" = "${var.aws_r53_sub_domain_name}.${var.aws_r53_domain_name}" } : {} - domain = each.value + domain = var.aws_r53_domain_name } # This block will create and validate the root domain and www cert From 13c2ad715befd61a431f19d4cfd8fbce4150ca1c Mon Sep 17 00:00:00 2001 From: LeoDiazL Date: Mon, 5 Jan 2026 08:24:03 -0300 Subject: [PATCH 9/9] Format fix --- operations/deployment/terraform/aws/bitovi_main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operations/deployment/terraform/aws/bitovi_main.tf b/operations/deployment/terraform/aws/bitovi_main.tf index 1f84b7b09..cdbf2b846 100644 --- a/operations/deployment/terraform/aws/bitovi_main.tf +++ b/operations/deployment/terraform/aws/bitovi_main.tf @@ -827,8 +827,8 @@ locals { ] vm_url_first_nonempty = ( length([for url in local.vm_url_candidates : url if url != null && url != ""]) > 0 - ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] - : null + ? [for url in local.vm_url_candidates : url if url != null && url != ""][0] + : null ) }