feat!: add iso 20022 compatibility

.changelog/release-v16.0.0.md

@@ -55,7 +55,7 @@ Enhancements and breaking changes to the [v15.2.0 Release](https://github.com/mo
 14. ml-testing-toolkit: [v17.0.0](https://github.com/mojaloop/ml-testing-toolkit/releases/v17.0.0)
 15. transaction-requests-service: [v14.1.2](https://github.com/mojaloop/transaction-requests-service/releases/v14.1.2)
 16. ml-api-adapter: [v14.0.5](https://github.com/mojaloop/ml-api-adapter/releases/v14.0.5)
-17. mojaloop-simulator: [v15.0.0](https://github.com/mojaloop/mojaloop-simulator/releases/v15.0.0)
+17. mojaloop-simulator: [v15.1.1](https://github.com/mojaloop/mojaloop-simulator/releases/v15.0.0)
 18. thirdparty-api-svc: [v14.0.0](https://github.com/mojaloop/thirdparty-api-svc/releases/v14.0.0)
 19. als-consent-oracle: [v0.2.2](https://github.com/mojaloop/als-consent-oracle/releases/v0.2.2)
 20. thirdparty-sdk: [v15.1.1](https://github.com/mojaloop/thirdparty-sdk/releases/v15.1.1)

.circleci/config.yml

@@ -47,7 +47,7 @@ defaults_Environment: &defaults_environment
     helm repo add elastic https://helm.elastic.co
     helm repo add codecentric https://codecentric.github.io/helm-charts
     helm repo add bitnami https://charts.bitnami.com/bitnami
-    helm repo add mojaloop-charts https://mojaloop.github.io/charts/repo 
+    helm repo add mojaloop-charts https://mojaloop.github.io/charts/repo
     helm repo add redpanda https://charts.redpanda.com
     helm repo update
 
@@ -131,7 +131,7 @@ jobs:
       - run:
           name: If this is a release, upload the license-scanner file to the github release
           command: |
-            if [ "${CIRCLE_TAG}" = "" ]; then
+            if [ "${CIRCLE_TAG}" = "" ] || [[ "$CIRCLE_TAG" == *-snapshot* ]]; then
               exit 0
             fi
             mv /tmp/license-scanner/results/license-summary.xlsx ./license-summary-${CIRCLE_TAG}.xlsx
@@ -173,6 +173,11 @@ jobs:
               echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/releases/tag/${CIRCLE_TAG}" >> $BASH_ENV
               echo "export GIT_RELEASE_TAG='${CIRCLE_TAG}@${CIRCLE_SHA1:0:7}'" >> $BASH_ENV
               echo "export GIT_RELEASE_TYPE='Helm Snapshot'" >> $BASH_ENV
+            elif [[ $CIRCLE_BRANCH =~ ^(major|minor|patch)/(.*)$ ]]; then
+              echo "Setting env configs for Helm Pre-Release"
+              echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/commit/${CIRCLE_SHA1}" >> $BASH_ENV
+              echo "export GIT_RELEASE_TAG=${BASH_REMATCH[2]}.${CIRCLE_BUILD_NUM}" >> $BASH_ENV
+              echo "export GIT_RELEASE_TYPE='Helm Pre-Release'" >> $BASH_ENV
             else
               echo "CIRCLE_SHA1=${CIRCLE_SHA1} exists setting env configs for Helm Snapshot"
               echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/commit/${CIRCLE_SHA1}" >> $BASH_ENV
@@ -203,6 +208,25 @@ jobs:
       - run:
           name: Publish Helm Charts
           command: .circleci/publish_helm_charts.sh
+      - run:
+          name: Trigger downstream workflows
+          # DOWNSTREAM_IMAGE_ variables contain downstream repository:token pairs
+          command: |
+            DOWNSTREAM=$(compgen -A variable | grep "^DOWNSTREAM_IMAGE_")
+            if [ -n "$DOWNSTREAM" ]; then
+                echo "wait for GitHub Pages to publish"
+                sleep 180
+            fi
+            for var in $DOWNSTREAM; do
+                REPO_NAME=$(echo "${!var}" | cut -d: -f1)
+                echo "Triggering downstream workflow for $REPO_NAME"
+                curl -L \
+                    -X POST \
+                    -H "Accept: application/vnd.github+json" \
+                    -H "Authorization: Bearer $(echo "${!var}" | cut -d: -f2)" \
+                    https://api.github.com/repos/"$REPO_NAME"/actions/workflows/docker-image.yaml/dispatches \
+                    -d '{"ref":"main","inputs":{"upstream":"'"$CIRCLE_BUILD_URL"'","chart":"mojaloop","tag":"'"$GIT_RELEASE_TAG"'"}}'
+            done
       - slack/notify:
           event: pass
           template: SLACK_TEMP_RELEASE_SUCCESS
@@ -249,4 +273,4 @@ workflows:
             tags:
               only: /v[0-9]+(\.[0-9]+)*(\-snapshot+((\.[0-9]+)?))?/
             branches:
-              only: main
+              only: /main|(major|minor|patch)/.*/

account-lookup-service/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-version: 14.11.0
-appVersion: "account-lookup-service: v15.2.3; als-oracle-pathfinder: v12.1.0"
+version: 15.6.0
+appVersion: "account-lookup-service: v15.6.0; als-oracle-pathfinder: v12.1.0"
 description: Account Lookup Service Helm Chart for Mojaloop
 name: account-lookup-service
 maintainers:
@@ -17,12 +17,16 @@ dependencies:
     version: ">= 14.6.0"
     repository: "file://./chart-admin"
     condition: account-lookup-service-admin.enabled
+  - name: account-lookup-service-handler-timeout
+    version: ">= 1.0.0"
+    repository: "file://./chart-handler-timeout"
+    condition: account-lookup-service-handler-timeout.enabled
   - name: als-oracle-pathfinder
     version: ">= 13.3.0"
     repository: "file://../als-oracle-pathfinder"
     condition: als-oracle-pathfinder.enabled
   - name: common
     repository: "https://mojaloop.github.io/charts/repo"
-    version: 3.0.0
+    version: 3.1.1
     tags:
       - moja-common

account-lookup-service/chart-admin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-version: 14.6.0
-appVersion: v15.2.1
+version: 15.4.0
+appVersion: v15.4.0
 description: A Helm chart for Kubernetes
 name: account-lookup-service-admin
 maintainers:
@@ -11,6 +11,6 @@ maintainers:
 dependencies:
   - name: common
     repository: "https://mojaloop.github.io/charts/repo"
-    version: 3.0.0
+    version: 3.1.1
     tags:
       - moja-common

account-lookup-service/chart-admin/configs/default.json

@@ -1,5 +1,9 @@
 {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}}
 {
+  "HUB_PARTICIPANT": {
+    "ID": {{ .Values.config.hub_participant.id }},
+    "NAME": {{ .Values.config.hub_participant.name | quote }}
+  },
   "ADMIN_PORT":  {{ .Values.service.internalPort }},
   "API_PORT":  4002,
   "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }},
@@ -42,6 +46,8 @@
     "MAX_BYTE_SIZE": {{ .Values.config.general_cache.maxByteSize }},
     "EXPIRES_IN_MS": {{ .Values.config.general_cache.expiresIn }}
   },
+  "PROXY_CACHE": {{ .Values.config.proxy_cache | toPrettyJson | nindent 2 }},
+  "HANDLERS": {{ .Values.config.handlers | toPrettyJson | nindent 2 }},
   "ERROR_HANDLING": {
     "includeCauseExtension": {{ .Values.config.error_handling.include_cause_extension }},
     "truncateExtensions": {{ .Values.config.error_handling.truncate_extensions }}
@@ -67,7 +73,6 @@
   "ENDPOINT_SECURITY": {
     "JWS": {
       "JWS_SIGN": {{ .Values.config.endpointSecurity.jwsSign }},
-      "FSPIOP_SOURCE_TO_SIGN": {{ .Values.config.endpointSecurity.fspiopSourceSigningName | quote }},
       "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
     }
   },

account-lookup-service/chart-admin/templates/config-override.yaml

@@ -11,6 +11,6 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 data:
 {{- range $fileName, $fileContents := .Values.configOverride }}
-  {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }}
+  {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }}
 {{- end }}
 {{- end }}

account-lookup-service/chart-admin/templates/deployment.yaml

@@ -33,6 +33,9 @@ spec:
         {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
+        {{- if .Values.configOverride }}
+        checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }}
+        {{- end }}
         # Custom Pod annotations
         {{- if .Values.podAnnotations }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }}
@@ -43,6 +46,7 @@ spec:
         #   prometheus.io/scrape: "true"
         # {{- end }}
     spec:
+      {{- include "common.topologySpread" . | nindent 6 }}
       initContainers:
         {{- if .Values.initContainers }}
           {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
@@ -68,6 +72,12 @@ spec:
           args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }}
           {{- end }}
           env:
+            {{- if .Values.env }}
+            {{- range $key, $val := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $val | quote }}
+            {{- end }}
+            {{- end }}
             - name: ALS_DATABASE__PASSWORD
             {{- if .Values.config.db_secret }}
               valueFrom:

account-lookup-service/chart-admin/values.yaml

@@ -5,7 +5,7 @@
 image:
   registry: docker.io
   repository: mojaloop/account-lookup-service
-  tag: v15.2.3
+  tag:  v17.0.3
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -122,6 +122,9 @@ metrics:
       serviceName: account-lookup-service-admin
 
 config:
+  hub_participant:
+    id: 1
+    name: Hub
   ## Central-Ledger config
   central_services_host: '$release_name-centralledger-service'
   central_services_port: 80
@@ -136,22 +139,26 @@ config:
 
   # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept),
   # and for generating requests/callbacks from the Switch itself (DEFAULT value)
-  protocol_versions: |
+  protocol_versions:
     {
         "CONTENT": {
-            "DEFAULT": "1.1",
+            "DEFAULT": "2.0",
             "VALIDATELIST": [
                 "1",
                 "1.0",
-                "1.1"
+                "1.1",
+                "2",
+                "2.0"
             ]
         },
         "ACCEPT": {
-            "DEFAULT": "1",
+            "DEFAULT": "2",
             "VALIDATELIST": [
                 "1",
                 "1.0",
-                "1.1"
+                "1.1",
+                "2",
+                "2.0"
             ]
         }
     }
@@ -200,13 +207,11 @@ config:
   db_create_retry_interval_millis: 200
   db_debug: false
 
-
   display_routes: true
   run_migrations: false
 
   endpointSecurity:
     jwsSign: false
-    fspiopSourceSigningName: switch
     # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key.
     # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored.
     # Expected properties of `jwsSigningKeySecret` are `name` and `key`.
@@ -238,6 +243,29 @@ config:
   # Thirdparty API Config
   featureEnableExtendedPartyIdType: false
 
+  ## Proxy cache configuration
+  proxy_cache:
+    enabled: false
+    type: redis-cluster
+    proxyConfig:
+      cluster:
+        - host: proxy-cache-redis
+          port: 6379
+
+  ## Handlers configuration
+  handlers:
+    DISABLED: true
+    MONITORING_PORT: 4003
+    TIMEOUT:
+      DISABLED: true
+      TIMEXP: "*/30 * * * * *"
+      TIMEZONE: "UTC"
+      BATCH_SIZE: 100
+
+## To pass arbitrary environment variables to the deployment
+#env:
+#  KEY: value
+
 ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s)
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
 ## e.g:
@@ -250,7 +278,7 @@ config:
 # initContainers: []
 initContainers: |
   - name: wait-for-mysql
-    image: mysql:5.7
+    image: mysql:9.0.1
     imagePullPolicy: IfNotPresent
     command:
       - sh
@@ -414,3 +442,4 @@ resources: {}
 # requests:
 #  cpu: 100m
 #  memory: 128Mi
+

account-lookup-service/chart-handler-timeout/Chart.yaml

@@ -0,0 +1,14 @@
+apiVersion: v2
+version: 1.0.0
+appVersion: v15.6.0-iso.19
+description: A Helm chart for Kubernetes
+name: account-lookup-service-handler-timeout
+maintainers:
+  - name: Steven Oderayi
+    email: [email protected]
+dependencies:
+  - name: common
+    repository: "https://mojaloop.github.io/charts/repo"
+    version: 3.1.1
+    tags:
+      - moja-common

account-lookup-service/chart-handler-timeout/configs/default-sidecar.json

@@ -0,0 +1,50 @@
+{{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}}
+{
+  "PORT": {{ .Values.sidecar.service.internalPort }},
+  "EVENT_LOGGER_GRPC_HOST": "{{ .Values.sidecar.config.event_log_grpc_host }}",
+  "EVENT_LOGGER_GRPC_PORT": {{ .Values.sidecar.config.event_log_grpc_port }},
+  "INSTRUMENTATION": {
+    "METRICS": {
+      "DISABLED": false,
+      "labels": {
+        "eventId": "*"
+      },
+      "config": {
+        "timeout": 5000,
+        "prefix": "moja_",
+        "defaultLabels": {
+          "serviceName": "{{ template "account-lookup-service-handler-timeout.name" . }}-event-sidecar"
+        }
+      }
+    }
+  },
+  "KAFKA": {
+    "TOPIC_TEMPLATES": {
+      "GENERAL_TOPIC_TEMPLATE": {
+        "TEMPLATE": "topic-{{"{{"}}functionality{{"}}"}}",
+        "REGEX": "topic-(.*)"
+      }
+    },
+    "PRODUCER": {
+      "EVENT": {
+        "config": {
+          "options": {
+            "messageCharset": "utf8"
+          },
+          "rdkafkaConf": {
+            "metadata.broker.list": "{{ $kafkaHost }}:{{ .Values.config.kafka_port }}",
+            "client.id": "es-prod-event",
+            "event_cb": true,
+            "dr_cb": true,
+            "socket.keepalive.enable": true,
+            "queue.buffering.max.messages": 10000000
+          },
+          "topicConf": {
+            "request.required.acks": "all",
+            "partitioner": "{{ .Values.config.kafka_partitioner }}"
+          }
+        }
+      }
+    }
+  }
+}