From a4734e9f0c11d2c35cc64e66fd0713e14578e8f7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 30 Nov 2023 14:54:59 +0100
Subject: [PATCH] OZG-4624 Adjust namings
---
pom.xml | 8 ++++----
...ceStatus.java => OzgCloudCustomResourceStatus.java} | 2 +-
.../keycloak/client/KeycloakClientReconciler.java | 8 ++++----
.../keycloak/client/OzgCloudKeycloakClientStatus.java | 4 ++--
.../keycloak/group/KeycloakGroupReconciler.java | 8 ++++----
.../keycloak/group/OzgCloudKeycloakGroupStatus.java | 4 ++--
.../keycloak/realm/KeycloakRealmReconciler.java | 6 +++---
.../keycloak/realm/OzgCloudKeycloakRealmStatus.java | 4 ++--
.../operator/keycloak/user/KeycloakUserReconciler.java | 8 ++++----
.../keycloak/user/OzgCloudKeycloakUserStatus.java | 4 ++--
.../keycloak/user/UserUpdateControlBuilder.java | 6 +++---
.../ozgcloud/operator/keycloak/KeycloakLivelTest.java | 2 +-
.../keycloak/client/KeycloakClientReconcilerTest.java | 6 +++---
.../operator/keycloak/client/KeycloakLivelTest.java | 2 +-
.../keycloak/group/KeycloakGroupReconcilerTest.java | 6 +++---
.../operator/keycloak/group/KeycloakLivelTest.java | 10 ++++++----
.../keycloak/realm/KeycloakRealmReconcilerTest.java | 4 ++--
.../operator/keycloak/user/KeycloakLivelTest.java | 2 +-
.../keycloak/user/KeycloakUserReconcilerTest.java | 4 ++--
19 files changed, 50 insertions(+), 48 deletions(-)
rename src/main/java/de/ozgcloud/operator/keycloak/{OzgCustomResourceStatus.java => OzgCloudCustomResourceStatus.java} (95%)
diff --git a/pom.xml b/pom.xml
index 5ed1b48..e505640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
</parent>
<groupId>de.ozgcloud</groupId>
- <artifactId>ozg-operator</artifactId>
+ <artifactId>ozgcloud-keycloak-operator</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>OZG Cloud Operator</name>
- <description>OZG Cloud Operator</description>
+ <name>OzgCloud Keycloak Operator</name>
+ <description>OzgCloud Keycloak Operator</description>
<properties>
- <spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
+ <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
<operator-sdk.version>5.2.0</operator-sdk.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
similarity index 95%
rename from src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
index c14d87d..5bbceb5 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
@@ -23,6 +23,6 @@
*/
package de.ozgcloud.operator.keycloak;
-public enum OzgCustomResourceStatus {
+public enum OzgCloudCustomResourceStatus {
OK, IN_PROGRESS, ERROR;
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
index ee78cac..11f4f71 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -69,13 +69,13 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
"Could not reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
+ e.getMessage(),
e);
- resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+ resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
private UpdateControl<OzgCloudKeycloakClient> buildStatusOk(OzgCloudKeycloakClient resource) {
- resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+ resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource);
}
@@ -83,7 +83,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
log.log(Level.INFO,
"Could not yet reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ":"
+ errorMessage);
- resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
+ resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
index abcafe1..327dd2f 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.client;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@@ -40,7 +40,7 @@ import lombok.Setter;
@JsonIgnoreProperties(ignoreUnknown = true)
class OzgCloudKeycloakClientStatus {
- private OzgCustomResourceStatus status;
+ private OzgCloudCustomResourceStatus status;
private String message;
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
index ca6b10e..7388466 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -69,13 +69,13 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
"Could not reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
+ e.getMessage(),
e);
- resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+ resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
UpdateControl<OzgCloudKeycloakGroup> buildStatusOk(OzgCloudKeycloakGroup resource) {
- resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+ resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource);
}
@@ -83,7 +83,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
log.log(Level.INFO,
"Could not yet reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
+ errorMessage);
- resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
+ resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
index f3817dd..4bc4b77 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.group;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@@ -40,7 +40,7 @@ import lombok.Setter;
@JsonIgnoreProperties(ignoreUnknown = true)
class OzgCloudKeycloakGroupStatus {
- private OzgCustomResourceStatus status;
+ private OzgCloudCustomResourceStatus status;
private String message;
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
index a07c039..4b62b2b 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -56,7 +56,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
service.createRealm(resource.getSpec(), realmName);
- resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+ resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource);
} catch (Exception e) {
@@ -64,7 +64,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
"Could not reconcile realm " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
+ e.getMessage(),
e);
- resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+ resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
index b2072b7..9941038 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.realm;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@@ -40,7 +40,7 @@ import lombok.Setter;
@JsonIgnoreProperties(ignoreUnknown = true)
class OzgCloudKeycloakRealmStatus {
- private OzgCustomResourceStatus status;
+ private OzgCloudCustomResourceStatus status;
private String message;
}
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 e52f246..26aab3f 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -66,7 +66,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
log.warning(String.format("Could not reconcile user %s in namespace %s: %s", userName, namespace, errorMessage));
return UserUpdateControlBuilder.fromResource(resource)
- .withStatus(OzgCustomResourceStatus.IN_PROGRESS)
+ .withStatus(OzgCloudCustomResourceStatus.IN_PROGRESS)
.withMessage(errorMessage)
.withReschedule(Config.RECONCILER_RETRY_SECONDS)
.build();
@@ -74,7 +74,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
service.createOrUpdateUser(resource.getSpec(), namespace);
- return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCustomResourceStatus.OK).build();
+ return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCloudCustomResourceStatus.OK).build();
} catch (Exception e) {
var errorMessage = e.getMessage();
@@ -82,7 +82,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
log.log(Level.SEVERE, String.format("Could not reconcile user %s for namespace %s: %s", userName, namespace, errorMessage), e);
return UserUpdateControlBuilder.fromResource(resource)
- .withStatus(OzgCustomResourceStatus.ERROR)
+ .withStatus(OzgCloudCustomResourceStatus.ERROR)
.withMessage(errorMessage)
.withReschedule(Config.RECONCILER_RETRY_SECONDS_ON_ERROR)
.build();
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
index 6202873..0144a03 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.user;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.ObservedGenerationAwareStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -41,7 +41,7 @@ import lombok.Setter;
@JsonIgnoreProperties(ignoreUnknown = true)
class OzgCloudKeycloakUserStatus extends ObservedGenerationAwareStatus {
- private OzgCustomResourceStatus status;
+ private OzgCloudCustomResourceStatus status;
private String message;
}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
index 8915d2e..64b0c93 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
@@ -3,14 +3,14 @@ package de.ozgcloud.operator.keycloak.user;
import java.time.Duration;
import java.util.Optional;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
class UserUpdateControlBuilder {
private OzgCloudKeycloakUser resource;
- private OzgCustomResourceStatus status;
+ private OzgCloudCustomResourceStatus status;
private Optional<String> message = Optional.empty();
private boolean reschedule = false;
@@ -24,7 +24,7 @@ class UserUpdateControlBuilder {
return new UserUpdateControlBuilder(resource);
}
- public UserUpdateControlBuilder withStatus(OzgCustomResourceStatus status) {
+ public UserUpdateControlBuilder withStatus(OzgCloudCustomResourceStatus status) {
this.status = status;
return this;
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
index 35230ae..364285d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
@@ -55,7 +55,7 @@ class KeycloakLivelTest {
FieldUtils.writeField(service, "keycloak", kc, true);
- Optional<RoleRepresentation> rsp = service.getClientRole("VERWALTUNG_LOESCHEN", "alfa", "by-torsten-ozg-operator-dev");
+ Optional<RoleRepresentation> rsp = service.getClientRole("VERWALTUNG_LOESCHEN", "alfa", "by-torsten-ozgcloud-keycloak-operator-dev");
assertThat(rsp).isPresent();
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
index cfb2db6..c8f4113 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
class KeycloakClientReconcilerTest {
@@ -74,7 +74,7 @@ class KeycloakClientReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
- assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
@Test
@@ -83,7 +83,7 @@ class KeycloakClientReconcilerTest {
var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
- assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
}
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
index ce957b8..8329dcb 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
@@ -56,7 +56,7 @@ class KeycloakLivelTest {
FieldUtils.writeField(remoteService, "keycloak", kc, true);
- String realm = "by-torsten-ozg-operator-dev";
+ String realm = "by-torsten-ozgcloud-keycloak-operator-dev";
remoteService.createClient(createClient(), realm);
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
index c1d2fe7..c4eca85 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
class KeycloakGroupReconcilerTest {
@@ -74,7 +74,7 @@ class KeycloakGroupReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
- assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
@Test
@@ -83,7 +83,7 @@ class KeycloakGroupReconcilerTest {
var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
- assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
}
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
index 3a7164c..91ccd1f 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
@@ -41,6 +41,8 @@ import lombok.extern.java.Log;
@Log
@ExtendWith(SpringExtension.class)
class KeycloakLivelTest {
+
+ private static final String NAMESPACE = "by-torsten-ozgcloud-keycloak-operator-dev";
@Spy
@InjectMocks
@@ -65,11 +67,11 @@ class KeycloakLivelTest {
FieldUtils.writeField(remoteService, "keycloak", kc, true);
- remoteService.createGroup(createGroup(), "by-torsten-ozg-operator-dev");
- log.info("Hase: " + remoteService.getGroupByName("hase", "by-torsten-ozg-operator-dev"));
- log.info("Maus: " + remoteService.getGroupByName("maus", "by-torsten-ozg-operator-dev"));
+ remoteService.createGroup(createGroup(), NAMESPACE);
+ log.info("Hase: " + remoteService.getGroupByName("hase", NAMESPACE));
+ log.info("Maus: " + remoteService.getGroupByName("maus", NAMESPACE));
- service.createGroup(OzgCloudKeycloakGroupSpec.builder().name("Fuchs").build(), "by-torsten-ozg-operator-dev");
+ service.createGroup(OzgCloudKeycloakGroupSpec.builder().name("Fuchs").build(), NAMESPACE);
}
private GroupRepresentation createGroup() {
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
index 39cfc6d..bdcffd8 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
@@ -33,7 +33,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
class KeycloakRealmReconcilerTest {
@@ -69,7 +69,7 @@ class KeycloakRealmReconcilerTest {
void shouldSetStatusOk() {
var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
- assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+ assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
index 15570ed..b43f2a3 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
@@ -56,7 +56,7 @@ class KeycloakLivelTest {
FieldUtils.writeField(userRemoteService, "keycloak", kc, true);
// when(keycloakClient.getKeycloak()).thenReturn(kc);
- userRemoteService.createUser(createUser(), "by-torsten-ozg-operator-dev");
+ userRemoteService.createUser(createUser(), "by-torsten-ozgcloud-keycloak-operator-dev");
}
private UserRepresentation createUser() {
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 32da676..e22f7b0 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
@@ -37,7 +37,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
@@ -76,7 +76,7 @@ class KeycloakUserReconcilerTest {
reconciler.reconcile(user, null);
- assertThat(user.getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+ assertThat(user.getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
}
@Nested
--
GitLab