diff --git a/Jenkinsfile b/Jenkinsfile
index ff1430f2281a2d66c6f70f101a59a7fa9862bccf..9a076e2288ef97a755bdae010e86fcc862c2cdea 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/OzgCloudElsterTransferUserRemoteService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
index a1892cb4a85e529e877174358635ffb029391c55..ffe7d43ec2191ca5a1ce03d6394b4cb480e6d836 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java
@@ -35,7 +35,6 @@ import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.api.model.SecretBuilder;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
import io.fabric8.kubernetes.client.dsl.Resource;
import lombok.RequiredArgsConstructor;
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 946a6965f6442450609234138c3ac2de10043281..656e07c16803817a8e4b33f96eec147641f9bcb1 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
@@ -72,7 +72,7 @@ class OzgCloudElsterTransferUserService {
return;
}
LOG.info("{} do cleanup...", user.getMetadata());
- deleteUser(namespace, etrNamespace);
+ deleteUser(namespace, Constants.CONFIG_MAP_NAME);
restartDeployment(etrNamespace, Constants.ETR_DEPLOYMENT_NAME);
}
@@ -80,7 +80,7 @@ class OzgCloudElsterTransferUserService {
ConfigMap configMap = createOrGetConfigMap(configmapNamespace, configMapName);
String userPassword = generatePassword();
String usersYaml = addUserToUserYaml(getUsersFromConfigMap(configMap), namespace, userPassword);
- updateConfigMap(configMapName, configMap, usersYaml);
+ updateConfigMap(configMap, usersYaml);
return userPassword;
}
@@ -104,7 +104,7 @@ class OzgCloudElsterTransferUserService {
return usersYaml;
}
- void updateConfigMap(String configMapName, ConfigMap configMap, String usersYaml) {
+ void updateConfigMap(ConfigMap configMap, String usersYaml) {
remoteService.updateConfigMapData(configMap, Constants.USERS_KEY, usersYaml);
}
@@ -141,7 +141,7 @@ class OzgCloudElsterTransferUserService {
OzgCloudElsterTransferConfigMapUserList getUsersFromConfigMap(ConfigMap configMap) {
String usersYaml = configMap.getData().get(Constants.USERS_KEY);
- if (Objects.isNull(usersYaml) || usersYaml.isBlank() ) {
+ if (Objects.isNull(usersYaml) || usersYaml.isBlank()) {
LOG.debug("userYaml is empty");
return new OzgCloudElsterTransferConfigMapUserList(new ArrayList<>());
}
diff --git a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java
index c341d909042c3a62c3a072d16b61bde1baabefbf..7e8f0aa875def2ade364546d440901b541441476 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java
@@ -204,7 +204,8 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
@Test
void shouldCreateConfigMap() {
- when(configMapResource.create()).thenReturn(configMap);when(configMapResource.create()).thenReturn(configMap);
+ when(configMapResource.create()).thenReturn(configMap);
+ when(configMapResource.create()).thenReturn(configMap);
ConfigMap result = remoteService.createConfigMap(configmapNamespace, configMapName);
@@ -232,7 +233,7 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
@Test
void shouldBuildConfigMap() {
ConfigMap result = remoteService.buildConfigMap(configMapName);
-
+
assertThat(result.getMetadata()).isNotNull();
assertThat(configMapName).isEqualTo(result.getMetadata().getName());
}
@@ -392,10 +393,11 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
@DisplayName("createOrUpdateSecret")
@Nested
class TestCreateOrUpdateSecret {
- Secret secret;
+ Secret secret;
+
@BeforeEach
void setUp() {
- secret = new SecretBuilder()
+ secret = new SecretBuilder()
.withNewMetadata()
.withName(secretName)
.endMetadata()
@@ -406,7 +408,9 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
@Test
void shouldCallBuildUserSecret() {
- when(client.resource(secret)).thenReturn(namespaceableSecret);
+ when(client.secrets()).thenReturn(secretOperation);
+ when(secretOperation.inNamespace(anyString())).thenReturn(secretOperation);
+ when(secretOperation.resource(any(Secret.class))).thenReturn(secretResource);
remoteService.createOrUpdateSecret(namespace, userPassword, secretName);
@@ -415,11 +419,13 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
@Test
void shouldCallServerSideApply() {
- when(client.resource(secret)).thenReturn(namespaceableSecret);
+ when(client.secrets()).thenReturn(secretOperation);
+ when(secretOperation.inNamespace(anyString())).thenReturn(secretOperation);
+ when(secretOperation.resource(any(Secret.class))).thenReturn(secretResource);
remoteService.createOrUpdateSecret(namespace, userPassword, secretName);
- verify(client.resource(secret)).serverSideApply();
+ verify(client.secrets().inNamespace(namespace).resource(secret)).createOrReplace();
}
@DisplayName("buildUserSecret")
@@ -434,8 +440,10 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
assertThat(secretName).isEqualTo(secret.getMetadata().getName());
assertThat(secret.getData().containsKey(Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)).isTrue();
assertThat(secret.getData().containsKey(Constants.ELSTER_TRANSFER_USER_PASSWORD_KEY)).isTrue();
- assertThat(secret.getData().get(Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)).isEqualTo(Base64.getEncoder().encodeToString(namespace.getBytes()));
- assertThat(secret.getData().get(Constants.ELSTER_TRANSFER_USER_PASSWORD_KEY)).isEqualTo(Base64.getEncoder().encodeToString(userPassword.getBytes()));
+ assertThat(secret.getData().get(Constants.ELSTER_TRANSFER_USER_LOGIN_KEY))
+ .isEqualTo(Base64.getEncoder().encodeToString(namespace.getBytes()));
+ assertThat(secret.getData().get(Constants.ELSTER_TRANSFER_USER_PASSWORD_KEY))
+ .isEqualTo(Base64.getEncoder().encodeToString(userPassword.getBytes()));
}
}
}
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 3372845d2c71e0b594c15d8836b0c641484bc06c..1439d44af50df50cfed74c0e1c66cb66bc0d43f4 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
@@ -177,7 +177,7 @@ class OzgCloudElsterTransferUserServiceTest {
service.updateConfigMapAndGenerateUserPassword(namespace, configMapNamespace, configMapName);
- verify(service).updateConfigMap(configMapName, configMap, usersYaml);
+ verify(service).updateConfigMap(configMap, usersYaml);
}
@Test
@@ -346,7 +346,7 @@ class OzgCloudElsterTransferUserServiceTest {
class TestUpdateConfigMap {
@Test
void shouldCallUpdateConfigMapData() {
- service.updateConfigMap(configMapName, configMap, "usersYaml");
+ service.updateConfigMap(configMap, "usersYaml");
verify(remoteService).updateConfigMapData(configMap, usersKey, "usersYaml");
}
@@ -444,7 +444,7 @@ class OzgCloudElsterTransferUserServiceTest {
service.delete(OzgCloudElsterTransferUserTestFactory.create());
- verify(service).deleteUser(namespace, configMapNamespace);
+ verify(service).deleteUser(namespace, configMapName);
}
@Test