From c13e1cf6b52824eea9bfd13cc57a53dd0088a3bc Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Fri, 22 Apr 2022 13:37:13 +0200
Subject: [PATCH] TSK-1831: removed old taskanaUnitTest.properties file in db
 scripts

Co-authored-by: Yakup Ensar Evli <54323073+ensarevlideveloper@users.noreply.github.com>
Co-authored-by: ryzheboka <25465835+ryzheboka@users.noreply.github.com>
Co-authored-by: knht <43456808+knht@users.noreply.github.com>
---
 docker-databases/prepare_db.bat | 26 ++------------------------
 docker-databases/prepare_db.sh  | 16 ----------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/docker-databases/prepare_db.bat b/docker-databases/prepare_db.bat
index 04857cdfa..0c01c5efd 100644
--- a/docker-databases/prepare_db.bat
+++ b/docker-databases/prepare_db.bat
@@ -1,6 +1,5 @@
 @ECHO OFF
 SETLOCAL
-SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
 
 :MENU
     ECHO.
@@ -15,7 +14,6 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     ECHO 4 - Stop  POSTGRES 10
     ECHO.
     ECHO 5 - Stop all
-    ECHO 6 - Remove %PROP_FILE%
     ECHO.
     SET /P MENU=Select task then press ENTER:
     ECHO.
@@ -24,7 +22,6 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     IF [%MENU%]==[3] GOTO START_POSTGRES_10
     IF [%MENU%]==[4] GOTO STOP_POSTGRES_10
     IF [%MENU%]==[5] GOTO STOP_ALL
-    IF [%MENU%]==[6] GOTO REMOVE_PROP
     EXIT /B
 
 :START_DB2_11_5
@@ -32,11 +29,6 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
     docker-compose -f %~dp0/docker-compose.yml up -d taskana-db2_11-5
 
-    ECHO jdbcDriver=com.ibm.db2.jcc.DB2Driver> %PROP_FILE%
-    ECHO jdbcUrl=jdbc:db2://localhost:5101/tskdb>> %PROP_FILE%
-    ECHO dbUserName=db2inst1>> %PROP_FILE%
-    ECHO dbPassword=db2inst1-pwd>> %PROP_FILE%
-    ECHO schemaName=TASKANA>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
@@ -45,18 +37,13 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
     docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-db2_11-5
     ECHO ---
-    GOTO REMOVE_PROP
+    GOTO MENU
 
 :START_POSTGRES_10
     ECHO ---
     ECHO docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_10
     docker-compose -f %~dp0/docker-compose.yml up -d taskana-postgres_10
 
-    ECHO jdbcDriver=org.postgresql.Driver> %PROP_FILE%
-    ECHO jdbcUrl=jdbc:postgresql://localhost:5102/postgres>> %PROP_FILE%
-    ECHO dbUserName=postgres>> %PROP_FILE%
-    ECHO dbPassword=postgres>> %PROP_FILE%
-    ECHO schemaName=taskana>> %PROP_FILE%
     ECHO ---
     GOTO MENU
 
@@ -66,20 +53,11 @@ SET PROP_FILE=%HOMEPATH%\taskanaUnitTest.properties
     ECHO docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_10
     docker-compose -f %~dp0/docker-compose.yml rm -f -s -v taskana-postgres_10
     ECHO ---
-    GOTO REMOVE_PROP
+    GOTO MENU
 
 :STOP_ALL
     ECHO ---
     ECHO docker-compose -f %~dp0/docker-compose.yml down -v
     docker-compose -f %~dp0/docker-compose.yml down -v
     ECHO ---
-    GOTO REMOVE_PROP
-
-:REMOVE_PROP
-    ECHO ---
-    IF EXIST %PROP_FILE% (
-        ECHO DEL /F %PROP_FILE%
-        DEL /F %PROP_FILE%
-    )
-    ECHO ---
     GOTO MENU
diff --git a/docker-databases/prepare_db.sh b/docker-databases/prepare_db.sh
index 52646f568..9cb208f0c 100755
--- a/docker-databases/prepare_db.sh
+++ b/docker-databases/prepare_db.sh
@@ -47,38 +47,22 @@ function mapDBToDockerComposeServiceName() {
 
 function main() {
   [[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0
-  propFile="$HOME/taskanaUnitTest.properties"
   scriptDir=$(dirname "$0")
 
   case "$1" in
   H2)
-    [[ -f "$propFile" ]] && rm "$propFile"
     ;;
   DB2|DB2_11_5)
     docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
-
-    echo 'jdbcDriver=com.ibm.db2.jcc.DB2Driver' > $propFile
-    echo 'jdbcUrl=jdbc:db2://localhost:5101/tskdb' >> $propFile
-    echo 'dbUserName=db2inst1' >> $propFile
-    echo 'dbPassword=db2inst1-pwd' >> $propFile
-    echo 'schemaName=TASKANA' >> $propFile
     ;;
   POSTGRES|POSTGRES_10)
     docker-compose -f $scriptDir/docker-compose.yml up -d "$(mapDBToDockerComposeServiceName "$1")"
-   
-    echo 'jdbcDriver=org.postgresql.Driver' > $propFile
-    echo 'jdbcUrl=jdbc:postgresql://localhost:5102/postgres' >> $propFile
-    echo 'dbUserName=postgres' >> $propFile
-    echo 'dbPassword=postgres' >> $propFile
-    echo 'schemaName=taskana' >> $propFile
     ;;
   stop)
     # this variable is necessary, so that the script can terminate properly
     # when the provided database name does not match. PLEASE DO NOT INLINE!
     local composeServiceName="$(mapDBToDockerComposeServiceName "$2")"
     docker-compose -f $scriptDir/docker-compose.yml rm -f -s -v $composeServiceName
-
-    [[ -f "$propFile" ]] && rm "$propFile"
     ;;
   *)
     echo "unknown database '$1'" >&2