From 4ea951c55bbdcc79af43729a0d78db2a76c5f7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 24 May 2024 13:51:04 +0200
Subject: [PATCH] fix

---
 apps/sonar/sonar_ConfigMap.tf | 2 +-
 apps/sonar/sonar_Service.tf   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/sonar/sonar_ConfigMap.tf b/apps/sonar/sonar_ConfigMap.tf
index 64756ec..3e3c150 100644
--- a/apps/sonar/sonar_ConfigMap.tf
+++ b/apps/sonar/sonar_ConfigMap.tf
@@ -38,7 +38,7 @@ resource "kubectl_manifest" "cm_files" {
         sonar.auth.saml.applicationId=${module.saml.app_id}
         sonar.auth.saml.providerName=vynil
         sonar.auth.saml.providerId=${module.saml.issuer}
-        sonar.auth.saml.loginUrl=https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/saml/${local.app_name}/sso/binding/init/
+        sonar.auth.saml.loginUrl=https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/saml/${var.component}-${var.instance}/sso/binding/init/
         sonar.auth.saml.certificate.secured=${join("",[for line in split("\n",module.saml.certificate_data): line if !endswith(line, "CERTIFICATE-----")])}
         sonar.auth.saml.user.login=windowsaccountname
         sonar.auth.saml.user.name=name
diff --git a/apps/sonar/sonar_Service.tf b/apps/sonar/sonar_Service.tf
index c7a0ed8..6e932d5 100644
--- a/apps/sonar/sonar_Service.tf
+++ b/apps/sonar/sonar_Service.tf
@@ -1,8 +1,8 @@
 locals {
-  dns_name = "${var.sub_domain}.${var.domain_name}"
+  dns_name  = "${var.sub_domain}.${var.domain_name}"
   dns_names = [local.dns_name]
-  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
-  icon              = "icon.svg"
+  app_name  = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
+  icon      = "icon.svg"
 }
 
 module "service" {