Merge pull request #66 from AbsaOSS/refactor/boilerplate

Refactor/boilerplate

Author: mirgee

ci/docker-compose.agency-ca.yml

@@ -21,7 +21,6 @@ services:
       - SERVER_PORT=8080
       - SERVER_MAX_REQUEST_SIZE_KB=300
 
-      - PG_WALLET_MIN_IDLE_COUNT=0
       - PG_WALLET_MAX_CONNECTIONS=90
       - PG_WALLET_CONNECTION_TIMEOUT_MINS=30
 

ci/docker-compose.agency-ea.yml

@@ -20,7 +20,6 @@ services:
       - SERVER_PORT=8080
       - SERVER_MAX_REQUEST_SIZE_KB=300
 
-      - PG_WALLET_MIN_IDLE_COUNT=0
       - PG_WALLET_MAX_CONNECTIONS=90
       - PG_WALLET_CONNECTION_TIMEOUT_MINS=30
 

vcxagency-node/CONFIGURATION.md

@@ -36,8 +36,6 @@ Following options configure pgsql for storing wallets.
 - `PG_WALLET_ADMIN_PASSWORD_SECRET` - Password for username `<PG_WALLET_ADMIN_ACCOUNT>`.
 
 ### Wallet pgsql storage options
-- `PG_WALLET_MIN_IDLE_COUNT` - Sets the minimum idle connection count maintained by the pgsql connection pool. 
-   Example value `1`.
 - `PG_WALLET_MAX_CONNECTIONS` - Sets the maximum number of connections managed by the pool. Example value `90`.
 - `PG_WALLET_CONNECTION_TIMEOUT_MINS` - Sets the idle timeout used by the pool. Example value `30`.
 

vcxagency-node/Dockerfile

@@ -26,39 +26,6 @@ LABEL org.label-schema.description="Node VCX Agency"
 ENV LOG_LEVEL ${LOG_LEVEL:-'true'}
 ENV LOG_ENABLE_INDYSDK ${LOG_ENABLE_INDYSDK:-'false'}
 ENV LOG_JSON_TO_CONSOLE ${LOG_JSON_TO_CONSOLE:-'true'}
-ENV SERVER_MAX_REQUEST_SIZE_KB ${SERVER_MAX_REQUEST_SIZE_KB:-'300'}
-ENV SERVER_PORT ${SERVER_PORT}
-ENV SERVER_ENABLE_TLS ${SERVER_ENABLE_TLS}
-ENV CERTIFICATE_PATH ${CERTIFICATE_PATH}
-ENV CERTIFICATE_KEY_PATH ${CERTIFICATE_KEY_PATH}
-
-ENV AGENCY_WALLET_NAME ${AGENCY_WALLET_NAME}
-ENV AGENCY_DID ${AGENCY_DID}
-ENV AGENCY_SEED_SECRET ${AGENCY_SEED_SECRET}
-ENV AGENCY_WALLET_KEY_SECRET ${AGENCY_WALLET_KEY_SECRET}
-
-ENV AGENCY_TYPE ${AGENCY_TYPE}
-ENV REDIS_URL ${REDIS_URL}
-
-ENV PG_STORE_HOST ${PG_STORE_HOST}
-ENV PG_STORE_PORT ${PG_STORE_PORT}
-ENV PG_STORE_ACCOUNT ${PG_STORE_ACCOUNT}
-ENV PG_STORE_PASSWORD_SECRET ${PG_STORE_PASSWORD_SECRET}
-ENV PG_STORE_DATABASE ${PG_STORE_DATABASE}
-
-ENV PG_WALLET_ACCOUNT ${PG_WALLET_ACCOUNT}
-ENV PG_WALLET_PASSWORD_SECRET ${PG_WALLET_PASSWORD_SECRET}
-ENV PG_WALLET_ADMIN_ACCOUNT ${PG_WALLET_ADMIN_ACCOUNT}
-ENV PG_WALLET_ADMIN_PASSWORD_SECRET ${PG_WALLET_ADMIN_PASSWORD_SECRET}
-
-ENV PG_WALLET_URL ${PG_WALLET_URL}
-ENV PG_WALLET_MIN_IDLE_COUNT ${PG_WALLET_MIN_IDLE_COUNT:-1}
-ENV PG_WALLET_MAX_CONNECTIONS ${PG_WALLET_MAX_CONNECTIONS:-'90'}
-ENV PG_WALLET_CONNECTION_TIMEOUT_MINS ${PG_WALLET_CONNECTION_TIMEOUT_MINS:-'30'}
-
-ENV AWS_S3_BUCKET_CERT = ${AWS_S3_BUCKET_CERT}
-ENV AWS_S3_PATH_CERT = ${AWS_S3_PATH_CERT}
-ENV AWS_S3_PATH_CERT_KEY = ${AWS_S3_PATH_CERT_KEY}
 
 EXPOSE ${SERVER_PORT}
 

vcxagency-node/config/localhost-ca.env

@@ -4,8 +4,6 @@ LOG_JSON_TO_CONSOLE=false
 SERVER_PORT=8080
 SERVER_MAX_REQUEST_SIZE_KB=300
 SERVER_ENABLE_TLS=false
-CERTIFICATE_PATH=
-CERTIFICATE_KEY_PATH=
 
 AGENCY_WALLET_NAME=vcxagency-node
 AGENCY_DID=VsKV7grR1BUE29mG2Fm2kX
@@ -27,6 +25,5 @@ PG_WALLET_ADMIN_ACCOUNT=postgres
 PG_WALLET_ADMIN_PASSWORD_SECRET=mysecretpassword
 
 PG_WALLET_URL=localhost:5432
-PG_WALLET_MIN_IDLE_COUNT=0
 PG_WALLET_MAX_CONNECTIONS=90
 PG_WALLET_CONNECTION_TIMEOUT_MINS=30

vcxagency-node/config/localhost-ea.env

@@ -4,8 +4,6 @@ LOG_JSON_TO_CONSOLE=false
 SERVER_PORT=8080
 SERVER_MAX_REQUEST_SIZE_KB=300
 SERVER_ENABLE_TLS=false
-CERTIFICATE_PATH=
-CERTIFICATE_KEY_PATH=
 
 AGENCY_WALLET_NAME=vcxagency-node
 AGENCY_DID=VsKV7grR1BUE29mG2Fm2kX
@@ -26,6 +24,5 @@ PG_WALLET_ADMIN_ACCOUNT=postgres
 PG_WALLET_ADMIN_PASSWORD_SECRET=mysecretpassword
 
 PG_WALLET_URL=localhost:5432
-PG_WALLET_MIN_IDLE_COUNT=0
 PG_WALLET_MAX_CONNECTIONS=90
 PG_WALLET_CONNECTION_TIMEOUT_MINS=30

vcxagency-node/config/localhost-tls.env

@@ -27,6 +27,5 @@ PG_WALLET_ADMIN_ACCOUNT=postgres
 PG_WALLET_ADMIN_PASSWORD_SECRET=mysecretpassword
 
 PG_WALLET_URL=localhost:5432
-PG_WALLET_MIN_IDLE_COUNT=0
 PG_WALLET_MAX_CONNECTIONS=90
 PG_WALLET_CONNECTION_TIMEOUT_MINS=30

vcxagency-node/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.5'
+
+services:
+  redis:
+    container_name: redis
+    image: redis:6.0.8
+    volumes:
+      - ../ci/redis.conf:/usr/local/etc/redis/redis.conf
+    ports:
+      - "6379:6379"
+    command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ]