diff --git a/Jenkinsfile b/Jenkinsfile
index 8d6e688b21eac6b3f01cfbf098794ac6a4362967..0cedc675b064aad84ea078968f93fd9a75be7b1e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
FAILED_STAGE=env.STAGE_NAME
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh 'mvn -s $MAVEN_SETTINGS clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
+ sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3'
script {
try {
diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java
index 49f4eec1424614734d8a5030c925e0d75e3e0023..7f127f55957e6dc4b3aa8f9e95c7e125bfa2dab7 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java
@@ -2,9 +2,9 @@ package de.ozgcloud.operator.elstertransfer.user;
public class Constants {
- public static final String CONFIG_MAP_NAME = "etr-user-config";
- public static final String USERS_KEY = "users.yaml";
- public static final String ELSTER_TRANSFER_USER_LOGIN_KEY = "login";
+ public static final String CONFIG_MAP_NAME = "etr-user-config";
+ public static final String USERS_KEY = "users.yaml";
+ public static final String ELSTER_TRANSFER_USER_LOGIN_KEY = "login";
public static final String ELSTER_TRANSFER_USER_PASSWORD_KEY = "password";
// todo
public static final String ETR_NAMESPACE = "etr-user-creation";
@@ -12,5 +12,4 @@ public class Constants {
public static final String ETR_DEPLOYMENT_NAME = "elster-transfer";
public static final String MUK_USER_SECRET_NAME = "muk-user-secret";
-
}
diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java
index 52d1aa365524a53738830400b5c98043a250497c..b6f0bcac3702e6b8d5e6010bc6d95ec77a62bcc4 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java
@@ -20,7 +20,7 @@ import lombok.extern.log4j.Log4j2;
public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloudElsterTransferUser>, Cleaner<OzgCloudElsterTransferUser> {
private final OzgCloudElsterTransferUserService service;
-
+
@Override
public UpdateControl<OzgCloudElsterTransferUser> reconcile(OzgCloudElsterTransferUser elsterTransferUser,
Context<OzgCloudElsterTransferUser> context) {
@@ -35,8 +35,9 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
.withReschedule(ElsterTransferOperatorConfiguration.RECONCILER_RETRY_SECONDS)
.build();
} catch (Exception e) {
- LOG.warn("{} could not reconcile in namespace {}: {}.", elsterTransferUser.getMetadata().getName(), elsterTransferUser.getMetadata().getNamespace(), e);
- return UserUpdateControlBuilder.fromResource(elsterTransferUser)
+ LOG.warn("{} could not reconcile in namespace {}: {}.", elsterTransferUser.getMetadata().getName(),
+ elsterTransferUser.getMetadata().getNamespace(), e);
+ return UserUpdateControlBuilder.fromResource(elsterTransferUser)
.withStatus(OzgCloudCustomResourceStatus.ERROR)
.withMessage(e.getMessage())
.withReschedule(ElsterTransferOperatorConfiguration.RECONCILER_RETRY_SECONDS_ON_ERROR)
@@ -44,19 +45,18 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
}
}
-
@Override
public DeleteControl cleanup(OzgCloudElsterTransferUser user, Context<OzgCloudElsterTransferUser> context) {
LOG.info("{} cleanup...", user.getMetadata().getName());
String namespace = user.getMetadata().getNamespace();
-
+
if (user.getSpec().isKeepAfterDelete()) {
LOG.info("keep data");
return DeleteControl.defaultDelete();
}
try {
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+ service.delete(user);
return DeleteControl.defaultDelete();
} catch (Exception e) {
LOG.warn(namespace + " could not delete.", e);
diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
index 905d11e02f7e8a6f564977a579177862451a0bfb..2382cd19055b2fbcf4c308cf6d092d5d28d1e53f 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
@@ -20,7 +20,6 @@ public class OzgCloudElsterTransferUserRemoteService {
private final KubernetesClient client;
-
public ConfigMap getConfigMap(String configmapNamespace, String configMapName) {
return client.configMaps().inNamespace(configmapNamespace).withName(configMapName).get();
}
@@ -30,11 +29,11 @@ public class OzgCloudElsterTransferUserRemoteService {
}
public ConfigMap buildConfigMap(String configMapName) {
- return new ConfigMapBuilder()
- .withNewMetadata()
- .withName(configMapName)
- .endMetadata()
- .build();
+ return new ConfigMapBuilder()
+ .withNewMetadata()
+ .withName(configMapName)
+ .endMetadata()
+ .build();
}
public void updateConfigMapData(ConfigMap configMap, String key, String data) {
@@ -45,7 +44,7 @@ public class OzgCloudElsterTransferUserRemoteService {
public void restartDeployment(String namespace, String deploymentName) {
Resource<Deployment> deploymentResource = getDeploymentResource(namespace, deploymentName);
Deployment deployment = deploymentResource.get();
-
+
if (Objects.nonNull(deployment)) {
setRestartAt(deployment);
deploymentResource.replace(deployment);
@@ -53,7 +52,7 @@ public class OzgCloudElsterTransferUserRemoteService {
}
public Resource<Deployment> getDeploymentResource(String namespace, String deploymentName) {
- return client.apps().deployments().inNamespace(namespace).withName(deploymentName);
+ return client.apps().deployments().inNamespace(namespace).withName(deploymentName);
}
void setRestartAt(Deployment deployment) {
@@ -62,7 +61,7 @@ public class OzgCloudElsterTransferUserRemoteService {
}
public void createOrUpdateSecret(String namespace, String userPassword, String secretName) {
- client.secrets().inNamespace(namespace).resource(buildUserSecret(namespace, userPassword, secretName )).createOrReplace();
+ client.secrets().inNamespace(namespace).resource(buildUserSecret(namespace, userPassword, secretName)).createOrReplace();
}
public Secret buildUserSecret(String namespace, String userPassword, String secretName) {
diff --git a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
index 1e195ea354d2166fda6663fc5443a8f3d702787e..1246f5fd2330c424e84ffba9b8c28ee7db69188f 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
@@ -16,7 +16,6 @@ import com.github.mustachejava.Mustache;
import com.github.mustachejava.MustacheFactory;
import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.micrometer.common.util.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -35,11 +34,11 @@ public class OzgCloudElsterTransferUserService {
restartDeployment(Constants.ETR_NAMESPACE, Constants.ETR_DEPLOYMENT_NAME);
LOG.info("Creating Secret");
createOrUpdateSecret(namespace, userPassword, Constants.MUK_USER_SECRET_NAME);
-
+
}
}
- public void deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(OzgCloudElsterTransferUser user) {
+ public void delete(OzgCloudElsterTransferUser user) {
String namespace = user.getMetadata().getNamespace();
if (!userExists(namespace, Constants.ETR_NAMESPACE, Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)) {
LOG.info("User not exists");
@@ -52,9 +51,9 @@ public class OzgCloudElsterTransferUserService {
String updateConfigMapAndGenerateUserPassword(String namespace, String configmapNamespace, String configMapName) {
ConfigMap configMap = createOrGetConfigMap(configmapNamespace, configMapName);
- String userPassword = generatePassword();
+ String userPassword = generatePassword();
String usersYaml = addUserToUserYaml(getUsersFromConfigMap(configMap), namespace, userPassword);
- updateConfigMap(configMapName, configMap, usersYaml);
+ updateConfigMap(configMapName, configMap, usersYaml);
return userPassword;
}
@@ -89,12 +88,12 @@ public class OzgCloudElsterTransferUserService {
boolean userExists(String userLogin, String configMapNamespace, String configMapName) {
ConfigMap configMap = getConfigMap(configMapNamespace, configMapName);
if (Objects.isNull(configMap)) {
- return false;
+ return false;
}
OzgCloudElsterTransferConfigMapUserList users = getUsersFromConfigMap(configMap);
LOG.debug("userExists is '{}' in namespace '{}'", users.existsUser(userLogin), userLogin);
return users.existsUser(userLogin);
-
+
}
void deleteUser(String userLogin, String configMapName) {
@@ -143,11 +142,11 @@ public class OzgCloudElsterTransferUserService {
String getYamlForUser(Map<String, Object> userEntry) {
MustacheFactory mf = new DefaultMustacheFactory();
- Mustache mustache = mf.compile("users.tmpl");
+ Mustache mustache = mf.compile("users.tmpl");
- StringWriter writer = new StringWriter();
- mustache.execute(writer, userEntry);
- return writer.toString();
+ StringWriter writer = new StringWriter();
+ mustache.execute(writer, userEntry);
+ return writer.toString();
}
String generatePassword() {
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferConfigMapUserListFactory.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferConfigMapUserListFactory.java
index bb2ec02a488a6339d35799bbd156baaa6c2bebb2..95b0c5d92560d3c2a04e6212dbafefb05931ad49 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferConfigMapUserListFactory.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferConfigMapUserListFactory.java
@@ -1,7 +1,6 @@
package de.ozgcloud.operator.elstertransfer.user;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconcilerTest.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconcilerTest.java
index f369911ae56bf15eed77fff0e70db335bcc705d1..a5970ed136163f83560f40a200ef9c70be7d5498 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconcilerTest.java
@@ -66,7 +66,7 @@ class OzgCloudElsterTransferUserReconcilerTest {
void shouldCallServiceDelete() {
reconciler.cleanup(user, null);
- verify(service).deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+ verify(service).delete(user);
}
@Test
@@ -79,7 +79,7 @@ class OzgCloudElsterTransferUserReconcilerTest {
@Test
void shouldRescheduleOnError() {
doThrow(RuntimeException.class).when(service)
- .deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+ .delete(user);
var control = reconciler.cleanup(user, null);
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
index 82a4ea2a96c3f9f07cc6e79be5bd14239c1a6172..91e58588bb5219321efba8740e0c528074ca2d95 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
@@ -42,541 +42,472 @@ class OzgCloudElsterTransferUserServiceTest {
private static final String configMapNamespace = Constants.ETR_NAMESPACE;
private static final String usersKey = Constants.USERS_KEY;
- /*@Nested
- class TestUpdateConfigMapAndRestartDeploymentAndCreateSecret {
-
- @BeforeEach
- void setUp() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- when(users.getUsersList()).thenReturn(OzgCloudElsterTransferConfigMapUserListFactory.create());
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- }
-
- @Test
- void shouldCallupdateConfigMapAndGenerateUserPassword() {
- service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
-
- verify(service).updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
- }
-
- @Test
- void shouldCallRestartDeployment() {
- service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
-
- verify(service).restartDeployment(configMapNamespace, deploymentName);
- }
-
- @Test
- void shouldCallCreateOrUpdateSecret() {
- String psw = "password";
- when(service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName)).thenReturn(psw);
-
- service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
-
- verify(service).createOrUpdateSecret(namespace, psw, secretName);
- }
-
- @Test
- void shouldNotCallRestartDeployment() {
- when(service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName)).thenReturn("");
-
- service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
-
- verify(service, never()).restartDeployment(any(), any());
- }
-
- @Test
- void shouldNotCallCreateOrUpdateSecret() {
- when(service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName)).thenReturn("");
-
- service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
-
- verify(service, never()).createOrUpdateSecret(any(), any(), any());
- }
-
- }
-
- @Nested
- class TestDeleteUserAndRestartDeploymentIfNotKeepUserAndUserExists {
-
- @Test
- void keepAfterDeleteShouldReturnFalseAsDefault() {
-
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- assertFalse(user.getSpec().isKeepAfterDelete());
-
- }
-
- @Test
- void shouldCallUserExists() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(OzgCloudElsterTransferUserTestFactory.create());
-
- verify(service).userExists(namespace, configMapNamespace, configMapName);
-
- }
-
- @Test
- void shouldNotCallUserExists() {
-
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
- user.getSpec().setKeepAfterDelete(true);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- verify(service, never()).userExists(any(), any(), any());
-
- }
-
- @Test
- void shouldCallDeleteUser() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- when(users.getUsersList()).thenReturn(OzgCloudElsterTransferConfigMapUserListFactory.create());
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
- when(service.userExists(namespace, configMapNamespace, configMapName)).thenReturn(true);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- verify(service).deleteUser(user.getMetadata().getNamespace(), configMapName);
- }
-
- @Test
- void shouldNotCallDeleteUserOrRestartDeploymentIfKeepAfterDelete() {
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
- user.getSpec().setKeepAfterDelete(true);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- verify(service, never()).deleteUser(any(), any());
- verify(service, never()).restartDeployment(any(), any());
- }
-
- @Test
- void shouldNotCallDeleteUserOrRestartDeploymentIfUserNotExists() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
- when(service.userExists(namespace, configMapNamespace, configMapName)).thenReturn(false);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- verify(service, never()).deleteUser(any(), any());
- verify(service, never()).restartDeployment(any(), any());
- }
-
- @Test
- void shouldCallRestartDeployment() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- when(users.getUsersList()).thenReturn(OzgCloudElsterTransferConfigMapUserListFactory.create());
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- OzgCloudElsterTransferUser user = OzgCloudElsterTransferUserTestFactory.create();
- when(service.userExists(namespace, configMapNamespace, configMapName)).thenReturn(true);
-
- service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
-
- verify(service).restartDeployment(configMapNamespace, deploymentName);
- }
- }
-
- @Nested
- @DisplayName("updateConfigMapAndGenerateUserPassword")
- class TestupdateConfigMapAndGenerateUserPassword {
-
- @BeforeEach
- public void setUp() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(anyString(), anyString())).thenReturn(configMap);
- }
-
- @Test
- void shouldNotCallCreateConfigMap() {
- when(remoteService.getConfigMap(configMapNamespace, configMapName)).thenReturn(configMap);
-
- service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- verify(remoteService, never()).createConfigMap(any(), any());
- }
-
- @Test
- void shouldCallGetConfigMap() {
- service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- verify(remoteService).getConfigMap(configMapNamespace, configMapName);
- }
-
- @Test
- void shouldReturnGeneratedPassword() {
- String userPassword = service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- assertNotNull(userPassword);
- }
-
- @Test
- void shouldCallUpdateConfigMap() {
- service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- verify(service).updateConfigMap(eq(configMapNamespace), eq(configMapName), eq(configMap), anyString());
- }
-
- @Test
- void shouldNotCallUpdateConfigMap() {
- when(service.generatePassword()).thenReturn("psw");
- when(service.addUserToUserYaml(namespace, configMap, "psw")).thenReturn("");
-
- service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- verify(service, never()).updateConfigMap(any(), any(), any(), anyString());
- }
-
- @Test
- void shouldSetUserPSEmptyWWhenUserYamlEmpty() {
- when(service.generatePassword()).thenReturn("psw");
- when(service.addUserToUserYaml(namespace, configMap, "psw")).thenReturn("");
-
- String userPassword = service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- assertTrue(userPassword.isEmpty());
- }
-
- @Test
- void shouldSetUserPSWWhenUserYamlNotEmpty() {
- when(service.generatePassword()).thenReturn("psw");
- when(service.addUserToUserYaml(namespace, configMap, "psw")).thenReturn("someYaml");
-
- String userPassword = service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- assertFalse(userPassword.isEmpty());
- }
-
- @Test
- void shouldCalladdUserToUserYaml() {
- service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
-
- verify(service).addUserToUserYaml(eq(namespace), eq(configMap), anyString());
- }
-
- }
-
- @Nested
- class addUserToUserYamlTests {
-
- @Test
- void shouldCallgetUsersFromConfigMap() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
-
- service.addUserToUserYaml(namespace, configMap, "password");
-
- verify(service).getUsersFromConfigMap(configMap);
- }
-
- @Test
- void shouldNotCallgetUsersFromConfigMap() {
- service.addUserToUserYaml(namespace, null, "password");
-
- verify(service, never()).getUsersFromConfigMap(any());
- }
-
- @Test
- void shouldCallUserExistsInList() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- when(users.getUsersList()).thenReturn(OzgCloudElsterTransferConfigMapUserListFactory.create());
-
- service.addUserToUserYaml(namespace, configMap, "password");
-
- verify(service).userExistsInList(users, namespace);
- }
-
- @Test
- void shouldCallAddNewUserToListWhenUserNotExists() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
- service.addUserToUserYaml(namespace, configMap, "password");
-
- verify(service).addNewUserToList(eq(users), eq(namespace), anyString());
- }
-
- @Test
- void shouldCallconstructYamlEntries() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
- service.addUserToUserYaml(namespace, configMap, "password");
-
- verify(service).constructYamlEntries(users);
- }
-
- @Test
- void TestUserYamlShouldNotBeEmpty() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
-
- String userYaml = service.addUserToUserYaml(namespace, configMap, "password");
-
- assertFalse(userYaml.isEmpty());
- }
-
- @Test
- void TestUserYamlShouldBeEmpty() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
-
- String userYaml = service.addUserToUserYaml(namespace, configMap, "password");
-
- assertTrue(userYaml.isEmpty());
- }
- }
-
- @Nested
- class UpdateConfigMapTests {
-
- @Test
- void shouldCallCreateConfigMapIfConfigMapNotExists() {
- service.updateConfigMap(configMapName, null, "mockedUsersYaml");
-
- verify(remoteService).createConfigMap(configMapNamespace, configMapName);
- }
-
- @Test
- void shouldNotCallCreateConfigMapIfConfigMapExists() {
- service.updateConfigMap(configMapName, configMap, "mockedUsersYaml");
-
- verify(remoteService, never()).createConfigMap(any(), any());
- }
-
- @Test
- void shouldCallUpdateConfigMapData() {
- service.updateConfigMap(configMapName, configMap, "mockedUsersYaml");
-
- verify(remoteService).updateConfigMapData(configMap, usersKey, "mockedUsersYaml");
- }
-
- }
-
- @Nested
- class RestartDeploymentTests {
- @Test
- void shouldCallCreateConfigMap() {
- service.restartDeployment(configMapNamespace, deploymentName);
-
- verify(remoteService).restartDeployment(configMapNamespace, deploymentName);
- }
- }
-
- @Nested
- class UserExistsTests {
-
- @BeforeEach
- public void setUp() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(configMapNamespace, configMapName)).thenReturn(configMap);
- }
-
- @Test
- void shouldCallGetConfigMap() {
- service.userExists(namespace, configMapNamespace, configMapName);
-
- verify(remoteService).getConfigMap(configMapNamespace, configMapName);
- }
-
- @Test
- void shouldReturnUserExistsTrueIfUserExists() {
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- when(users.existsUser(namespace)).thenReturn(true);
-
- boolean userExists = service.userExists(namespace, configMapNamespace, configMapName);
-
- assertTrue(userExists);
- }
-
- @Test
- void shouldReturnUserExistsTrueIfUserNotExists() {
- boolean userExists = service.userExists(namespace, configMapNamespace, configMapName);
-
- assertFalse(userExists);
- }
-
- @Test
- void shouldCallgetUsersFromConfigMap() {
- service.userExists(namespace, configMapNamespace, configMapName);
-
- verify(service).getUsersFromConfigMap(configMap);
- }
-
- @Test
- void shouldCallExistsUser() {
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
- service.userExists(namespace, configMapNamespace, configMapName);
-
- verify(users).existsUser(namespace);
- }
-
- }
-
- @Nested
- class DeleteUserTests {
- @BeforeEach
- public void setUp() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- when(remoteService.getConfigMap(configMapNamespace, configMapName)).thenReturn(configMap);
- }
-
- @Test
- void shouldCallGetConfigMap() {
- service.deleteUser(namespace, configMapName);
-
- verify(remoteService).getConfigMap(configMapNamespace, configMapName);
- }
-
- @Test
- void shouldCallGetUsersFromConfigMap() {
- service.deleteUser(namespace, configMapName);
-
- verify(service).getUsersFromConfigMap(configMap);
- }
-
- @Test
- void shouldCallremoveDeleted() {
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
- service.deleteUser(namespace, configMapName);
-
- verify(users).removeDeleted(namespace);
- }
-
- @Test
- void ShouldCallConstructYamlEntries() {
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
-
- service.deleteUser(namespace, configMapName);
-
- verify(service).constructYamlEntries(users);
- }
-
- @Test
- void ShouldCallUpdateConfigMapData() {
- when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
- when(service.constructYamlEntries(users)).thenReturn("updatedUsersYaml");
-
- service.deleteUser(namespace, configMapName);
-
- verify(remoteService).updateConfigMapData(configMap, usersKey, "updatedUsersYaml");
- }
- }
-
- @Nested
- class CreateOrUpdateSecretTests {
- @Test
- void shouldCallCreateOrUpdateSecret() {
- service.createOrUpdateSecret(namespace, "psw", secretName);
-
- verify(remoteService).createOrUpdateSecret(namespace, "psw", secretName);
- }
-
- }
-
- @Nested
- class GetUsersFromConfigMapTests {
- @BeforeEach
- public void setUp() {
- configMap = OzgCloudElsterTransferConfigMapFactory.create();
- }
-
- @Test
- void shouldReturnObjectConfigMapUserList() {
- OzgCloudElsterTransferConfigMapUserList result = service.getUsersFromConfigMap(configMap);
-
- assertNotNull(result);
- assertInstanceOf(OzgCloudElsterTransferConfigMapUserList.class, result);
- }
-
- @Test
- void shouldReturnConfigMapUserListWithContent() {
- OzgCloudElsterTransferConfigMapUserList result = service.getUsersFromConfigMap(configMap);
-
- List<Map<String, Object>> usersList = result.getUsersList();
-
- assertThat(usersList).hasSize(1);
- }
-
- }
-
- @Nested
- class UserExistsInListTests {
- @Test
- void shouldCallExistsUser() {
- service.userExistsInList(users, namespace);
-
- verify(users).existsUser(namespace);
- }
-
- }
-
- @Nested
- class AddNewUserToListTests {
- @Test
- void shouldCallAddUserToList() {
- service.addNewUserToList(users, namespace, "pswHash");
-
- verify(users).addUserToList(namespace, "pswHash", "USER");
- }
-
- }
-
- @Nested
- class ConstructYamlEntriesTests {
- @Test
- void shouldHaveResultWithCorrectContentStart() {
- String result = service.constructYamlEntries(users);
-
- assertTrue(result.startsWith("fileFormat: 1\nusers:\n"));
- }
-
- @Test
- void shouldHaveResultWithCorrectContent() {
- when(users.getUsersList()).thenReturn(OzgCloudElsterTransferConfigMapUserListFactory.create());
- String expectedYaml = "fileFormat: 1\n" +
- "users:\n" +
- " - { login: \"user1\", rolle: \"USER\", credentials: { passwortHash: \"$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a\" }, gruppe: \"user1\" }\n";
-
- String result = service.constructYamlEntries(users);
-
- assertThat(expectedYaml).isEqualTo(result);
- }
- }
-
- @Nested
- class GetYamlForUserTests {
- @Test
- void shouldReturnExpectedYamlForUser() {
- Map<String, Object> userEntry = new HashMap<>();
- userEntry.put("login", "user1");
- userEntry.put("rolle", "USER");
- userEntry.put("gruppe", "user1");
- Map<String, String> credentials = new HashMap<>();
- credentials.put("passwortHash", "$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a");
- userEntry.put("credentials", credentials);
- String expectedYaml = " - { login: \"user1\", rolle: \"USER\", credentials: { passwortHash: \"$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a\" }, gruppe: \"user1\" }\n";
-
- String result = service.getYamlForUser(userEntry);
-
- assertThat(expectedYaml).isEqualTo(result);
- }
-
- }*/
+ /*
+ * @Nested class TestUpdateConfigMapAndRestartDeploymentAndCreateSecret {
+ *
+ * @BeforeEach void setUp() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); when(users.getUsersList()).thenReturn(
+ * OzgCloudElsterTransferConfigMapUserListFactory.create());
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users); }
+ *
+ * @Test void shouldCallupdateConfigMapAndGenerateUserPassword() {
+ * service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
+ *
+ * verify(service).updateConfigMapAndGenerateUserPassword(namespace,
+ * configMapNamespace, configMapName); }
+ *
+ * @Test void shouldCallRestartDeployment() {
+ * service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
+ *
+ * verify(service).restartDeployment(configMapNamespace, deploymentName); }
+ *
+ * @Test void shouldCallCreateOrUpdateSecret() { String psw = "password";
+ * when(service.updateConfigMapAndGenerateUserPassword(namespace,
+ * configMapNamespace, configMapName)).thenReturn(psw);
+ *
+ * service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
+ *
+ * verify(service).createOrUpdateSecret(namespace, psw, secretName); }
+ *
+ * @Test void shouldNotCallRestartDeployment() {
+ * when(service.updateConfigMapAndGenerateUserPassword(namespace,
+ * configMapNamespace, configMapName)).thenReturn("");
+ *
+ * service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
+ *
+ * verify(service, never()).restartDeployment(any(), any()); }
+ *
+ * @Test void shouldNotCallCreateOrUpdateSecret() {
+ * when(service.updateConfigMapAndGenerateUserPassword(namespace,
+ * configMapNamespace, configMapName)).thenReturn("");
+ *
+ * service.updateConfigMapAndRestartDeploymentAndCreateSecret(namespace);
+ *
+ * verify(service, never()).createOrUpdateSecret(any(), any(), any()); }
+ *
+ * }
+ *
+ * @Nested class Testdelete {
+ *
+ * @Test void keepAfterDeleteShouldReturnFalseAsDefault() {
+ *
+ * configMap = OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ *
+ * service.delete(user);
+ *
+ * assertFalse(user.getSpec().isKeepAfterDelete());
+ *
+ * }
+ *
+ * @Test void shouldCallUserExists() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap);
+ *
+ * service.delete(OzgCloudElsterTransferUserTestFactory.create());
+ *
+ * verify(service).userExists(namespace, configMapNamespace, configMapName);
+ *
+ * }
+ *
+ * @Test void shouldNotCallUserExists() {
+ *
+ * OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ * user.getSpec().setKeepAfterDelete(true);
+ *
+ * service.delete(user);
+ *
+ * verify(service, never()).userExists(any(), any(), any());
+ *
+ * }
+ *
+ * @Test void shouldCallDeleteUser() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); when(users.getUsersList()).thenReturn(
+ * OzgCloudElsterTransferConfigMapUserListFactory.create());
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ * OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ * when(service.userExists(namespace, configMapNamespace,
+ * configMapName)).thenReturn(true);
+ *
+ * service.delete(user);
+ *
+ * verify(service).deleteUser(user.getMetadata().getNamespace(), configMapName);
+ * }
+ *
+ * @Test void shouldNotCallDeleteUserOrRestartDeploymentIfKeepAfterDelete() {
+ * OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ * user.getSpec().setKeepAfterDelete(true);
+ *
+ * service.delete(user);
+ *
+ * verify(service, never()).deleteUser(any(), any()); verify(service,
+ * never()).restartDeployment(any(), any()); }
+ *
+ * @Test void shouldNotCallDeleteUserOrRestartDeploymentIfUserNotExists() {
+ * configMap = OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ * when(service.userExists(namespace, configMapNamespace,
+ * configMapName)).thenReturn(false);
+ *
+ * service.delete(user);
+ *
+ * verify(service, never()).deleteUser(any(), any()); verify(service,
+ * never()).restartDeployment(any(), any()); }
+ *
+ * @Test void shouldCallRestartDeployment() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); when(users.getUsersList()).thenReturn(
+ * OzgCloudElsterTransferConfigMapUserListFactory.create());
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ * OzgCloudElsterTransferUser user =
+ * OzgCloudElsterTransferUserTestFactory.create();
+ * when(service.userExists(namespace, configMapNamespace,
+ * configMapName)).thenReturn(true);
+ *
+ * service.delete(user);
+ *
+ * verify(service).restartDeployment(configMapNamespace, deploymentName); } }
+ *
+ * @Nested
+ *
+ * @DisplayName("updateConfigMapAndGenerateUserPassword") class
+ * TestupdateConfigMapAndGenerateUserPassword {
+ *
+ * @BeforeEach public void setUp() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(anyString(),
+ * anyString())).thenReturn(configMap); }
+ *
+ * @Test void shouldNotCallCreateConfigMap() {
+ * when(remoteService.getConfigMap(configMapNamespace,
+ * configMapName)).thenReturn(configMap);
+ *
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * verify(remoteService, never()).createConfigMap(any(), any()); }
+ *
+ * @Test void shouldCallGetConfigMap() {
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * verify(remoteService).getConfigMap(configMapNamespace, configMapName); }
+ *
+ * @Test void shouldReturnGeneratedPassword() { String userPassword =
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * assertNotNull(userPassword); }
+ *
+ * @Test void shouldCallUpdateConfigMap() {
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * verify(service).updateConfigMap(eq(configMapNamespace), eq(configMapName),
+ * eq(configMap), anyString()); }
+ *
+ * @Test void shouldNotCallUpdateConfigMap() {
+ * when(service.generatePassword()).thenReturn("psw");
+ * when(service.addUserToUserYaml(namespace, configMap, "psw")).thenReturn("");
+ *
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * verify(service, never()).updateConfigMap(any(), any(), any(), anyString()); }
+ *
+ * @Test void shouldSetUserPSEmptyWWhenUserYamlEmpty() {
+ * when(service.generatePassword()).thenReturn("psw");
+ * when(service.addUserToUserYaml(namespace, configMap, "psw")).thenReturn("");
+ *
+ * String userPassword =
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * assertTrue(userPassword.isEmpty()); }
+ *
+ * @Test void shouldSetUserPSWWhenUserYamlNotEmpty() {
+ * when(service.generatePassword()).thenReturn("psw");
+ * when(service.addUserToUserYaml(namespace, configMap,
+ * "psw")).thenReturn("someYaml");
+ *
+ * String userPassword =
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * assertFalse(userPassword.isEmpty()); }
+ *
+ * @Test void shouldCalladdUserToUserYaml() {
+ * service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * verify(service).addUserToUserYaml(eq(namespace), eq(configMap), anyString());
+ * }
+ *
+ * }
+ *
+ * @Nested class addUserToUserYamlTests {
+ *
+ * @Test void shouldCallgetUsersFromConfigMap() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ *
+ * service.addUserToUserYaml(namespace, configMap, "password");
+ *
+ * verify(service).getUsersFromConfigMap(configMap); }
+ *
+ * @Test void shouldNotCallgetUsersFromConfigMap() {
+ * service.addUserToUserYaml(namespace, null, "password");
+ *
+ * verify(service, never()).getUsersFromConfigMap(any()); }
+ *
+ * @Test void shouldCallUserExistsInList() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ * when(users.getUsersList()).thenReturn(
+ * OzgCloudElsterTransferConfigMapUserListFactory.create());
+ *
+ * service.addUserToUserYaml(namespace, configMap, "password");
+ *
+ * verify(service).userExistsInList(users, namespace); }
+ *
+ * @Test void shouldCallAddNewUserToListWhenUserNotExists() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ * service.addUserToUserYaml(namespace, configMap, "password");
+ *
+ * verify(service).addNewUserToList(eq(users), eq(namespace), anyString()); }
+ *
+ * @Test void shouldCallconstructYamlEntries() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ * service.addUserToUserYaml(namespace, configMap, "password");
+ *
+ * verify(service).constructYamlEntries(users); }
+ *
+ * @Test void TestUserYamlShouldNotBeEmpty() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ *
+ * String userYaml = service.addUserToUserYaml(namespace, configMap,
+ * "password");
+ *
+ * assertFalse(userYaml.isEmpty()); }
+ *
+ * @Test void TestUserYamlShouldBeEmpty() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ *
+ * String userYaml = service.addUserToUserYaml(namespace, configMap,
+ * "password");
+ *
+ * assertTrue(userYaml.isEmpty()); } }
+ *
+ * @Nested class UpdateConfigMapTests {
+ *
+ * @Test void shouldCallCreateConfigMapIfConfigMapNotExists() {
+ * service.updateConfigMap(configMapName, null, "mockedUsersYaml");
+ *
+ * verify(remoteService).createConfigMap(configMapNamespace, configMapName); }
+ *
+ * @Test void shouldNotCallCreateConfigMapIfConfigMapExists() {
+ * service.updateConfigMap(configMapName, configMap, "mockedUsersYaml");
+ *
+ * verify(remoteService, never()).createConfigMap(any(), any()); }
+ *
+ * @Test void shouldCallUpdateConfigMapData() {
+ * service.updateConfigMap(configMapName, configMap, "mockedUsersYaml");
+ *
+ * verify(remoteService).updateConfigMapData(configMap, usersKey,
+ * "mockedUsersYaml"); }
+ *
+ * }
+ *
+ * @Nested class RestartDeploymentTests {
+ *
+ * @Test void shouldCallCreateConfigMap() {
+ * service.restartDeployment(configMapNamespace, deploymentName);
+ *
+ * verify(remoteService).restartDeployment(configMapNamespace, deploymentName);
+ * } }
+ *
+ * @Nested class UserExistsTests {
+ *
+ * @BeforeEach public void setUp() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(configMapNamespace,
+ * configMapName)).thenReturn(configMap); }
+ *
+ * @Test void shouldCallGetConfigMap() { service.userExists(namespace,
+ * configMapNamespace, configMapName);
+ *
+ * verify(remoteService).getConfigMap(configMapNamespace, configMapName); }
+ *
+ * @Test void shouldReturnUserExistsTrueIfUserExists() {
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ * when(users.existsUser(namespace)).thenReturn(true);
+ *
+ * boolean userExists = service.userExists(namespace, configMapNamespace,
+ * configMapName);
+ *
+ * assertTrue(userExists); }
+ *
+ * @Test void shouldReturnUserExistsTrueIfUserNotExists() { boolean userExists =
+ * service.userExists(namespace, configMapNamespace, configMapName);
+ *
+ * assertFalse(userExists); }
+ *
+ * @Test void shouldCallgetUsersFromConfigMap() { service.userExists(namespace,
+ * configMapNamespace, configMapName);
+ *
+ * verify(service).getUsersFromConfigMap(configMap); }
+ *
+ * @Test void shouldCallExistsUser() {
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ * service.userExists(namespace, configMapNamespace, configMapName);
+ *
+ * verify(users).existsUser(namespace); }
+ *
+ * }
+ *
+ * @Nested class DeleteUserTests {
+ *
+ * @BeforeEach public void setUp() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create();
+ * when(remoteService.getConfigMap(configMapNamespace,
+ * configMapName)).thenReturn(configMap); }
+ *
+ * @Test void shouldCallGetConfigMap() { service.deleteUser(namespace,
+ * configMapName);
+ *
+ * verify(remoteService).getConfigMap(configMapNamespace, configMapName); }
+ *
+ * @Test void shouldCallGetUsersFromConfigMap() { service.deleteUser(namespace,
+ * configMapName);
+ *
+ * verify(service).getUsersFromConfigMap(configMap); }
+ *
+ * @Test void shouldCallremoveDeleted() {
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ * service.deleteUser(namespace, configMapName);
+ *
+ * verify(users).removeDeleted(namespace); }
+ *
+ * @Test void ShouldCallConstructYamlEntries() {
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ *
+ * service.deleteUser(namespace, configMapName);
+ *
+ * verify(service).constructYamlEntries(users); }
+ *
+ * @Test void ShouldCallUpdateConfigMapData() {
+ * when(service.getUsersFromConfigMap(configMap)).thenReturn(users);
+ * when(service.constructYamlEntries(users)).thenReturn("updatedUsersYaml");
+ *
+ * service.deleteUser(namespace, configMapName);
+ *
+ * verify(remoteService).updateConfigMapData(configMap, usersKey,
+ * "updatedUsersYaml"); } }
+ *
+ * @Nested class CreateOrUpdateSecretTests {
+ *
+ * @Test void shouldCallCreateOrUpdateSecret() {
+ * service.createOrUpdateSecret(namespace, "psw", secretName);
+ *
+ * verify(remoteService).createOrUpdateSecret(namespace, "psw", secretName); }
+ *
+ * }
+ *
+ * @Nested class GetUsersFromConfigMapTests {
+ *
+ * @BeforeEach public void setUp() { configMap =
+ * OzgCloudElsterTransferConfigMapFactory.create(); }
+ *
+ * @Test void shouldReturnObjectConfigMapUserList() {
+ * OzgCloudElsterTransferConfigMapUserList result =
+ * service.getUsersFromConfigMap(configMap);
+ *
+ * assertNotNull(result);
+ * assertInstanceOf(OzgCloudElsterTransferConfigMapUserList.class, result); }
+ *
+ * @Test void shouldReturnConfigMapUserListWithContent() {
+ * OzgCloudElsterTransferConfigMapUserList result =
+ * service.getUsersFromConfigMap(configMap);
+ *
+ * List<Map<String, Object>> usersList = result.getUsersList();
+ *
+ * assertThat(usersList).hasSize(1); }
+ *
+ * }
+ *
+ * @Nested class UserExistsInListTests {
+ *
+ * @Test void shouldCallExistsUser() { service.userExistsInList(users,
+ * namespace);
+ *
+ * verify(users).existsUser(namespace); }
+ *
+ * }
+ *
+ * @Nested class AddNewUserToListTests {
+ *
+ * @Test void shouldCallAddUserToList() { service.addNewUserToList(users,
+ * namespace, "pswHash");
+ *
+ * verify(users).addUserToList(namespace, "pswHash", "USER"); }
+ *
+ * }
+ *
+ * @Nested class ConstructYamlEntriesTests {
+ *
+ * @Test void shouldHaveResultWithCorrectContentStart() { String result =
+ * service.constructYamlEntries(users);
+ *
+ * assertTrue(result.startsWith("fileFormat: 1\nusers:\n")); }
+ *
+ * @Test void shouldHaveResultWithCorrectContent() {
+ * when(users.getUsersList()).thenReturn(
+ * OzgCloudElsterTransferConfigMapUserListFactory.create()); String expectedYaml
+ * = "fileFormat: 1\n" + "users:\n" +
+ * " - { login: \"user1\", rolle: \"USER\", credentials: { passwortHash: \"$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a\" }, gruppe: \"user1\" }\n"
+ * ;
+ *
+ * String result = service.constructYamlEntries(users);
+ *
+ * assertThat(expectedYaml).isEqualTo(result); } }
+ *
+ * @Nested class GetYamlForUserTests {
+ *
+ * @Test void shouldReturnExpectedYamlForUser() { Map<String, Object> userEntry
+ * = new HashMap<>(); userEntry.put("login", "user1"); userEntry.put("rolle",
+ * "USER"); userEntry.put("gruppe", "user1"); Map<String, String> credentials =
+ * new HashMap<>(); credentials.put("passwortHash",
+ * "$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a");
+ * userEntry.put("credentials", credentials); String expectedYaml =
+ * " - { login: \"user1\", rolle: \"USER\", credentials: { passwortHash: \"$2a$12$cqKZMcwTUe/tju7PIFGhperWdV2Xa9o4fVw5eClbzatRhvxZphE1a\" }, gruppe: \"user1\" }\n"
+ * ;
+ *
+ * String result = service.getYamlForUser(userEntry);
+ *
+ * assertThat(expectedYaml).isEqualTo(result); }
+ *
+ * }
+ */
}
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserSpecTestFactory.java
index 0e14d9ebe5d34126749f864f2f9dbbf374e83a7d..8c9938cd206e4fe334d4cdd14471d4365c4944b5 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserSpecTestFactory.java
@@ -23,7 +23,6 @@
*/
package de.ozgcloud.operator.elstertransfer.user;
-
public class OzgCloudElsterTransferUserSpecTestFactory {
public static final boolean KEEP_AFTER_DELETE = false;
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserTestFactory.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserTestFactory.java
index 9b2bbc08c14e33efd00ce2a00a658361f18de555..7b78e2b3508b119903d58f9fc9049c6f762a7057 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserTestFactory.java
@@ -27,7 +27,6 @@ public class OzgCloudElsterTransferUserTestFactory {
public static final String METADATA_NAMESPACE = "TestNamespace";
-
public static OzgCloudElsterTransferUser create() {
return createWithSpec(OzgCloudElsterTransferUserSpecTestFactory.create());
}