From f42b0fc3b02fa45daf836c3d160bec9571d1816e Mon Sep 17 00:00:00 2001
From: Hema Vishnu Pola <hepola@microsoft.com>
Date: Wed, 15 Jul 2020 14:46:52 +0530
Subject: [PATCH 1/3] Added config based disabling of ssl for elastic search.

---
 pom.xml                                       |  2 +-
 .../ElasticCredentialRepository.java          | 46 ++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e6379c3..46b526d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.9</version>
+  <version>0.0.10</version>
   <name>core-lib-azure</name>
 
   <properties>
diff --git a/src/main/java/org/opengroup/osdu/elastic/dependencies/ElasticCredentialRepository.java b/src/main/java/org/opengroup/osdu/elastic/dependencies/ElasticCredentialRepository.java
index bdd844bf..e43abb6d 100644
--- a/src/main/java/org/opengroup/osdu/elastic/dependencies/ElasticCredentialRepository.java
+++ b/src/main/java/org/opengroup/osdu/elastic/dependencies/ElasticCredentialRepository.java
@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.elastic.dependencies;
 
+import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.security.keyvault.secrets.SecretClient;
 import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
 import lombok.AllArgsConstructor;
@@ -61,7 +62,8 @@ public class ElasticCredentialRepository implements IElasticRepository {
         URL esURL = getElasticURL();
         String username = getSecretWithValidation("elastic-username");
         String password = getSecretWithValidation("elastic-password");
-        return buildSettings(esURL, username, password);
+        boolean sslEnabled = Boolean.parseBoolean(getSecretWithDefault("elastic-ssl-enabled", "true"));
+        return buildSettings(esURL, username, password, sslEnabled);
     }
 
     /**
@@ -69,17 +71,28 @@ public class ElasticCredentialRepository implements IElasticRepository {
      * @param esURL URL for ES cluster
      * @param username Username for ES cluster
      * @param password Password for ES cluster
+     * @param sslEnabled ES cluster ssl communication enabled or not
      * @return {@link ClusterSettings} representing the cluster
      */
     private ClusterSettings buildSettings(
             final URL esURL,
             final String username,
-            final String password) {
-        failIfNotHTTPS(esURL);
-        return ClusterSettings.builder()
+            final String password,
+            final boolean sslEnabled) {
+        ClusterSettings.ClusterSettingsBuilder builder = ClusterSettings.builder()
                 .host(esURL.getHost())
                 .port(esURL.getPort())
-                .userNameAndPassword(String.format("%s:%s", username, password))
+                .userNameAndPassword(String.format("%s:%s", username, password));
+
+        if (!sslEnabled) {
+            return builder
+                    .https(false)
+                    .tls(false)
+                    .build();
+        }
+
+        failIfNotHTTPS(esURL);
+        return builder
                 .https(true)
                 .tls(true)
                 .build();
@@ -125,6 +138,27 @@ public class ElasticCredentialRepository implements IElasticRepository {
         String secretValue = secret.getValue();
         Validators.checkNotNullAndNotEmpty(secretValue, "Secret Value for Secret with name " + secretName);
 
-        return secretValue;
+        return secret.getValue();
     }
+
+    /**
+     * Get the secret with a default value. If the secret is not found or is null return the default value.
+     * @param secretName name of secret
+     * @param defaultValue to be used in case the secret is null or empty.
+     * @return Secret value. It is guaranteed to be returned with either default value or a non null, non empty secret.
+     */
+    private String getSecretWithDefault(final String secretName, final String defaultValue) {
+        Validators.checkNotNull(secretName, "Secret with name " + secretName);
+        KeyVaultSecret secret;
+        try {
+            secret = secretClient.getSecret(secretName);
+            if (secret == null || secret.getValue() == null || secret.getValue().isEmpty()) {
+                return defaultValue;
+            }
+        } catch (ResourceNotFoundException secretNotFound) {
+            return defaultValue;
+        }
+        return secret.getValue();
+    }
+
 }
-- 
GitLab


From c766b9a750830b626c84e862d8cb7981b4a0018b Mon Sep 17 00:00:00 2001
From: Hema Vishnu Pola <hepola@microsoft.com>
Date: Thu, 23 Jul 2020 08:34:01 +0530
Subject: [PATCH 2/3] incrementing the version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46b526d6..a45e4189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.10</version>
+  <version>0.0.11</version>
   <name>core-lib-azure</name>
 
   <properties>
-- 
GitLab


From a793a55b31b484d96827fa40761e10ce46eb6350 Mon Sep 17 00:00:00 2001
From: Hema Vishnu Pola <hepola@microsoft.com>
Date: Tue, 28 Jul 2020 19:24:39 +0530
Subject: [PATCH 3/3] updated version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 33c4dcd2..d2b2be31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.0.11</version>
+  <version>0.0.12</version>
   <name>core-lib-azure</name>
 
   <properties>
-- 
GitLab