From 3e9e649c4bdf49b45a2445648df9bd319e91443a Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Fri, 15 Sep 2023 10:30:24 -0400
Subject: [PATCH] Split endpoint information into parts.

---
 main.tf    | 16 ++++++++++++----
 outputs.tf | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/main.tf b/main.tf
index b9282ea..6ffb7d4 100644
--- a/main.tf
+++ b/main.tf
@@ -1,7 +1,12 @@
 
 locals {
-  kiali_public_url   = format("https://kiali.%v/", var.cluster_domain)
-  kiali_internal_url = format("http://kiali.%v.svc.cluster.local:20001/", var.namespace)
+  public_hostname    = format("kiali.%v", var.cluster_domain)
+  public_port_number = "80"
+  public_url         = format("https://%v:%v/", local.public_hostname, local.public_port_number)
+
+  internal_hostname    = format("kiali.%v.svc.cluster.local", var.namespace)
+  internal_port_number = "20001"
+  internal_url         = format("http://%v:%v/", local.internal_hostname, local.internal_port_number)
 
   have_keycloak = (
     try(length(var.keycloak_namespace), 0) > 0 &&
@@ -211,8 +216,11 @@ module "kiali_ingress" {
 
   namespace                  = local.ns
   application_name           = "kiali"
-  upstream_url               = local.kiali_internal_url
-  redirection_url            = local.kiali_public_url
+  public_hostname            = "kiali"
+  cluster_domain             = var.cluster_domain
+  upstream_hostname          = local.internal_hostname
+  upstream_port              = local.internal_port_number
+  redirection_url            = local.public_url
   client_id                  = var.sso_client_id
   client_secret              = var.sso_client_secret
   keycloak_public_url        = var.keycloak_public_url
diff --git a/outputs.tf b/outputs.tf
index 090e8a2..7daf23c 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,8 +1,16 @@
 
-output "public_url" {
-  value = local.kiali_public_url
+output "public" {
+  value = {
+    hostname    = local.public_hostname
+    port_number = local.public_port_number
+    url         = local.public_url
+  }
 }
 
-output "internal_url" {
-  value = local.kiali_internal_url
+output "internal" {
+  value = {
+    hostname    = local.internal_hostname
+    port_number = local.internal_port_number
+    url         = local.internal_url
+  }
 }