From 2603292de03b7227c457beddb8de2ffbe721c75f Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Sun, 29 Mar 2026 18:12:45 +0800 Subject: [PATCH] allow dynamic value --- packages/@uppy/companion/src/server/Uploader.js | 4 ++-- packages/@uppy/companion/src/server/controllers/s3.js | 11 ++++++----- packages/@uppy/companion/src/standalone/helper.js | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index 71880cd09..99e0c91c1 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -752,8 +752,8 @@ export default class Uploader { if (options.acl != null) params.ACL = options.acl - if (options.enableAwsSseKms === true) { - params.ServerSideEncryption = 'aws:kms' + if (options.awsSse != null) { + params.ServerSideEncryption = options.awsSse } if (options.awsSseKmsKeyId) { diff --git a/packages/@uppy/companion/src/server/controllers/s3.js b/packages/@uppy/companion/src/server/controllers/s3.js index b4acb0648..156272fe1 100644 --- a/packages/@uppy/companion/src/server/controllers/s3.js +++ b/packages/@uppy/companion/src/server/controllers/s3.js @@ -95,12 +95,13 @@ export default function s3(config) { if (config.acl != null) fields.acl = config.acl - if (config.enableAwsSseKms === true) { - fields['x-amz-server-side-encryption'] = 'aws:kms' + if (config.awsSse != null) { + fields['x-amz-server-side-encryption'] = config.awsSse } if (config.awsSseKmsKeyId) { - fields['x-amz-server-side-encryption-aws-kms-key-id'] = config.awsSseKmsKeyId + fields['x-amz-server-side-encryption-aws-kms-key-id'] = + config.awsSseKmsKeyId } Object.keys(metadata).forEach((metadataKey) => { @@ -186,8 +187,8 @@ export default function s3(config) { if (config.acl != null) params.ACL = config.acl - if (config.enableAwsSseKms === true) { - params.ServerSideEncryption = 'aws:kms' + if (config.awsSse != null) { + params.ServerSideEncryption = config.awsSse } if (config.awsSseKmsKeyId) { diff --git a/packages/@uppy/companion/src/standalone/helper.js b/packages/@uppy/companion/src/standalone/helper.js index 79f5a4166..8101bfc99 100644 --- a/packages/@uppy/companion/src/standalone/helper.js +++ b/packages/@uppy/companion/src/standalone/helper.js @@ -141,7 +141,7 @@ const getConfigFromEnv = () => { process.env.COMPANION_AWS_USE_ACCELERATE_ENDPOINT === 'true', expires: parseInt(process.env.COMPANION_AWS_EXPIRES || '800', 10), acl: process.env.COMPANION_AWS_ACL, - enableAwsSseKms: process.env.COMPANION_ENABLE_AWS_SSE_KMS === 'true', + awsSse: process.env.COMPANION_AWS_SSE, awsSseKmsKeyId: process.env.COMPANION_AWS_SSE_KMS_KEY_ID, forcePathStyle: process.env.COMPANION_AWS_FORCE_PATH_STYLE === 'true', },