This patch allows to store and get database password from
environment variables. This is needed if we want to send those
variables by helm secrets.
Issue-ID: OOM-2287
Change-Id: I041c3e4dd3b9042b2b6c2b34afc22867bab81b22
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
repUrlList = new ArrayList<>();
repUrlList.add(repUrl);
}
repUrlList = new ArrayList<>();
repUrlList.add(repUrl);
}
- repUserName = config.getProperty("repositoryUsername");
- repPassword = PeCryptoUtils.decrypt(config.getProperty("repositoryPassword"));
+ repUserName = getValue(config.getProperty("repositoryUsername"));
+ repPassword = PeCryptoUtils.decrypt(getValue(config.getProperty("repositoryPassword")));
if (repUserName == null || repPassword == null) {
LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE
+ "repostoryUserName and respositoryPassword properties are required.");
if (repUserName == null || repPassword == null) {
LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE
+ "repostoryUserName and respositoryPassword properties are required.");
+ private String getValue(final String value) {
+ if (value != null && value.matches("[$][{].*[}]$")) {
+ return System.getenv(value.substring(2, value.length() - 1));
+ }
+ return value;
+ }
+
private static void setBackupMonitor(final BackUpMonitor instance) {
bm = instance;
}
private static void setBackupMonitor(final BackUpMonitor instance) {
bm = instance;
}
setLogFileProperties(splitString);
jdbcUrl = config.getProperty("JDBC_URL").replace("'", "");
setLogFileProperties(splitString);
jdbcUrl = config.getProperty("JDBC_URL").replace("'", "");
- jdbcUser = config.getProperty("JDBC_USER");
+ jdbcUser = getValue(config.getProperty("JDBC_USER"));
jdbcDriver = config.getProperty("JDBC_DRIVER");
PeCryptoUtils.initAesKey(config.getProperty(PROP_AES_KEY));
jdbcDriver = config.getProperty("JDBC_DRIVER");
PeCryptoUtils.initAesKey(config.getProperty(PROP_AES_KEY));
- jdbcPassword = PeCryptoUtils.decrypt(config.getProperty("JDBC_PASSWORD"));
+ jdbcPassword = PeCryptoUtils.decrypt(getValue(config.getProperty("JDBC_PASSWORD")));
config.setProperty("javax.persistence.jdbc.password", jdbcPassword);
return config;
config.setProperty("javax.persistence.jdbc.password", jdbcPassword);
return config;
+ private static String getValue(final String value) {
+ if (value != null && value.matches("[$][{].*[}]$")) {
+ return System.getenv(value.substring(2, value.length() - 1));
+ }
+ return value;
+ }
+
public static Connection getDbConnection() {
return dbConnection(jdbcDriver, jdbcUrl, jdbcUser, jdbcPassword);
}
public static Connection getDbConnection() {
return dbConnection(jdbcDriver, jdbcUrl, jdbcUser, jdbcPassword);
}