From eeaa0678078d5944036be9f4d2758218cb2da0f1 Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Fri, 15 Sep 2023 11:05:40 -0400
Subject: [PATCH] Split endpoint information into parts.

---
 README.md      |  1 +
 copy_images.tf |  2 +-
 main.tf        |  6 +++++-
 outputs.tf     | 20 ++++++++++++--------
 variables.tf   |  6 +++---
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..335e7d7
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# tfmod-keycloak
diff --git a/copy_images.tf b/copy_images.tf
index 1d12b7d..0d6341c 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -1,5 +1,5 @@
 locals {
-  keycloak_key = format("%v#%v", "keycloak", var.keycloak_tag)
+  keycloak_key     = format("%v#%v", "keycloak", var.keycloak_tag)
   gogatekeeper_key = format("%v#%v", "gogatekeeper", var.gogatekeeper_tag)
 
   image_config = [
diff --git a/main.tf b/main.tf
index 54907b8..8c1ac82 100644
--- a/main.tf
+++ b/main.tf
@@ -1,4 +1,8 @@
 locals {
+  public_hostname    = format("%v.%v", var.keycloak_hostname, var.cluster_domain)
+  public_port_number = "80"
+  public_url         = format("https://%v:%v/", local.public_hostname, local.public_port_number)
+
   secrets_job_script = <<SECRETS
 ensure_secret keycloak-db-creds database-password "${var.external_database_password}"
 ensure_secret keycloak-admin-creds keycloak-password $(mkpasswd 32 false)
@@ -56,7 +60,7 @@ module "service-ingress" {
   publicDomain      = var.cluster_domain
   certificateIssuer = var.certificate_issuer
   istioNamespace    = var.istio_namespace
-  serviceName       = "keycloak-http"
+  serviceHostname   = "keycloak-http"
   serviceNamespace  = helm_release.keycloak.namespace
   servicePortNumber = "80"
 }
diff --git a/outputs.tf b/outputs.tf
index 40f2922..1ba44e6 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,30 +1,34 @@
-output "public_url" {
-  description = "The URL to use to retrieve the OpenID configuration"
-  value = format("https://%v.%v/", var.keycloak_hostname, var.cluster_domain)
+output "public_endpoint" {
+  description = "The endpoint to use to access keycloak"
+  value = {
+    hostname    = local.public_hostname
+    port_number = local.public_port_number
+    url         = local.public_url
+  }
 }
 
 output "gogatekeeper_chart_version" {
   description = "The version of the gogatekeeper chart prepared"
-  value = var.gogatekeeper_version
+  value       = var.gogatekeeper_version
 }
 
 output "gogatekeeper_registry" {
   description = "Installed gogatekeeper in this registry"
-  value = module.images.images[local.gogatekeeper_key].dest_registry
+  value       = module.images.images[local.gogatekeeper_key].dest_registry
 }
 
 output "gogatekeeper_repository" {
   description = "Installed gogatekeeper in this repository"
-  value = module.images.images[local.gogatekeeper_key].dest_repository
+  value       = module.images.images[local.gogatekeeper_key].dest_repository
 }
 
 output "gogatekeeper_full_path" {
   description = "Installed gogatekeeper with this full path"
-  value = module.images.images[local.gogatekeeper_key].dest_full_path
+  value       = module.images.images[local.gogatekeeper_key].dest_full_path
 }
 
 output "gogatekeeper_tag" {
   description = "Installed gogatekeeper with this tag"
-  value = module.images.images[local.gogatekeeper_key].tag
+  value       = module.images.images[local.gogatekeeper_key].tag
 }
 
diff --git a/variables.tf b/variables.tf
index 1ca0579..77b5c80 100644
--- a/variables.tf
+++ b/variables.tf
@@ -32,13 +32,13 @@ variable "keycloak_tag" {
 # helm repo add gogatekeeper https://gogatekeeper.github.io/helm-gogatekeeper
 # helm search repo gogatekeeper/gatekeeper
 variable "gogatekeeper_version" {
-   description = "The version of the gogatekeeper helm chart that is the basis for gogatekeeper deployments."
-   default = "0.1.37"
+  description = "The version of the gogatekeeper helm chart that is the basis for gogatekeeper deployments."
+  default     = "0.1.37"
 }
 
 variable "gogatekeeper_tag" {
   description = "The tag associated with the gogatekeeper_version"
-  default = "2.6.2"
+  default     = "2.6.2"
 }
 
 # Keycloak will be accessible at <keycloak_hostname>.<cluster_domain>