From e0f7d51c305a66cca2435b399a6097e413469418 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Dec 2023 10:52:08 +0100
Subject: [PATCH] OZG-4453 adjust properties; add scheme to client
---
.../operator/OzgCloudElasticsearchProperties.java | 2 +-
.../operator/OzgCloudElasticsearchSecretHelper.java | 2 +-
.../ElasticsearchClientConfiguration.java | 2 +-
.../src/main/resources/application.yml | 6 +++---
.../operator/ElasticsearchSecretBuilderTest.java | 11 +++++------
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
index f6568e2..b1e2207 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java
@@ -17,6 +17,6 @@ public class OzgCloudElasticsearchProperties {
private String secretDataKey;
private String secretCredentialsName;
private String host;
- private String address;
private int port;
+ private String scheme;
}
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 a062226..2ea1151 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
@@ -34,7 +34,7 @@ public class OzgCloudElasticsearchSecretHelper {
}
private String buildSecretAddress() {
- return String.format("%s:%s", properties.getAddress(), properties.getPort());
+ return String.format("%s:%s", properties.getHost(), properties.getPort());
}
private String generatePassword() {
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 51bde55..3beb84b 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
@@ -47,7 +47,7 @@ public class ElasticsearchClientConfiguration {
}
private HttpHost createHttpHost() {
- return new HttpHost(elasticSearchProperties.getHost(), elasticSearchProperties.getPort());
+ return new HttpHost(elasticSearchProperties.getHost(), elasticSearchProperties.getPort(), elasticSearchProperties.getScheme());
}
private RestClientTransport createRestClientTransport(RestClient restClient) {
diff --git a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
index 345aceb..620fb6f 100644
--- a/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
+++ b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
@@ -4,6 +4,6 @@ ozgcloud:
secretName: ozg-search-cluster-es-elastic-user
secretDataKey: elastic
secretCredentialsName: elasticsearch-credentials
- host: https://ozg-search-cluster-es-http
- address: ozg-search-cluster-es-http.elastic-system
- port: 9200
\ No newline at end of file
+ host: ozg-search-cluster-es-http
+ port: 9200
+ scheme: https
\ No newline at end of file
diff --git a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
index 2d5e6fa..4477189 100644
--- a/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
+++ b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticsearchSecretBuilderTest.java
@@ -11,7 +11,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.operator.OzgCloudElasticsearchSecretHelper;
import de.ozgcloud.operator.common.kubernetes.NamespaceTestFactory;
import de.ozgcloud.operator.common.kubernetes.SecretTestFactory;
import io.fabric8.kubernetes.api.model.Secret;
@@ -28,12 +27,12 @@ class ElasticsearchSecretBuilderTest {
@Nested
class TestBuildCredentialsSecret {
- private final static String ADDRESS = "dummyAddress";
+ private final static String HOST = "dummyHost";
private final static int PORT = 42;
@BeforeEach
void mockProperties() {
- when(properties.getAddress()).thenReturn(ADDRESS);
+ when(properties.getHost()).thenReturn(HOST);
when(properties.getPort()).thenReturn(PORT);
}
@@ -71,14 +70,14 @@ class ElasticsearchSecretBuilderTest {
void shouldBeSet() {
var secret = buildCredentialSecret();
- assertThat(secret.getStringData()).containsEntry(OzgCloudElasticsearchSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", ADDRESS, PORT));
+ assertThat(secret.getStringData()).containsEntry(OzgCloudElasticsearchSecretHelper.SECRET_ADDRESS_FIELD, String.format("%s:%s", HOST, PORT));
}
@Test
- void shouldGetAddressFromProperties() {
+ void shouldGetHostFromProperties() {
buildCredentialSecret();
- verify(properties).getAddress();
+ verify(properties).getHost();
}
@Test
--
GitLab