From ca219b1901faeb2c81ec5ae4112a4b8f0de227e9 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 3 Jan 2024 17:22:26 +0100
Subject: [PATCH] OZG-4453 get from data instead of string data
---
.../de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java | 2 +-
.../java/de/ozgcloud/operator/OzgCloudElasticsearchService.java | 2 +-
.../operator/OzgCloudElasticsearchSecretHelperTest.java | 2 +-
.../de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
index 73a11bf..2c69358 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java
@@ -48,7 +48,7 @@ public class OzgCloudElasticsearchSecretHelper {
return new SecretBuilder()
.withType(SECRET_TYPE)
.withMetadata(createMetaData(properties.getCertificateSecretName(), namespace))
- .addToStringData(CERTIFICATE_SECRET_DATA_KEY, data)
+ .addToData(CERTIFICATE_SECRET_DATA_KEY, data)
.build();
}
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
index 9f442f7..4ddb321 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java
@@ -143,7 +143,7 @@ public class OzgCloudElasticsearchService {
}
private String getSecretData(Secret secret) {
- return MapUtils.getString(secret.getStringData(), properties.getServer().getCertificateSecretDataKey());
+ return MapUtils.getString(secret.getData(), properties.getServer().getCertificateSecretDataKey());
}
ResourceAdapter<Secret> createAdapter(Resource<Secret> resource) {
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelperTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelperTest.java
index a9d14d9..7959af7 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelperTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelperTest.java
@@ -165,7 +165,7 @@ class OzgCloudElasticsearchSecretHelperTest {
void shouldHaveCaCrtData() {
var secret = builder.buildCertificateSecret(NamespaceTestFactory.NAMESPACE, DATA);
- assertThat(secret.getStringData()).containsExactly(Map.entry(OzgCloudElasticsearchSecretHelper.CERTIFICATE_SECRET_DATA_KEY, DATA));
+ assertThat(secret.getData()).containsExactly(Map.entry(OzgCloudElasticsearchSecretHelper.CERTIFICATE_SECRET_DATA_KEY, DATA));
}
}
}
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
index af4b3b2..d872a0c 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java
@@ -374,7 +374,7 @@ class OzgCloudElasticsearchServiceTest {
private static final String SERVER_CERTIFICATE_SECRET_DATA = LoremIpsum.getInstance().getWords(1);
private static final String SERVER_CERTIFICATE_NAMESPACE = LoremIpsum.getInstance().getWords(1);
private static final Secret SERVER_CERTIFICATE_SECRET = SecretTestFactory.createBuilder()
- .addToStringData(SERVER_CERTIFICATE_SECRET_DATA_KEY, SERVER_CERTIFICATE_SECRET_DATA)
+ .addToData(SERVER_CERTIFICATE_SECRET_DATA_KEY, SERVER_CERTIFICATE_SECRET_DATA)
.build();
private static final Secret CREDENTIAL_SECRET = SecretTestFactory.create();
@Mock
--
GitLab