From 95dc59a987738e099421471a86d7b09b635c6ad3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 11 Sep 2024 10:26:42 +0200
Subject: [PATCH] OZG-6495 addOrUpdateRole also by realm creation
---
.../keycloak/realm/KeycloakRealmService.java | 2 +-
.../keycloak/realm/KeycloakRealmServiceTest.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
index 1ebad4e..22c2c78 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
@@ -55,6 +55,7 @@ class KeycloakRealmService {
keycloakGenericRemoteService.getRealmRepresentation(realmName)
.ifPresentOrElse(existingRealm -> updateRealm(existingRealm, realm),
() -> createRealm(realm, realmName));
+ addOrUpdateRealmRoles(realm, realmName);
}
void updateRealm(RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec) {
@@ -67,7 +68,6 @@ class KeycloakRealmService {
LOG.warn(existingRealm + ": Updating existing realm failed: ", e);
throw e;
}
- addOrUpdateRealmRoles(spec, existingRealm.getRealm());
}
diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
index 872e9bb..044c9f8 100644
--- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
+++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
@@ -92,6 +92,13 @@ class KeycloakRealmServiceTest {
verify(keycloakGenericRemoteService).getRealmRepresentation(REALM_NAME);
}
+ @Test
+ void shouldCallAddOrUpdateRealmRoles() {
+ service.createOrUpdateRealm(REALM, REALM_NAME);
+
+ verify(service).addOrUpdateRealmRoles(REALM, REALM_NAME);
+ }
+
}
@DisplayName("Update Realm")
@@ -118,13 +125,6 @@ class KeycloakRealmServiceTest {
verify(mapper).update(realmRepresentation, REALM);
}
- @Test
- void shouldCallAddOrUpdateRealmRoles() {
-
- service.updateRealm(realmRepresentation, REALM);
-
- verify(service).addOrUpdateRealmRoles(REALM, realmRepresentation.getRealm());
- }
}
--
GitLab