Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-17 16:50:22 +00:00
Code Issues Projects Releases Wiki Activity

allow dynamic value

Browse source
This commit is contained in:
Mikael Finstad 2026-03-29 18:12:45 +08:00
parent 3c59e234c5
commit 2603292de0
No known key found for this signature in database
GPG key ID: 25AB36E3E81CBC26
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/@uppy/companion/src/server/Uploader.js
View file

@ -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) {

11
packages/@uppy/companion/src/server/controllers/s3.js
View file

@ -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) {

2
packages/@uppy/companion/src/standalone/helper.js
View file

@ -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',
},