From d626bd5433d233bfd0b1424f053cd820ed14b471 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 15:44:10 +0100
Subject: [PATCH] OZG-6177 set ETR_NAMESPACE from env
---
.../operator/elstertransfer/user/Constants.java | 6 ------
.../user/OzgCloudElsterTransferUserService.java | 16 ++++++++++------
src/main/resources/application.yml | 5 +----
...CloudElsterTransferUserRemoteServiceTest.java | 2 +-
.../OzgCloudElsterTransferUserServiceTest.java | 2 +-
5 files changed, 13 insertions(+), 18 deletions(-)
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 dce10f3..883044e 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java
@@ -22,18 +22,12 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
package de.ozgcloud.operator.elstertransfer.user;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-@Configuration
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 ELSTER_TRANSFER_USER_PASSWORD_KEY = "password";
- @Value("${etr.namespace}")
- public static String ETR_NAMESPACE;
public static final String USER_ROLE = "USER";
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/OzgCloudElsterTransferUserService.java b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
index 3af5847..eb80ad7 100644
--- a/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
+++ b/src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.UUID;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCrypt;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.Yaml;
@@ -49,12 +50,15 @@ public class OzgCloudElsterTransferUserService {
private final OzgCloudElsterTransferUserRemoteService remoteService;
+ @Value("${etr.namespace}")
+ private String etrNamespace;
+
public void updateConfigMapAndRestartDeploymentAndCreateSecret(String namespace) {
LOG.info("Updating/Creating Configmap");
- if (!userExists(namespace, Constants.ETR_NAMESPACE, Constants.CONFIG_MAP_NAME)) {
- String userPassword = updateConfigMapAndGenerateUserPassword(namespace, Constants.ETR_NAMESPACE, Constants.CONFIG_MAP_NAME);
+ if (!userExists(namespace, etrNamespace, Constants.CONFIG_MAP_NAME)) {
+ String userPassword = updateConfigMapAndGenerateUserPassword(namespace, etrNamespace, Constants.CONFIG_MAP_NAME);
LOG.info("Restarting Deployment");
- restartDeployment(Constants.ETR_NAMESPACE, Constants.ETR_DEPLOYMENT_NAME);
+ restartDeployment(etrNamespace, Constants.ETR_DEPLOYMENT_NAME);
LOG.info("Creating Secret");
createOrUpdateSecret(namespace, userPassword, Constants.MUK_USER_SECRET_NAME);
@@ -63,13 +67,13 @@ public class OzgCloudElsterTransferUserService {
public void delete(OzgCloudElsterTransferUser user) {
String namespace = user.getMetadata().getNamespace();
- if (!userExists(namespace, Constants.ETR_NAMESPACE, Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)) {
+ if (!userExists(namespace, etrNamespace, Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)) {
LOG.info("User not exists");
return;
}
LOG.info("{} do cleanup...", user.getMetadata());
deleteUser(user.getMetadata().getNamespace(), Constants.ELSTER_TRANSFER_USER_LOGIN_KEY);
- restartDeployment(Constants.ETR_NAMESPACE, Constants.ETR_DEPLOYMENT_NAME);
+ restartDeployment(etrNamespace, Constants.ETR_DEPLOYMENT_NAME);
}
String updateConfigMapAndGenerateUserPassword(String namespace, String configmapNamespace, String configMapName) {
@@ -120,7 +124,7 @@ public class OzgCloudElsterTransferUserService {
}
void deleteUser(String userLogin, String configMapName) {
- ConfigMap configMap = getConfigMap(Constants.ETR_NAMESPACE, configMapName);
+ ConfigMap configMap = getConfigMap(etrNamespace, configMapName);
OzgCloudElsterTransferConfigMapUserList usersList = getUsersFromConfigMap(configMap);
usersList.removeDeleted(userLogin);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 33c0991..7b2723a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,8 +21,5 @@ management:
web:
exposure:
include: "*"
-
-
etr:
- namespace: elster-transfer
-
\ No newline at end of file
+ namespace: "elster-transfer"
\ No newline at end of file
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 eed1844..58df421 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteServiceTest.java
@@ -94,7 +94,7 @@ class OzgCloudElsterTransferUserRemoteServiceTest {
private static final String configMapName = Constants.CONFIG_MAP_NAME;
private static final String deploymentName = Constants.ETR_DEPLOYMENT_NAME;
private static final String secretName = Constants.MUK_USER_SECRET_NAME;
- private static final String configmapNamespace = Constants.ETR_NAMESPACE;
+ private static final String configmapNamespace = "elster-transfer";
@DisplayName("test ConfigMap")
@Nested
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 f45a414..d2314f5 100644
--- a/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserServiceTest.java
@@ -62,7 +62,7 @@ class OzgCloudElsterTransferUserServiceTest {
private static final String configMapName = Constants.CONFIG_MAP_NAME;
private static final String deploymentName = Constants.ETR_DEPLOYMENT_NAME;
private static final String secretName = Constants.MUK_USER_SECRET_NAME;
- private static final String configMapNamespace = Constants.ETR_NAMESPACE;
+ private static final String configMapNamespace = "elster-transfer";
private static final String usersKey = Constants.USERS_KEY;
/*
--
GitLab