From 041e5ae3bb7f21654a540779922bee275675f94b Mon Sep 17 00:00:00 2001 From: thomasAtCoppengo Date: Mon, 18 Sep 2023 11:14:40 +0200 Subject: [PATCH 1/2] [PPOP-242] fix: add env vars in compose to manage max file size to be handled --- compose/api/api_v1.yml | 2 ++ compose/api/gateway.yml | 2 ++ env.custom.sample | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/compose/api/api_v1.yml b/compose/api/api_v1.yml index fa060d7..01da623 100644 --- a/compose/api/api_v1.yml +++ b/compose/api/api_v1.yml @@ -18,6 +18,8 @@ services: - DEBUG=${API_DEBUG_LEVEL:?} + - COOG_API_PAYLOAD_LIMIT=${COOG_API_PAYLOAD_LIMIT:?} + - OPENTELEMETRY_ENABLED=${OPEN_TELEMETRY_TRACING_ENABLED:?} - OPENTELEMETRY_URL=${OPEN_TELEMETRY_TRACING_URL:-} - OPENTELEMETRY_TOKEN=${OPEN_TELEMETRY_TRACING_TOKEN:-} diff --git a/compose/api/gateway.yml b/compose/api/gateway.yml index 2361961..8b37030 100644 --- a/compose/api/gateway.yml +++ b/compose/api/gateway.yml @@ -32,6 +32,8 @@ services: - JWT_EXPIRATION=${JWT_EXPIRATION:?} - JWT_INTERNAL_ENCRYPTION=${JWT_INTERNAL_ENCRYPTION:?} + - MAX_LIMIT_FILE_SIZE_UPLOAD=${MAX_LIMIT_FILE_SIZE_UPLOAD:?} + - MONGO_HOST=${MONGO_HOST:?} - MONGO_PORT=${MONGO_PORT:?} - MONGO_USER=${MONGO_USER:?} diff --git a/env.custom.sample b/env.custom.sample index beea1cc..f1aa517 100644 --- a/env.custom.sample +++ b/env.custom.sample @@ -230,6 +230,12 @@ FILESYSTEM_ROOT= # Root directory where data will # Whitelist for CORS, defaults to MAIN_URL_SCHEME://PROJECT_HOSTNAME # CORS_WHITELIST= +# Use this variable to fix the limit size of files passed through the gateway +# MAX_LIMIT_FILE_SIZE_UPLOAD= + +# Use this to fix the max size of files passed to the API-v1 (coog-web) +# COOG_API_PAYLOAD_LIMIT= + ############################################################################### # OpenTelemetry configuration # ############################################################################### From aef9ed6b88c2bc76f68cf5a14d1dcf1a3245aaf3 Mon Sep 17 00:00:00 2001 From: thomasAtCoppengo Date: Mon, 18 Sep 2023 11:34:19 +0200 Subject: [PATCH 2/2] [PPOP-242] docs: update changelog files --- CHANGELOG_EN | 1 + CHANGELOG_FR | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG_EN b/CHANGELOG_EN index c1a5de3..6a1dc23 100644 --- a/CHANGELOG_EN +++ b/CHANGELOG_EN @@ -1,3 +1,4 @@ +* FIX#PPOP-242 Add env vars in compose to manage max file size to be handled * BUG#PROCK-541 Add configuration for maximum mongo db cache size * FIX#PCLAS-19 Add missing table and change ssn hash method * FEA#PINTE-24735 Change user ID to match with the user ID in coog dockerfile diff --git a/CHANGELOG_FR b/CHANGELOG_FR index e65460e..7faa6b3 100644 --- a/CHANGELOG_FR +++ b/CHANGELOG_FR @@ -1,3 +1,4 @@ +* FIX#PPOP-242 Ajout des variables d'environnement dans les fichiers compose pour gérer la taille maximales des fichiers pouvant être upload * BUG#PROCK-541 Ajout d'une configuration / limite sur la taille maximum du cache de mongo db * FIX#PCLAS-19 Ajout des tables manquantes et modification du hash ssn * FEA#PINTE-24735 Mise à jour de l'ID utilisateur pour correspondre à celui dans le dockerfile de coog