From 4cfaf5d3520906a78c73df2217d7c1adce3c9c1a Mon Sep 17 00:00:00 2001
From: Kalin Krustev <kalin.krustev@gmail.com>
Date: Mon, 27 May 2024 10:48:39 +0000
Subject: [PATCH] fix: reporting-events-processor-svc compression support

---
 mojaloop/finance-portal/Chart.yaml            |  6 +--
 .../reporting-events-processor-svc/Chart.yaml |  4 +-
 .../templates/deployment.yaml                 | 10 +----
 .../values.yaml                               | 37 ++++++++++++++++---
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/mojaloop/finance-portal/Chart.yaml b/mojaloop/finance-portal/Chart.yaml
index 2ecfb5b..753b543 100644
--- a/mojaloop/finance-portal/Chart.yaml
+++ b/mojaloop/finance-portal/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 4.2.3
+version: 4.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "4.2.3"
+appVersion: "4.2.4"
 dependencies:
   - name: common
     repository: "file://../common"
@@ -63,7 +63,7 @@ dependencies:
     tags:
       - mojaloop
       - reporting-events-processor-svc
-    version: 2.0.0
+    version: 3.0.0
   - name: reporting-hub-bop-role-ui
     condition: reporting-hub-bop-role-ui.enabled
     repository: "file://../reporting-hub-bop-role-ui"
diff --git a/mojaloop/reporting-events-processor-svc/Chart.yaml b/mojaloop/reporting-events-processor-svc/Chart.yaml
index 9fe122d..549ce88 100644
--- a/mojaloop/reporting-events-processor-svc/Chart.yaml
+++ b/mojaloop/reporting-events-processor-svc/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 description: Reporting Events Processor
 name: reporting-events-processor-svc
-version: 2.0.0
-appVersion: "2.0.0"
+version: 3.0.0
+appVersion: "3.0.0"
 home: http://mojaloop.io
 icon: http://mojaloop.io/images/logo.png
 sources:
diff --git a/mojaloop/reporting-events-processor-svc/templates/deployment.yaml b/mojaloop/reporting-events-processor-svc/templates/deployment.yaml
index 0c65c40..b67d6b8 100644
--- a/mojaloop/reporting-events-processor-svc/templates/deployment.yaml
+++ b/mojaloop/reporting-events-processor-svc/templates/deployment.yaml
@@ -78,16 +78,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: {{ template "common.names.fullname" . }}-config-volume
-              mountPath: /opt/reporting-events-processor-svc/config
+              mountPath: /opt/app/config
           env:
-            - name: KAFKA_BROKER_LIST
-              value: '{{ .Values.kafka.host }}:{{ .Values.kafka.port }}'
-            - name: KAFKA_TOPIC_EVENT
-              value: {{ .Values.kafka.topicEvent }}
-            - name: KAFKA_CONSUMER_GROUP
-              value: {{ .Values.kafka.consumerGroup }}
-            - name: KAFKA_CLIENT_ID
-              value: {{ .Values.kafka.clientId }}
             # Event Store
             - name: EVENT_STORE_DB_HOST
               value: '{{ include "common.backends.reportingEventsDB.host" . }}'
diff --git a/mojaloop/reporting-events-processor-svc/values.yaml b/mojaloop/reporting-events-processor-svc/values.yaml
index 55e95c2..8cbed6d 100644
--- a/mojaloop/reporting-events-processor-svc/values.yaml
+++ b/mojaloop/reporting-events-processor-svc/values.yaml
@@ -36,7 +36,7 @@ reportingEventsDB:
 kafka:
   host: kafka-headless
   port: 9092
-  topicEvent: topic-event
+  topicEvent: topic-event-audit
   consumerGroup: reporting_events_processor_consumer_group
   clientId: reporting_events_processor_consumer
 
@@ -100,7 +100,7 @@ containerSecurityContext:
 image:
   registry: docker.io
   repository: mojaloop/reporting-events-processor-svc
-  tag: v2.0.0
+  tag: v3.0.0
   ## 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
@@ -180,10 +180,35 @@ configFiles:
         "EVENTS_COLLECTION": "reporting"
       },
       "KAFKA": {
-        "BROKER_LIST": ["{{ .Values.kafka.host }}:{{ .Values.kafka.port }}"],
-        "CONSUMER_GROUP": "{{ .Values.kafka.consumerGroup }}",
-        "CLIENT_ID": "{{ .Values.kafka.clientId }}",
-        "TOPIC_EVENT": "{{ .Values.kafka.topicEvent }}"
+        "TOPIC_EVENT": "{{ .Values.kafka.topicEvent }}",
+        "CONSUMER": {
+          "EVENT": {
+            "config": {
+              "options": {
+                "mode": 2,
+                "batchSize": 50,
+                "pollFrequency": 10,
+                "recursiveTimeout": 100,
+                "messageCharset": "utf8",
+                "messageAsJSON": true,
+                "sync": true,
+                "consumeTimeout": 10
+              },
+              "rdkafkaConf": {
+                "clientId": "{{ .Values.kafka.clientId }}",
+                "groupId": "{{ .Values.kafka.consumerGroup }}",
+                "metadataBrokerList": "{{ .Values.kafka.host }}:{{ .Values.kafka.port }}",
+                "socketKeepaliveEnable": true,
+                "allowAutoCreateTopics": true,
+                "partitionAssignmentStrategy": "",
+                "enableAutoCommit": false
+              },
+              "topicConf": {
+                "autoOffsetReset": "earliest"
+              }
+            }
+          }
+        }
       }
     }