cdr status test

pom.xml

@@ -29,6 +29,13 @@
 <!--			<artifactId>spring-boot-starter-web-services</artifactId>-->
 <!--		</dependency>-->
 
+<!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
+<dependency>
+    <groupId>org.keycloak</groupId>
+    <artifactId>keycloak-admin-client</artifactId>
+    <version>21.1.1</version>
+</dependency>
+
 
 		<dependency>
 			<groupId>io.javaoperatorsdk</groupId>

src/main/java/de/ozgcloud/operator/Config.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import de.ozgcloud.operator.keycloak.KeycloakUserReconciler;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserReconciler;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;

src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java

@@ -12,9 +12,9 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportRuntimeHints;
 
-import de.ozgcloud.operator.keycloak.KeycloakUser;
-import de.ozgcloud.operator.keycloak.KeycloakUserSpec;
-import de.ozgcloud.operator.keycloak.KeycloakUserStatus;
+import de.ozgcloud.operator.keycloak.user.KeycloakUser;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserStatus;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.NamedCluster;
 import lombok.extern.slf4j.Slf4j;

src/main/java/de/ozgcloud/operator/keycloak/KeycloakClient.java

+package de.ozgcloud.operator.keycloak;
+
+import org.keycloak.admin.client.Keycloak;
+import org.keycloak.admin.client.KeycloakBuilder;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.springframework.stereotype.Component;
+
+import lombok.extern.java.Log;
+
+@Log
+@Component
+public class KeycloakClient {
+
+	public Keycloak getKeycloak() {
+
+		Keycloak keycloak = KeycloakBuilder.builder() //
+				.serverUrl("https://sso.dev.by.ozg-cloud.de/") //
+				.realm("master") //
+//				.grantType(OAuth2Constants.PASSWORD) //
+				.username("admin") //
+				.password(" ") //
+				.clientId("admin-cli")
+				.build();
+
+		log.info(keycloak.realms().findAll().toString());
+
+		UserRepresentation user = new UserRepresentation();
+		user.setUsername("helge");
+		keycloak.realm("by-torsten-ozg-operator-dev").users().create(user);
+
+		return keycloak;
+	}
+}

src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakClientUserRemoteService.java

+package de.ozgcloud.operator.keycloak.user;
+
+import org.keycloak.representations.account.UserRepresentation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import de.ozgcloud.operator.keycloak.KeycloakClient;
+
+@Component
+public class KeycloakClientUserRemoteService {
+
+	@Autowired
+	private KeycloakClient keycloakClient;
+
+	void createUser(UserRepresentation user) {
+
+		keycloakClient.getKeycloak();
+	}
+}

src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakClientUserService.java

+package de.ozgcloud.operator.keycloak.user;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class KeycloakClientUserService {
+
+	@Autowired
+	KeycloakClientUserRemoteService remoteService;
+
+	void addUser(KeycloakUserSpec userSpec) {
+
+	}
+}

src/main/java/de/ozgcloud/operator/keycloak/KeycloakUser.java → src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUser.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;

src/main/java/de/ozgcloud/operator/keycloak/KeycloakUserReconciler.java → src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
 import java.time.LocalDate;
 import java.util.Base64;
@@ -31,7 +31,7 @@ public class KeycloakUserReconciler implements Reconciler<KeycloakUser> {
 		String namespace = crd.getMetadata().getNamespace();
 		log.warning("Reconciling: " + name + "/" + namespace);
 		log.warning("SecretTest:" + getKeycloakRealmAdminPassword(namespace));
-		crd.setStatus(KeycloakUserStatus.builder().status("Updated status for " + name + LocalDate.now().toString()).build());
+		crd.setStatus(KeycloakUserStatus.builder().status("Updated status for " + name + LocalDate.now().toString()).phase("Pending").build());
 		return UpdateControl.updateStatus(crd);
 	}
 

src/main/java/de/ozgcloud/operator/keycloak/KeycloakUserSpec.java → src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpec.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
 import java.util.List;
 

src/main/java/de/ozgcloud/operator/keycloak/KeycloakUserStatus.java → src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatus.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
 import io.javaoperatorsdk.operator.api.ObservedGenerationAwareStatus;
 import lombok.AllArgsConstructor;
@@ -15,4 +15,6 @@ import lombok.Setter;
 public class KeycloakUserStatus extends ObservedGenerationAwareStatus {
 
 	private String status;
+
+	private String phase;
 }

src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientTest.java

+package de.ozgcloud.operator.keycloak.client;
+
+import org.junit.jupiter.api.Test;
+
+import de.ozgcloud.operator.keycloak.KeycloakClient;
+
+class KeycloakClientTest {
+
+	@Test
+	void test() {
+		KeycloakClient kc = new KeycloakClient();
+//		kc.test();
+	}
+}

src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakClientUserRemoteServiceTest.java

+package de.ozgcloud.operator.keycloak.user;
+
+import static org.mockito.Mockito.*;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import de.ozgcloud.operator.keycloak.KeycloakClient;
+
+@ExtendWith(MockitoExtension.class)
+class KeycloakClientUserRemoteServiceTest {
+
+	@Spy
+	@InjectMocks
+	KeycloakClientUserRemoteService userRemoteService;
+
+	@Mock
+	KeycloakClient keycloakClient;
+
+	@Test
+	void test() {
+
+		userRemoteService.createUser(null);
+
+		verify(keycloakClient).getKeycloak();
+	}
+}

src/test/java/de/ozgcloud/operator/keycloak/KeycloakUserReconcilerTest.java → src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -12,6 +12,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
+import de.ozgcloud.operator.keycloak.user.KeycloakUser;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserReconciler;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import lombok.SneakyThrows;
 

src/test/java/de/ozgcloud/operator/keycloak/KeycloakUserSpecTestFactory.java → src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecTestFactory.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.KeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec.KeycloakUserSpecUser;
 
 class KeycloakUserSpecTestFactory {
 

src/test/java/de/ozgcloud/operator/keycloak/KeycloakUserSpecUserTestFactory.java → src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecUserTestFactory.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.KeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec.KeycloakUserSpecUser;
 
 class KeycloakUserSpecUserTestFactory {
 

src/test/java/de/ozgcloud/operator/keycloak/KeycloakUserStatusTestFactory.java → src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserStatusTestFactory.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
+
+import de.ozgcloud.operator.keycloak.user.KeycloakUserStatus;
 
 class KeycloakUserStatusTestFactory {
 

src/test/java/de/ozgcloud/operator/keycloak/KeycloakUserTestFactory.java → src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserTestFactory.java

-package de.ozgcloud.operator.keycloak;
+package de.ozgcloud.operator.keycloak.user;
+
+import de.ozgcloud.operator.keycloak.user.KeycloakUser;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserSpec;
+import de.ozgcloud.operator.keycloak.user.KeycloakUserStatus;
 
 class KeycloakUserTestFactory {