From 6cce7793651b8215ade706765a53672ff715d2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 24 May 2024 12:01:33 +0200
Subject: [PATCH] fix

---
 apps/sonar/sonar_ConfigMap.tf        | 17 ++++++++---------
 apps/sonar/sonar_Service.tf          | 10 ++++++++++
 share/authentik/authentik_Service.tf |  1 +
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/sonar/sonar_ConfigMap.tf b/apps/sonar/sonar_ConfigMap.tf
index a67d5ed..1012e30 100644
--- a/apps/sonar/sonar_ConfigMap.tf
+++ b/apps/sonar/sonar_ConfigMap.tf
@@ -28,15 +28,14 @@ resource "kubectl_manifest" "cm_files" {
         sonar.telemetry.enable=false
         sonar.updatecenter.activate=false
         sonar.auth.saml.enabled=true
-        sonar.auth.saml.applicationId=
-        sonar.auth.saml.providerName=
-        sonar.auth.saml.providerId=
-        sonar.auth.saml.loginUrl=
-        sonar.auth.saml.certificate.secured=
-        sonar.auth.saml.user.login=
-        sonar.auth.saml.user.name=
-        sonar.auth.saml.user.email=
-        sonar.auth.saml.group.name=
+        sonar.auth.saml.applicationId=${module.saml.app_id}
+        sonar.auth.saml.providerName=vynil
+        sonar.auth.saml.providerId=${module.saml.issuer}
+        sonar.auth.saml.loginUrl=${module.saml.url_sso_init}
+        sonar.auth.saml.certificate.secured=${module.saml.certificate_data}
+        sonar.auth.saml.user.login=windowsaccountname
+        sonar.auth.saml.user.name=name
+        sonar.auth.saml.user.email=emailaddress
 
       prometheus-ce-config.yaml: |-
         rules:
diff --git a/apps/sonar/sonar_Service.tf b/apps/sonar/sonar_Service.tf
index 94124d0..8678b2b 100644
--- a/apps/sonar/sonar_Service.tf
+++ b/apps/sonar/sonar_Service.tf
@@ -41,6 +41,7 @@ module "application" {
   app_group         = var.app_group
   dns_name          = local.dns_name
   icon              = local.icon
+  sub_groups        = ["admin"]
   protocol_provider = module.saml.provider-id
   providers = {
     authentik = authentik
@@ -55,6 +56,15 @@ module "saml" {
   dns_names         = local.dns_names
   namespace         = var.namespace
   labels            = local.common_labels
+  group_mapping     = <<ENDF
+for group in user.ak_groups.all():
+    if group.name == "authentik Admins":
+        yield "admin"
+    elif group.name == "app-${local.app_name}-admin":
+        yield "admin"
+    else:
+        yield group.name
+ENDF
   providers = {
     kubectl = kubectl
     authentik = authentik
diff --git a/share/authentik/authentik_Service.tf b/share/authentik/authentik_Service.tf
index 18580cb..52ff93d 100644
--- a/share/authentik/authentik_Service.tf
+++ b/share/authentik/authentik_Service.tf
@@ -41,6 +41,7 @@ EOF
 }
 
 resource "kubectl_manifest" "Service_server_compat" {
+  depends_on = [kubectl_manifest.Deployment_server]
   yaml_body  = <<-EOF
     apiVersion: v1
     kind: Service