From: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>
Date: Mon, 21 Jan 2019 14:48:30 +0000 (-0500)
Subject: support reading passwords from environment
X-Git-Tag: 1.4.2~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsearch-data-service.git;a=commitdiff_plain;h=a46ee0480358b5c10d6fc3ac3c644b0d3d71f1a8

support reading passwords from environment

support reading passwords from environment

Change-Id: I713bddf0e6fa2e8c90de7023c8ca13138fcc1fbe
Issue-ID: AAI-2083
Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>
---

diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
index f4bc5ef..4680ded 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/config/ElasticSearchConfig.java
@@ -209,7 +209,7 @@ public class ElasticSearchConfig {
           if(passwordValue.get().startsWith("OBF:")){
             setTrustStorePassword(Password.deobfuscate(passwordValue.get()));
           }else if(passwordValue.get().startsWith("ENV:")){
-              setTrustStorePassword(System.getProperty(StringUtils.removeStart(passwordValue.get(), "ENV:")));
+              setTrustStorePassword(System.getenv(StringUtils.removeStart(passwordValue.get(), "ENV:")));
           }
           else{
             setTrustStorePassword(passwordValue.get());
@@ -226,7 +226,7 @@ public class ElasticSearchConfig {
           if(passwordValue.get().startsWith("OBF:")){
             setKeyStorePassword(Password.deobfuscate(passwordValue.get()));
           }else if(passwordValue.get().startsWith("ENV:")){
-            setKeyStorePassword(System.getProperty(StringUtils.removeStart(passwordValue.get(), "ENV:")));
+            setKeyStorePassword(System.getenv(StringUtils.removeStart(passwordValue.get(), "ENV:")));
            }
           else{
             setKeyStorePassword(passwordValue.get());