From ef82598c33c9b228af183522df651dffdb79a65d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 19 Apr 2024 17:16:20 +0200
Subject: [PATCH] =?UTF-8?q?OZG-5400=20add=20log=20f=C3=BCr=20realm=20updat?=
=?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../realm/KeycloakRealmReconciler.java | 2 +-
.../keycloak/realm/KeycloakRealmService.java | 18 +++++++++++++-----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
index 716231c..51bb10b 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
@@ -51,7 +51,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
var realmName = resource.getMetadata().getNamespace();
service.createRealm(resource.getSpec(), realmName);
- service.createOrUpdateRealm(resource.getSpec(), resource.getMetadata().getNamespace());
+ service.createOrUpdateRealm(resource.getSpec(), realmName);
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource);
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 f66eea9..44193ee 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
@@ -30,7 +30,9 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+@Log4j2
@RequiredArgsConstructor
@Component
class KeycloakRealmService {
@@ -56,19 +58,25 @@ class KeycloakRealmService {
}
void updateRealm(RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec) {
- var realmRepresentation = mapper.update(existingRealm, spec);
- remoteService.updateRealm(realmRepresentation);
- //addOrUpdateRealmRoles(spec, existingRealm.getRealm());
- }
+ try {
+ LOG.debug("{}: Updating existing realm...", existingRealm);
+ var realmRepresentation = mapper.update(existingRealm, spec);
+ remoteService.updateRealm(realmRepresentation);
+ } catch (Exception e) {
+ LOG.warn(existingRealm + ": Updating existing realm failed: ", e);
+ throw e;
+
+ }
+ // addOrUpdateRealmRoles(spec, existingRealm.getRealm());
+ }
RealmRepresentation addRealmName(RealmRepresentation realm, String realmName) {
realm.setRealm(realmName);
return realm;
}
-
public void deleteRealm(String realmName) {
remoteService.deleteRealm(realmName);
}
--
GitLab