From d92ef615ba0b1c1ba4b9f33f603c35ed45e99be2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Dec 2023 20:16:26 +0100
Subject: [PATCH] OZG-4453 get password from data instead of string data
---
.../ElasticsearchClientConfiguration.java | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
index e52768a..c2eea9d 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java
@@ -67,31 +67,18 @@ public class ElasticsearchClientConfiguration {
String getPassword() {
log.info(String.format("get password from secret: %s in namespace %s", elasticSearchProperties.getServer().getSecretName(), elasticSearchProperties.getServer().getNamespace()));
var secret = getCredentialsSecret();
- log.info(String.format("secret string data: %s", secret.getStringData()));
- printMap(secret.getStringData());
log.info(String.format("secret data: %s", secret.getData()));
- printMap(secret.getData());
var password = getPasswordFromSecret(secret);
log.info(String.format("used password: %s", password));
return password;
}
- //DEBUG
- public void printMap(Map<String, String> map) {
- var it = map.entrySet().iterator();
- while (it.hasNext()) {
- var pair = (Map.Entry)it.next();
- log.info(String.format("data pair: key: %s, value: %s", pair.getKey(), pair.getValue()));
- }
- }
- //
-
private Secret getCredentialsSecret() {
return kubernetesService.getSecretResource(elasticSearchProperties.getServer().getNamespace(), elasticSearchProperties.getServer().getSecretName()).get();
}
private String getPasswordFromSecret(Secret secret) {
- var encodedPassword = MapUtils.getString(secret.getStringData(), elasticSearchProperties.getServer().getSecretDataKey());
+ var encodedPassword = MapUtils.getString(secret.getData(), elasticSearchProperties.getServer().getSecretDataKey());
return decode(encodedPassword, secret);
}
--
GitLab