yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-10 17:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add only credentials object when credentials are present

Browse Source
This commit is contained in:
Christian Capeans 2023-11-13 19:54:47 +01:00
parent d87a9b3b6b
commit af5a6e37b2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/providers/upload-aws-s3/src/index.ts
View File

@ -76,11 +76,11 @@ const getConfig = ({ baseUrl, rootPath, s3Options, ...legacyS3Options }: InitOpt
"S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. Please wrap them inside the 's3Options:{}' property." "S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. Please wrap them inside the 's3Options:{}' property."
); );
} }
const credentials = extractCredentials({ s3Options, ...legacyS3Options });
const config = { const config = {
...s3Options, ...s3Options,
...legacyS3Options, ...legacyS3Options,
credentials: extractCredentials({ s3Options, ...legacyS3Options }), ...[credentials ? { credentials } : {}],
}; };
config.params.ACL = getOr(ObjectCannedACL.public_read, ['params', 'ACL'], config); config.params.ACL = getOr(ObjectCannedACL.public_read, ['params', 'ACL'], config);