diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java index 7236835b9b90e126464ec89168103eba64aa764e..ec462ec0cb86c1d550d7b90176c87eb0cade5e99 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java @@ -50,7 +50,8 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea @Override public UpdateControl<OzgKeycloakUser> reconcile(OzgKeycloakUser resource, Context<OzgKeycloakUser> context) { - log.info("User reconciler reconcile, keep after delete is set to: " + resource.getSpec().isKeepAfterDelete()); + log.info("User reconciler reconcile, keep after delete is set to: " + resource.getSpec().getKeycloakUser().isKeepAfterDelete()); + log.info("Keep after delete String is set to: " + resource.getSpec().getKeepAfterDelete()); var userName = resource.getMetadata().getName(); var namespace = resource.getMetadata().getNamespace(); @@ -89,8 +90,9 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea @Override public DeleteControl cleanup(OzgKeycloakUser user, Context<OzgKeycloakUser> context) { - log.info("User reconciler cleanup, keep after delete is set to: " + user.getSpec().isKeepAfterDelete()); - if (user.getSpec().isKeepAfterDelete()) { + log.info("User reconciler cleanup, keep after delete is set to: " + user.getSpec().getKeycloakUser().isKeepAfterDelete()); + log.info("Keep after delete String is set to: " + user.getSpec().getKeepAfterDelete()); + if (user.getSpec().getKeycloakUser().isKeepAfterDelete()) { return DeleteControl.defaultDelete(); } return cleanup(user); diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java index 6772217abd978ab14a9c9fb1c222772b47b167a7..06d67cadb9de6b9810078da6f483a9fe6a14cc0f 100644 --- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java +++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java @@ -46,7 +46,7 @@ import lombok.Setter; class OzgKeycloakUserSpec { @JsonProperty("keep_after_delete") - private boolean keepAfterDelete; + private String keepAfterDelete; @JsonProperty("keycloak_user") private KeycloakUserSpecUser keycloakUser; @@ -58,6 +58,9 @@ class OzgKeycloakUserSpec { @AllArgsConstructor static class KeycloakUserSpecUser { + @JsonProperty("keep_after_delete") + private boolean keepAfterDelete; + @JsonProperty("username") private String username; diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java index 349a10ebe500db6fe235080cdbc92dee8b7d1eac..2e1450175ba640d2e23a0e0f9f273a1520dd60f5 100644 --- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java +++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java @@ -39,6 +39,7 @@ import org.mockito.Mock; import org.mockito.Spy; import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus; +import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser; import io.javaoperatorsdk.operator.api.reconciler.DeleteControl; class KeycloakUserReconcilerTest { @@ -119,7 +120,8 @@ class KeycloakUserReconcilerTest { @Nested class TestWithKeepAfterDelete { - private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.createBuilder().keepAfterDelete(true).build(); + private final KeycloakUserSpecUser keycloakUser = KeycloakUserSpecUserTestFactory.createBuiler().keepAfterDelete(true).build(); + private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.createBuilder().keycloakUser(keycloakUser).build(); private final OzgKeycloakUser user = OzgKeycloakUserTestFactory.create(userSpec); @Test