From 724bd7b3ed8fb23cfbc45757d4e2da1de40df4a6 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Thu, 2 Nov 2023 20:22:06 +0900 Subject: [PATCH] add getBucket metadata argument (#4770) * add metadata to getBucket * change getBucket call --- packages/@uppy/companion/src/server/Uploader.js | 2 +- packages/@uppy/companion/src/server/helpers/utils.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index 576f2737c..994580513 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -655,7 +655,7 @@ class Uploader { const { client, options } = s3Options const params = { - Bucket: getBucket(options.bucket), + Bucket: getBucket(options.bucket, null, this.options.metadata), Key: options.getKey(null, filename, this.options.metadata), ContentType: this.options.metadata.type, Metadata: rfc2047EncodeMetadata(this.options.metadata), diff --git a/packages/@uppy/companion/src/server/helpers/utils.js b/packages/@uppy/companion/src/server/helpers/utils.js index 0aa3c784f..e85b66490 100644 --- a/packages/@uppy/companion/src/server/helpers/utils.js +++ b/packages/@uppy/companion/src/server/helpers/utils.js @@ -187,8 +187,8 @@ module.exports.rfc2047EncodeMetadata = (metadata) => ( Object.fromEntries(Object.entries(metadata).map((entry) => entry.map(rfc2047Encode))) ) -module.exports.getBucket = (bucketOrFn, req) => { - const bucket = typeof bucketOrFn === 'function' ? bucketOrFn(req) : bucketOrFn +module.exports.getBucket = (bucketOrFn, req, metadata) => { + const bucket = typeof bucketOrFn === 'function' ? bucketOrFn(req, metadata) : bucketOrFn if (typeof bucket !== 'string' || bucket === '') { // This means a misconfiguration or bug