From dff51c356366aa7cc43b0353529f0307e38b6d08 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 9 Aug 2023 10:03:15 +0200
Subject: [PATCH] OZG-3961 use created namespace

---
 .../user/KeycloakUserRemoteService.java       | 17 +++++------------
 .../user/KeycloakUserRemoteServiceTest.java   | 19 ++++---------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
index ab4aaf6..82eb005 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteService.java
@@ -62,7 +62,6 @@ class KeycloakUserRemoteService {
 	private Keycloak keycloak;
 	@Autowired
 	private KubernetesRemoteService kubernetesRemoteService;
-
 	@Autowired
 	private KeycloakGenericRemoteService keycloakGenericRemoteService;
 
@@ -119,17 +118,14 @@ class KeycloakUserRemoteService {
 	}
 
 	public boolean existSecret(OzgKeycloakUserSpec userSpec, String namespace) {
-		var namespaceTemp = "keycloak";// TODO durch den namespace ersetzen, wenn die Helm Charts passen
-		return Objects.nonNull(getUserSecret(userSpec, namespaceTemp).get());
+		return Objects.nonNull(getUserSecret(userSpec, namespace).get());
 	}
 
 	public void createSecret(OzgKeycloakUserSpec userSpec, String namespace) {
-		var namespaceTemp = "keycloak";// TODO durch den namespace ersetzen, wenn die Helm Charts passen
-
 		log.log(Level.INFO, "Create secret for user: " + userSpec.getKeycloakUser().getUsername());
-		var credentialsSecret = createUserSecret(userSpec.getKeycloakUser(), namespaceTemp);
+		var credentialsSecret = createUserSecret(userSpec.getKeycloakUser(), namespace);
 
-		kubernetesRemoteService.createSecret(namespaceTemp, credentialsSecret);
+		kubernetesRemoteService.createSecret(namespace, credentialsSecret);
 	}
 
 	Secret createUserSecret(KeycloakUserSpecUser userSpec, String namespace) {
@@ -163,16 +159,13 @@ class KeycloakUserRemoteService {
 	}
 
 	public String getPasswordFromSecret(OzgKeycloakUserSpec userSpec, String namespace) {
-		var namespaceTemp = "keycloak";// TODO durch den namespace ersetzen, wenn die Helm Charts passen
-		return getPasswordFromSecret(getUserSecret(userSpec, namespaceTemp));
+		return getPasswordFromSecret(getUserSecret(userSpec, namespace));
 	}
 
 	public Resource<Secret> getUserSecret(OzgKeycloakUserSpec userSpec, String namespace) {
-		var namespaceTemp = "keycloak";// TODO durch den namespace ersetzen, wenn die Helm Charts passen
-
 		var secretName = buildCredentialSecretName(userSpec.getKeycloakUser());
 		log.log(Level.INFO, "Get User secret: " + secretName);
-		return kubernetesRemoteService.getSecret(namespaceTemp, secretName);
+		return kubernetesRemoteService.getSecret(namespace, secretName);
 	}
 
 	private String buildCredentialSecretName(KeycloakUserSpecUser userSpec) {
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
index dec33eb..c7979cd 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
@@ -37,7 +37,6 @@ import javax.ws.rs.core.Response;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -295,8 +294,6 @@ class KeycloakUserRemoteServiceTest {
 			doReturn(resourceMock).when(userRemoteService).getUserSecret(any(), any());
 		}
 
-		// TODO Enable, wenn die Helm Charts passen
-		@Disabled
 		@Test
 		void shouldGetUserSecret() {
 			when(resourceMock.get()).thenReturn(new Secret());
@@ -338,9 +335,7 @@ class KeycloakUserRemoteServiceTest {
 		void shouldBuildUserSecret() {
 			userRemoteService.createSecret(userSpec, NAMESPACE);
 
-			// TODO Enable, wenn die Helm Charts passen
-			verify(userRemoteService).createUserSecret(eq(userSpec.getKeycloakUser()), any());
-//			verify(userRemoteService).createUserSecret(userSpec.getKeycloakUser(), REALM);
+			verify(userRemoteService).createUserSecret(userSpec.getKeycloakUser(), NAMESPACE);
 		}
 
 		@Test
@@ -349,9 +344,7 @@ class KeycloakUserRemoteServiceTest {
 
 			userRemoteService.createSecret(userSpec, NAMESPACE);
 
-			// TODO Enable, wenn die Helm Charts passen
-			verify(kubernetesRemoteService).createSecret(any(), eq(createSecret));
-//			verify(kubernetesRemoteService).createSecret(NAMESPACE, createSecret);
+			verify(kubernetesRemoteService).createSecret(NAMESPACE, createSecret);
 		}
 	}
 
@@ -451,9 +444,7 @@ class KeycloakUserRemoteServiceTest {
 
 			userRemoteService.getPasswordFromSecret(userSpec, NAMESPACE);
 
-			verify(userRemoteService).getUserSecret(eq(userSpec), any());
-			// TODO Enable, wenn die Helm Charts passen
-//			verify(userRemoteService).getUserSecret(userSpec, REALM);
+			verify(userRemoteService).getUserSecret(userSpec, NAMESPACE);
 		}
 
 		@Test
@@ -475,9 +466,7 @@ class KeycloakUserRemoteServiceTest {
 		void shouldGetSecret() {
 			userRemoteService.getUserSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
 
-			// TODO Enable, wenn die Helm Charts passen
-			verify(kubernetesRemoteService).getSecret(any(), eq(KeycloakUserSpecUserTestFactory.USERNAME + "-credentials"));
-//			verify(kubernetesRemoteService).getSecret(NAMESPACE, KeycloakUserSpecUserTestFactory.USERNAME + "-credentials");
+			verify(kubernetesRemoteService).getSecret(NAMESPACE, KeycloakUserSpecUserTestFactory.USERNAME + "-credentials");
 		}
 	}
 }
\ No newline at end of file
-- 
GitLab