From 50700df0b813027f3d8ac9db18a81e920ac01273 Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Tue, 12 Sep 2023 14:25:06 -0400
Subject: [PATCH] Renamed kiali_hostname to hostname and sso_admin_* to sso_*

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

diff --git a/main.tf b/main.tf
index 69af1a9..9e76dbb 100644
--- a/main.tf
+++ b/main.tf
@@ -5,8 +5,8 @@ locals {
 
   have_keycloak = (
     try(length(var.keycloak_namespace), 0) > 0 &&
-    try(length(var.sso_admin_client_id), 0) > 0 &&
-    try(length(var.sso_admin_client_secret), 0) > 0 &&
+    try(length(var.sso_client_id), 0) > 0 &&
+    try(length(var.sso_client_secret), 0) > 0 &&
     try(length(var.keycloak_public_url), 0) > 0 &&
     try(length(var.keycloak_realm), 0) > 0
   ) ? true : false
@@ -19,7 +19,7 @@ locals {
     )
   : "")
 
-  kiali_oidc_secret = local.have_keycloak ? "ensure_secret kiali oidc-secret \"${var.sso_admin_client_secret}\"" : ";"
+  kiali_oidc_secret = local.have_keycloak ? "ensure_secret kiali oidc-secret \"${var.sso_client_secret}\"" : ";"
 
   preinstall_script = <<CONFIG
 ${local.kiali_oidc_secret}
@@ -124,7 +124,7 @@ resource "helm_release" "kiali" {
 
   set {
     name  = "publicHostname"
-    value = var.kiali_hostname
+    value = var.hostname
   }
   set {
     name  = "publicDomain"
@@ -172,14 +172,14 @@ resource "helm_release" "kiali" {
   #    }
   #  }
   #  dynamic "set" {
-  #    for_each = local.have_keycloak ? [var.sso_admin_client_id] : []
+  #    for_each = local.have_keycloak ? [var.sso_client_id] : []
   #    content {
   #      name  = "openid.clientId"
   #      value = set.value
   #    }
   #  }
   #  dynamic "set" {
-  #    for_each = local.have_keycloak ? [var.sso_admin_client_secret] : []
+  #    for_each = local.have_keycloak ? [var.sso_client_secret] : []
   #    content {
   #      name  = "openid.secret"
   #      value = set.value
@@ -211,8 +211,8 @@ module "kiali_ingress" {
   application_name           = "kiali"
   upstream_url               = local.kiali_internal_url
   redirection_url            = local.kiali_public_url
-  client_id                  = var.sso_admin_client_id
-  client_secret              = var.sso_admin_client_secret
+  client_id                  = var.sso_client_id
+  client_secret              = var.sso_client_secret
   keycloak_public_url        = var.keycloak_public_url
   gogatekeeper_chart_version = var.gogatekeeper_chart_version
   gogatekeeper_registry      = var.gogatekeeper_registry
diff --git a/variables.tf b/variables.tf
index ce47f9e..24aace1 100644
--- a/variables.tf
+++ b/variables.tf
@@ -60,13 +60,13 @@ variable "jaeger_internal_url" {
   description = "The url within the cluster to use to query the jaegertracing."
 }
 
-variable "sso_admin_client_id" {
+variable "sso_client_id" {
   description = "The client id to use for SSO"
   default     = null
 }
 
-variable "sso_admin_client_secret" {
-  description = "The secret associated with the sso_admin_client_id"
+variable "sso_client_secret" {
+  description = "The secret associated with the sso_client_id"
   default     = null
 }
 
@@ -80,7 +80,7 @@ variable "keycloak_realm" {
   default     = null
 }
 
-variable "kiali_hostname" {
+variable "hostname" {
   description = "The hostname to use for the kiali deployment"
   default     = "kiali"
 }