From 65a6d470bddf09734cfa4847a15d84768958507f Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 9 Aug 2021 17:13:32 +0200 Subject: [PATCH] feat(api): share S3 config with utilities feat(utilities): use shared S3 config --- api/chalicelib/core/sourcemaps_parser.py | 6 +++++- utilities/servers/sourcemaps-handler.js | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/api/chalicelib/core/sourcemaps_parser.py b/api/chalicelib/core/sourcemaps_parser.py index b7c17f3d3..d6e7414ba 100644 --- a/api/chalicelib/core/sourcemaps_parser.py +++ b/api/chalicelib/core/sourcemaps_parser.py @@ -8,7 +8,11 @@ def get_original_trace(key, positions): "key": key, "positions": positions, "padding": 5, - "bucket": environ['sourcemaps_bucket'] + "bucket": environ['sourcemaps_bucket'], + "S3_HOST": environ['S3_HOST'], + "S3_KEY": environ['S3_KEY'], + "S3_SECRET": environ['S3_SECRET'], + "region": environ['sessions_region'] } r = requests.post(environ["sourcemaps_reader"], json=payload) if r.status_code != 200: diff --git a/utilities/servers/sourcemaps-handler.js b/utilities/servers/sourcemaps-handler.js index 98c2186dc..fca74758b 100644 --- a/utilities/servers/sourcemaps-handler.js +++ b/utilities/servers/sourcemaps-handler.js @@ -10,7 +10,16 @@ module.exports.sourcemapReader = async event => { "lib/mappings.wasm": `https://unpkg.com/source-map@${getVersion(sourceMapVersion)}/lib/mappings.wasm` }); let s3; - if (process.env.S3_HOST) { + if (event.S3_HOST) { + s3 = new AWS.S3({ + endpoint: event.S3_HOST, + accessKeyId: event.S3_KEY, + secretAccessKey: event.S3_SECRET, + region: event.region, + s3ForcePathStyle: true, // needed with minio? + signatureVersion: 'v4' + }); + } else if (process.env.S3_HOST) { s3 = new AWS.S3({ endpoint: process.env.S3_HOST, accessKeyId: process.env.S3_KEY,