[MOSIP-37808] Updated DB attributes of MOSIP for audit service

db_scripts/mosip_audit/db.sql

@@ -1,17 +1,16 @@
-CREATE DATABASE mosip_audit 
-	ENCODING = 'UTF8' 
-	LC_COLLATE = 'en_US.UTF-8' 
-	LC_CTYPE = 'en_US.UTF-8' 
-	TABLESPACE = pg_default 
+CREATE DATABASE :mosipdbname
+	ENCODING = 'UTF8'
+	LC_COLLATE = 'en_US.UTF-8'
+	LC_CTYPE = 'en_US.UTF-8'
+	TABLESPACE = pg_default
 	OWNER = postgres
 	TEMPLATE  = template0;
 
-COMMENT ON DATABASE mosip_audit IS 'Audit related logs and the data is stored in this database';
+COMMENT ON DATABASE :mosipdbname IS 'Audit related logs and the data is stored in this database';
 
-\c mosip_audit postgres
+\c :mosipdbname postgres
 
 DROP SCHEMA IF EXISTS audit CASCADE;
 CREATE SCHEMA audit;
 ALTER SCHEMA audit OWNER TO postgres;
-ALTER DATABASE mosip_audit SET search_path TO audit,pg_catalog,public;
-
+ALTER DATABASE :mosipdbname SET search_path TO audit,pg_catalog,public;

db_scripts/mosip_audit/ddl.sql

@@ -1,5 +1,6 @@
-\c mosip_audit postgres
+\c :mosipdbname postgres
 
 \ir ddl/audit-app_audit_log.sql
 
 
+

db_scripts/mosip_audit/deploy.properties

@@ -3,4 +3,5 @@ DB_PORT=
 SU_USER=
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_audit
+DB_UNAME=audituser
 DML_FLAG=0

db_scripts/mosip_audit/deploy.sh

@@ -16,30 +16,29 @@ else
 fi
 
 ## Terminate existing connections
-echo "Terminating active connections" 
+echo "Terminating active connections"
 CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;)
 echo "Terminated connections"
 
 ## Drop db and role
 echo "Dropping DB"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql -v mosipdbname=$MOSIP_DB_NAME
 echo "Dropping user"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql -v dbuname=$DB_UNAME
 
 ## Create DB
 echo "Creating DB and tables"
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql 
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql 
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -v mosipdbname=$MOSIP_DB_NAME
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Create users
-echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee 
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' 
-PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql 
+echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' -v dbuname=$DB_UNAME
+PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME
 
 ## Populate tables
 if [ ${DML_FLAG} == 1 ]
 then
-    echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" 
-    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql 
+    echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database"
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql -v mosipdbname=$MOSIP_DB_NAME
 fi
-

db_scripts/mosip_audit/drop_db.sql

@@ -1,2 +1 @@
-DROP DATABASE IF EXISTS mosip_audit;
-
+DROP DATABASE IF EXISTS :mosipdbname;

db_scripts/mosip_audit/drop_role.sql

@@ -1 +1 @@
-drop role if exists audituser;
+drop role if exists :dbuname;

db_scripts/mosip_audit/grants.sql

@@ -1,17 +1,16 @@
-\c mosip_audit 
+\c :mosipdbname
 
 GRANT CONNECT
-   ON DATABASE mosip_audit
+   ON DATABASE :mosipdbname
    TO audituser;
 
 GRANT USAGE
    ON SCHEMA audit
-   TO audituser;
+   TO :dbuname;
 
 GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES
-   ON ALL TABLES IN SCHEMA audit
-   TO audituser;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA audit 
-	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO audituser;
+      ON ALL TABLES IN SCHEMA audit
+          TO :dbuname;
 
+ALTER DEFAULT PRIVILEGES IN SCHEMA audit
+	GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname;

db_scripts/mosip_audit/role_dbuser.sql

@@ -1,4 +1,4 @@
-CREATE ROLE audituser WITH 
-	INHERIT
-	LOGIN
-	PASSWORD :dbuserpwd;
+CREATE ROLE :dbuname WITH
+    INHERIT
+    LOGIN
+    PASSWORD :dbuserpwd;