OZG-4453 adjust properties; add scheme to client

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;
 }

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() {

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) {

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
+    host: ozg-search-cluster-es-http
     port: 9200
+    scheme: https
\ No newline at end of file

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