PHEE-689 Update frontend and backend chart to paymenthub 1.13.1

helm/operations/Chart.yaml

@@ -2,17 +2,17 @@ apiVersion: v2
 name: operations
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: 1.0.0
 
 dependencies:
 - name: prometheus
   repository: https://prometheus-community.github.io/helm-charts
-  version: 13.5.0
+  version: 25.22.0
   condition: "prometheus.enabled"
 
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 7.0.0
+  version: 8.0.2
   condition: "grafana.enabled"
 

helm/ph-ee-fin-back-end/Chart.yaml

@@ -2,19 +2,19 @@ apiVersion: v2
 name: back-end
 description: A Helm chart for front-end services
 type: application
-version: 1.0.0
+version: 2.0.0
 appVersion: "ph-ee-superset: v1.16.0; ph-ee-engine:v1.16.0; fin-engine: v1.0.0; operations: 1.0.0;"
 
 dependencies:
 - name: ph-ee-engine
-  repository: "https://fynarfin.io/images/ph-ee-engine-1.7.2-SNAPSHOT/"
-  version: 1.7.2-SNAPSHOT
+  repository: "https://fynarfin.io/images/ph-ee-engine-1.13.1-SNAPSHOT/"
+  version: 1.13.1-SNAPSHOT
   condition: "ph-ee-engine.enabled"
 - name: fin-engine
-  repository: "https://fynarfin.io/images/fineract/"
-  version: 1.0.0-SNAPSHOT
+  repository: "https://fynarfin.io/images/fin-engine/"
+  version: 1.4.1-SNAPSHOT
   condition: "fin-engine.enabled"
 - name: operations
   repository: "https://fynarfin.io/images/operations/"
-  version: "0.1.0"
+  version: "0.2.0"
   condition: "operations.enabled"

helm/ph-ee-fin-back-end/config/application-bb.properties

@@ -1,19 +1,9 @@
-store.local.interop.host=https://us.ibank.financial
-store.local.customer.host=https://us.ibank.financial
-zeebe.broker.contactpoint=zeebe-zeebe-gateway:26500
+store.local.interop.host=https://rhino.mifos.g2pconnect.io
+store.local.customer.host=https://rhino.mifos.g2pconnect.io
+zeebe.broker.contactpoint=g2p-sandbox-zeebe-gateway:26500
 
-security.oauth2.resource.jwt.key-uri=http://ops-bk.ibank.financial/oauth/token_key
+security.oauth2.resource.jwt.key-uri=http://ops-bk.mifos.g2pconnect.io/oauth/token_key
 rest.authorization.enabled=false
-rest.authorization.host=http://ops-bk.ibank.financial
-
-dfspids=ibank-usa, ibank-india
-
-ams.groups[0].identifier= ACCOUNTID
-ams.groups[0].value= roster
-ams.groups[1].identifier= FOUNDATIONALID
-ams.groups[1].value= paygops
-ams.groups[2].identifier= default
-ams.groups[2].value= paygops
-
-
+rest.authorization.host=http://ops-bk.mifos.g2pconnect.io
 
+dfspids=rhino, gorilla

helm/ph-ee-fin-back-end/config/application-fin12.properties

@@ -1,13 +1,8 @@
 ams.localenabled=true
-zeebe.broker.contactpoint=zeebe-zeebe-gateway:26500
-
-ams.local.tenants[0].name=gorilla
-ams.local.tenants[1].name=rhino
-ams.local.tenants[0].user=mifos
-ams.local.tenants[1].user=mifos
-ams.local.tenants[0].password=password
-ams.local.tenants[1].password=password
-ams.local.tenants[0].authtype=basic
-ams.local.tenants[1].authtype=basic
-ams.local.tenants[0].fspId=payerfsp
-ams.local.tenants[1].fspId=payeefsp
+zeebe.broker.contactpoint=g2p-sandbox-zeebe-gateway:26500
+ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_interop_host="https://fineract-server:8443/"
+ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_account_host="https://fineract-server:8443/"
+ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_customer_host="https://fineract-server:8443/"
+ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_auth_host="https://fineract-server:8443/"
+ph-ee-engine.ph_ee_connector_ams_mifos.ams_local_loan_host="https://fineract-server:8443/"
+ph-ee-engine.ph_ee_connector_ams_mifos.dfspids="rhino,gorilla"

helm/ph-ee-fin-back-end/config/application-tenants.properties

@@ -1,6 +1,8 @@
-bpmns.tenants[0].id= "lion"
-bpmns.tenants[0].flows.payment-transfer= "mock_payment_transfer-{dfspid}"
-bpmns.tenants[1].id= "rhino"
-bpmns.tenants[1].flows.payment-transfer= "MockPayerFundTransfer-{dfspid}"
-bpmns.tenants[2].id= "gorilla"
-bpmns.tenants[2].flows.payment-transfer= "PayerFundTransfer-{dfspid}"
+bpmns.tenants[0].id= rhino
+bpmns.tenants[0].flows.payment-transfer= minimal_mock_fund_transfer_account_lookup-{dfspid}
+bpmns.tenants[1].id= gorilla
+bpmns.tenants[1].flows.payment-transfer= minimal_mock_fund_transfer-{dfspid}
+bpmns.tenants[1].flows.outbound-transfer-request= minimal_mock_transfer_request-{dfspid}
+bpmns.tenants[2].id= wakanda
+bpmns.tenants[2].flows.payment-transfer= PayerFundTransfer-{dfspid}
+bpmns.tenants[2].flows.outbound-transfer-request= {ps}_flow_{ams}-{dfspid}

helm/ph-ee-fin-back-end/config/application-tenantsConnection.properties

@@ -0,0 +1,78 @@
+tenants.connections[0].auto_update=true
+tenants.connections[0].deadlock_max_retries=0
+tenants.connections[0].deadlock_max_retry_interval=1
+tenants.connections[0].driver_class=com.mysql.cj.jdbc.Driver
+tenants.connections[0].jdbcProtocol=jdbc
+tenants.connections[0].jdbcSubProtocol=mysql
+tenants.connections[0].name=gorilla
+tenants.connections[0].pool_abandon_when_percentage_full=50
+tenants.connections[0].pool_initial_size=5
+tenants.connections[0].pool_log_abandoned=1
+tenants.connections[0].pool_max_active=40
+tenants.connections[0].pool_max_idle=10
+tenants.connections[0].pool_min_evictable_idle_time_millis=60000
+tenants.connections[0].pool_min_idle=20
+tenants.connections[0].pool_remove_abandoned=1
+tenants.connections[0].pool_remove_abandoned_timeout=60
+tenants.connections[0].pool_suspect_timeout=60
+tenants.connections[0].pool_test_on_borrow=1
+tenants.connections[0].pool_time_between_eviction_runs_millis=34000
+tenants.connections[0].pool_validation_interval=30000
+tenants.connections[0].schema_connection_parameters=null
+tenants.connections[0].schema_name=gorilla
+tenants.connections[0].schema_password=password
+tenants.connections[0].schema_server=operationsmysql
+tenants.connections[0].schema_server_port=3306
+tenants.connections[0].schema_username=mifos
+tenants.connections[1].auto_update=true
+tenants.connections[1].deadlock_max_retries=0
+tenants.connections[1].deadlock_max_retry_interval=1
+tenants.connections[1].driver_class=com.mysql.cj.jdbc.Driver
+tenants.connections[1].jdbcProtocol=jdbc
+tenants.connections[1].jdbcSubProtocol=mysql
+tenants.connections[1].name=rhino
+tenants.connections[1].pool_abandon_when_percentage_full=50
+tenants.connections[1].pool_initial_size=5
+tenants.connections[1].pool_log_abandoned=1
+tenants.connections[1].pool_max_active=40
+tenants.connections[1].pool_max_idle=10
+tenants.connections[1].pool_min_evictable_idle_time_millis=60000
+tenants.connections[1].pool_min_idle=20
+tenants.connections[1].pool_remove_abandoned=1
+tenants.connections[1].pool_remove_abandoned_timeout=60
+tenants.connections[1].pool_suspect_timeout=60
+tenants.connections[1].pool_test_on_borrow=1
+tenants.connections[1].pool_time_between_eviction_runs_millis=34000
+tenants.connections[1].pool_validation_interval=30000
+tenants.connections[1].schema_connection_parameters=null
+tenants.connections[1].schema_name=rhino
+tenants.connections[1].schema_password=password
+tenants.connections[1].schema_server=operationsmysql
+tenants.connections[1].schema_server_port=3306
+tenants.connections[1].schema_username=mifos
+tenants.connections[2].auto_update=true
+tenants.connections[2].deadlock_max_retries=0
+tenants.connections[2].deadlock_max_retry_interval=1
+tenants.connections[2].driver_class=com.mysql.cj.jdbc.Driver
+tenants.connections[2].jdbcProtocol=jdbc
+tenants.connections[2].jdbcSubProtocol=mysql
+tenants.connections[2].name=wakanda
+tenants.connections[2].pool_abandon_when_percentage_full=50
+tenants.connections[2].pool_initial_size=5
+tenants.connections[2].pool_log_abandoned=1
+tenants.connections[2].pool_max_active=40
+tenants.connections[2].pool_max_idle=10
+tenants.connections[2].pool_min_evictable_idle_time_millis=60000
+tenants.connections[2].pool_min_idle=20
+tenants.connections[2].pool_remove_abandoned=1
+tenants.connections[2].pool_remove_abandoned_timeout=60
+tenants.connections[2].pool_suspect_timeout=60
+tenants.connections[2].pool_test_on_borrow=1
+tenants.connections[2].pool_time_between_eviction_runs_millis=34000
+tenants.connections[2].pool_validation_interval=30000
+tenants.connections[2].schema_connection_parameters=null
+tenants.connections[2].schema_name=wakanda
+tenants.connections[2].schema_password=password
+tenants.connections[2].schema_server=operationsmysql
+tenants.connections[2].schema_server_port=3306
+tenants.connections[2].schema_username=mifos

helm/ph-ee-fin-back-end/templates/_helpers.tpl

@@ -0,0 +1,64 @@
+{{/*
+This template defines a reusable environment section.
+It directly provides values.
+*/}}
+
+{{- define "inttest.env" -}}
+  env:
+    - name: SAVINGS_BASE-URL
+      value: "https://fineract-server:8443"
+    - name: AMS_BASE-URL
+      value: "http://ph-ee-connector-ams-mifos:80"
+    - name: LOAN_BASE-URL
+      value: "https://fineract-server:8443"
+    - name: "OPERATIONS_APP_CONTACTPOINT"
+      value: "http://ph-ee-operations-app:80"
+    - name: "BULK_PROCESSOR_CONTACTPOINT"
+      value: "https://ph-ee-connector-bulk:8443"
+    - name: "CHANNEL_CONNECTOR_CONTACTPOINT"
+      value: "https://ph-ee-connector-channel:8443"
+    - name:  "LOGGING_LEVEL_ROOT"
+      value: "INFO"
+    - name: "MAX_RETRY_COUNT"
+      value: "5"
+    - name: "RETRY_INTERVAL"
+      value: "15000"
+    - name: "DEFAULTS_TENANT"
+      value: "gorilla"
+    - name: "DEFAULTS_AUTHORIZATION"
+      value: "Basic bWlmb3M6cGFzc3dvcmQ="
+    - name: "CHANNEL_BASE-URL"
+      value: "https://ph-ee-connector-channel:8443"
+    - name: "CHANNEL_CONTACTPOINT"
+      value: "https://ph-ee-connector-channel:8443"
+    - name: "SAVINGS_CONTACTPOINT"
+      value: "https://fineract-server:8443"
+    - name: "LOAN_CONTACTPOINT"
+      value: "https://fineract-server:8443"
+    - name: "MOCK_SERVER_PORT"
+      value: "53013"
+    - name: "IDENTITY_ACCOUNT_MAPPER_CONTACTPOINT"
+      value: "http://ph-ee-identity-account-mapper:80"
+    - name: "MIFOS_CONNECTOR_CONTACTPOINT"
+      value: "http://ph-ee-connector-ams-mifos:80"
+    - name: "AMSMIFOS_MOCK_BASE_URL"
+      value: "http://ph-ee-connector-ams-mifos:70"
+    - name: "MOCK_PAYMENT_SCHEMA_CONTACTPOINT"
+      value: "http://ph-ee-connector-mock-payment-schema:8080"
+    - name: "MY_POD_IP"
+      valueFrom:
+        fieldRef:
+          fieldPath: status.podIP
+    - name: "CALLBACK_URL"
+      value: "http://$(MY_POD_IP):53013"
+    - name: "PAYBILL_MPESA_CONNECTOR_CONTACTPOINT"
+      value: ""
+    - name: "VOUCHER_MANAGEMENT_CONTACTPOINT"
+      value: "http://ph-ee-vouchers:80"
+    - name: "BILLPAY_CONTACTPOINT"
+      value: "http://ph-ee-connector-bill-pay:8080"
+    - name: "awaitly_maxWaitTime"
+      value: "30"
+    - name: "GLOBAL_WAIT_TIME_MS"
+      value: "5000"
+{{- end }}