yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 14:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

address PR feedback

Browse Source 
# Conflicts:
#	packages/providers/upload-aws-s3/lib/index.js
This commit is contained in:
dobrud 2022-10-25 14:45:50 +02:00
parent 741ca421a9
commit 5e3741586b
No known key found for this signature in database
GPG Key ID: 786550F5A4628733
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/providers/upload-aws-s3/lib/index.js
View File

@ -12,19 +12,23 @@ const AWS = require('aws-sdk');
module.exports = { module.exports = {
init({ baseUrl = null, rootPath = null, s3Options, ...legacyS3Options }) { init({ baseUrl = null, rootPath = null, s3Options, ...legacyS3Options }) {
if (legacyS3Options && process.env.NODE_ENV !== 'production') if (legacyS3Options && process.env.NODE_ENV !== 'production')
console.log("S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. You wrap them inside the 's3Options:{}' property.") process.emitWarning(
"S3 configuration options passed at root level of the plugin's providerOptions is deprecated and will be removed in a future release. You wrap them inside the 's3Options:{}' property."
);
const S3 = new AWS.S3({ const S3 = new AWS.S3({
apiVersion: '2006-03-01', apiVersion: '2006-03-01',
...s3Options, ...s3Options,
...legacyS3Options ...legacyS3Options,
}); });
const filePrefix = rootPath ? `${rootPath.replace(/\/+$/, '')}/` : '';
const upload = (file, customParams = {}) => const upload = (file, customParams = {}) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
// upload file on S3 bucket // upload file on S3 bucket
const path = file.path ? `${file.path}/` : ''; const path = file.path ? `${file.path}/` : '';
const fileKey = `${rootPath ? rootPath.replace(/\/+$/, "") + "/" : ""}${path}${file.hash}${file.ext}` const fileKey = `${filePrefix}${path}${file.hash}${file.ext}`;
S3.upload( S3.upload(
{ {
@ -58,9 +62,10 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// delete file on S3 bucket // delete file on S3 bucket
const path = file.path ? `${file.path}/` : ''; const path = file.path ? `${file.path}/` : '';
const fileKey = `${filePrefix}${path}${file.hash}${file.ext}`;
S3.deleteObject( S3.deleteObject(
{ {
Key: `${rootPath}${path}${file.hash}${file.ext}`, Key: fileKey,
...customParams, ...customParams,
}, },
(err) => { (err) => {