feat(#3): enable json logging

eurofurence · Dec 22, 2023 · 9805e2d · 9805e2d
1 parent 4fea43c
commit 9805e2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/charts/eurofurence-registration-system/Chart.yaml b/charts/eurofurence-registration-system/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: eurofurence-registration-system
-version: 0.0.10
+version: 0.0.11
 description: A helm chart that can deploy the Eurofurence Registration System.
 type: application
 home: https://github.com/eurofurence/reg-helm-chart
diff --git a/charts/eurofurence-registration-system/templates/deployments.yaml b/charts/eurofurence-registration-system/templates/deployments.yaml
@@ -3,39 +3,39 @@
                         "component" .Values.system.components.attendee_service
                         "secrets" (list "REG_SECRET_DB_PASSWORD" "REG_SECRET_API_TOKEN")
                         "command" "/main"
-                        "args" (list "--config=/config/config.yaml" "--migrate-database") -}}
+                        "args" (list "--config=/config/config.yaml" "--migrate-database" "--ecs-json-logging") -}}
 {{- template "helpers.deployment" $attSrvInput }}
 ---
 {{ $authSrvInput := dict "name" "auth-service"
                          "all" .Values
                          "component" .Values.system.components.auth_service
                          "secrets" (list "REG_SECRET_OIDC_CLIENT_ID" "REG_SECRET_OIDC_CLIENT_SECRET")
                          "command" "/main"
-                         "args" (list "--config=/config/config.yaml") -}}
+                         "args" (list "--config=/config/config.yaml" "--ecs-json-logging") -}}
 {{- template "helpers.deployment" $authSrvInput }}
 ---
 {{ $mailSrvInput := dict "name" "mail-service"
                          "all" .Values
                          "component" .Values.system.components.mail_service
                          "secrets" (list "REG_SECRET_SMTP_PASSWORD" "REG_SECRET_DB_PASSWORD" "REG_SECRET_API_TOKEN")
                          "command" "/main"
-                         "args" (list "--config=/config/config.yaml" "--migrate-database") -}}
+                         "args" (list "--config=/config/config.yaml" "--migrate-database" "--ecs-json-logging") -}}
 {{- template "helpers.deployment" $mailSrvInput }}
 ---
 {{ $cncrdAdapterInput := dict "name" "payment-cncrd-adapter"
                          "all" .Values
                          "component" .Values.system.components.payment_cncrd_adapter
                          "secrets" (list "REG_SECRET_CONCARDIS_API_SECRET" "REG_SECRET_API_TOKEN" "REG_SECRET_CONCARDIS_INCOMING_WEBHOOK_SECRET" "REG_SECRET_DB_PASSWORD" )
                          "command" "/main"
-                         "args" (list "--config=/config/config.yaml" "--migrate-database") -}}
+                         "args" (list "--config=/config/config.yaml" "--migrate-database" "--ecs-json-logging") -}}
 {{- template "helpers.deployment" $cncrdAdapterInput }}
 ---
 {{ $paySrvInput := dict "name" "payment-service"
                          "all" .Values
                          "component" .Values.system.components.payment_service
                          "secrets" (list "REG_SECRET_DB_PASSWORD" "REG_SECRET_API_TOKEN")
                          "command" "/main"
-                         "args" (list "--config=/config/config.yaml" "--migrate-database") -}}
+                         "args" (list "--config=/config/config.yaml" "--migrate-database" "--ecs-json-logging") -}}
 {{- template "helpers.deployment" $paySrvInput }}
 ---
 {{ $classicInput := dict "name" "regsys-classic"

diff --git a/charts/eurofurence-registration-system/tests/deployments_test.yaml b/charts/eurofurence-registration-system/tests/deployments_test.yaml
@@ -57,6 +57,7 @@ tests:
                     args:
                       - --config=/config/config.yaml
                       - --migrate-database
+                      - --ecs-json-logging
                     env:
                       - name: REG_SECRET_DB_PASSWORD
                         valueFrom:
@@ -129,6 +130,7 @@ tests:
                     command: [/main]
                     args:
                       - --config=/config/config.yaml
+                      - --ecs-json-logging
                     env:
                       - name: REG_SECRET_OIDC_CLIENT_ID
                         valueFrom:
@@ -202,6 +204,7 @@ tests:
                     args:
                       - --config=/config/config.yaml
                       - --migrate-database
+                      - --ecs-json-logging
                     env:
                       - name: REG_SECRET_SMTP_PASSWORD
                         valueFrom:
@@ -280,6 +283,7 @@ tests:
                     args:
                       - --config=/config/config.yaml
                       - --migrate-database
+                      - --ecs-json-logging
                     env:
                       - name: REG_SECRET_CONCARDIS_API_SECRET
                         valueFrom:
@@ -363,6 +367,7 @@ tests:
                     args:
                       - --config=/config/config.yaml
                       - --migrate-database
+                      - --ecs-json-logging
                     env:
                       - name: REG_SECRET_DB_PASSWORD
                         valueFrom: