From 7fb3dbed4c2450f600d4fdecabd09da51c03ef12 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 19 Nov 2020 16:42:57 -0500
Subject: Remove hard-coded credentials from application.properties

Remove hard-coded credentials from application.properties and
use env variables instead.  Note: we still have hard-coded
credentials in dblib.properties and svclogic.properties that
should be changed, but this will require coordinated changes in
sli/core to be able to interpret env variables within properties
files.

Change-Id: I5a31fae6f81233682bee20a5cb531b7f0a21a3a7
Issue-ID: SDNC-1411
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 ms/generic-resource-api/pom.xml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'ms/generic-resource-api/pom.xml')

diff --git a/ms/generic-resource-api/pom.xml b/ms/generic-resource-api/pom.xml
index cc6471d..d73024d 100644
--- a/ms/generic-resource-api/pom.xml
+++ b/ms/generic-resource-api/pom.xml
@@ -34,6 +34,10 @@
         <sdnc.gra.jar>${project.artifactId}-${project.version}.jar</sdnc.gra.jar>
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
+        <gratest.mysql.database>gradb</gratest.mysql.database>
+        <gratest.mysql.root.password>itsASecret</gratest.mysql.root.password>
+        <gratest.mysql.user>gra</gratest.mysql.user>
+        <gratest.mysql.password>test123</gratest.mysql.password>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -500,10 +504,10 @@
                                             <alias>gradb</alias>
                                             <run>
                                                 <env>
-                                                    <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <MYSQL_USER>sdnc</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>abc123</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <MYSQL_ROOT_PASSWORD>${gratest.mysql.root.password}</MYSQL_ROOT_PASSWORD>
+                                                    <MYSQL_USER>${gratest.mysql.user}</MYSQL_USER>
+                                                    <MYSQL_PASSWORD>${gratest.mysql.password}</MYSQL_PASSWORD>
+                                                    <MYSQL_DATABASE>${gratest.mysql.database}</MYSQL_DATABASE>
                                                 </env>
                                                 <network>
                                                     <mode>custom</mode>
@@ -523,9 +527,10 @@
                                             <alias>gra-container</alias>
                                             <run>
                                                 <env>
-                                                    <MYSQL_USER>sdnc</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>abc123</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <MYSQL_USER>${gratest.mysql.user}</MYSQL_USER>
+                                                    <MYSQL_PASSWORD>${gratest.mysql.password}</MYSQL_PASSWORD>
+                                                    <MYSQL_DATABASE>${gratest.mysql.database}</MYSQL_DATABASE>
+                                                    <LOG_LEVEL>TRACE</LOG_LEVEL>
                                                     <SDNC_CONFIG_DIR>/opt/onap/sdnc/config</SDNC_CONFIG_DIR>
                                                 </env>
                                                 <dependsOn>
-- 
cgit 1.2.3-korg