[MOSIP-37808] Updated DB attributes of keymanager

db_scripts/mosip_keymgr/db.sql

@@ -1,16 +1,16 @@
-CREATE DATABASE mosip_keymgr
+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_keymgr IS 'Key Manager database maintains common / system configurations, data related to key services like encryption, decryption keys, certificates..etc';
+COMMENT ON DATABASE :mosipdbname IS 'Key Manager database maintains common / system configurations, data related to key services like encryption, decryption keys, certificates..etc';
 
-\c mosip_keymgr 
+\c :mosipdbname
 
 DROP SCHEMA IF EXISTS keymgr CASCADE;
 CREATE SCHEMA keymgr;
 ALTER SCHEMA keymgr OWNER TO postgres;
 
-ALTER DATABASE mosip_keymgr SET search_path TO keymgr,pg_catalog,public;
+ALTER DATABASE :mosipdbname SET search_path TO keymgr,pg_catalog,public;

db_scripts/mosip_keymgr/ddl.sql

@@ -1,4 +1,4 @@
-\c mosip_keymgr 
+\c :mosipdbname
 
 \ir ddl/keymgr-key_alias.sql
 \ir ddl/keymgr-key_policy_def.sql
@@ -10,4 +10,3 @@
 \ir ddl/keymgr-licensekey_permission.sql
 \ir ddl/keymgr-tsp_licensekey_map.sql
 \ir ddl/keymgr-fk.sql
-

db_scripts/mosip_keymgr/deploy.properties

@@ -3,4 +3,5 @@ DB_PORT=5432
 SU_USER=postgres
 DEFAULT_DB_NAME=postgres
 MOSIP_DB_NAME=mosip_keymgr
+DB_UNAME=keymgruser
 DML_FLAG=1

db_scripts/mosip_keymgr/deploy.sh

@@ -16,32 +16,31 @@ 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 users
-echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" 
-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\'
+echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users"
+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
 
 ## Create DB
 echo "Creating 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 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
 
 ## Grants
-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
+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_keymgr/dml.sql

@@ -1,5 +1,5 @@
-\c mosip_keymgr 
+\c :mosipdbname
 
 TRUNCATE TABLE keymgr.key_policy_def cascade ;
 
-\COPY keymgr.key_policy_def (app_id,key_validity_duration,is_active,cr_by,cr_dtimes,pre_expire_days,access_allowed) FROM './dml/keymgr-key_policy_def.csv' delimiter ',' HEADER  csv;
+\COPY keymgr.key_policy_def (app_id,key_validity_duration,is_active,cr_by,cr_dtimes,pre_expire_days,access_allowed) FROM './dml/keymgr-key_policy_def.csv' delimiter ',' HEADER  csv;

db_scripts/mosip_keymgr/drop_db.sql

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

db_scripts/mosip_keymgr/drop_role.sql

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

db_scripts/mosip_keymgr/grants.sql

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

db_scripts/mosip_keymgr/role_dbuser.sql

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