Skip to content
Snippets Groups Projects
Commit fe5ac307 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3961 move keep_after_delete to keycloak user stage

parent 9f150ddf
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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;
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment