Migrate AWS SDK for JavaScript v2 APIs to v3 in e2e-tests (#25301)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f74bf47f07
Коммит
10026972b5
@@ -8,7 +8,8 @@ const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const async = require('async');
|
||||
const AWS = require('aws-sdk');
|
||||
const {S3} = require('@aws-sdk/client-s3');
|
||||
const {Upload} = require('@aws-sdk/lib-storage');
|
||||
const mime = require('mime-types');
|
||||
const readdir = require('recursive-readdir');
|
||||
|
||||
@@ -25,10 +26,11 @@ const {
|
||||
BUILD_TAG,
|
||||
} = process.env;
|
||||
|
||||
const s3 = new AWS.S3({
|
||||
signatureVersion: 'v4',
|
||||
accessKeyId: AWS_ACCESS_KEY_ID,
|
||||
secretAccessKey: AWS_SECRET_ACCESS_KEY,
|
||||
const s3 = new S3({
|
||||
credentials: {
|
||||
accessKeyId: AWS_ACCESS_KEY_ID,
|
||||
secretAccessKey: AWS_SECRET_ACCESS_KEY,
|
||||
},
|
||||
});
|
||||
|
||||
function getFiles(dirPath) {
|
||||
@@ -55,23 +57,21 @@ async function saveArtifacts() {
|
||||
const contentType = mime.lookup(file);
|
||||
const charset = mime.charset(contentType);
|
||||
|
||||
return new Promise((res, rej) => {
|
||||
s3.upload(
|
||||
{
|
||||
try {
|
||||
await new Upload({
|
||||
client: s3,
|
||||
params: {
|
||||
Key,
|
||||
Bucket: AWS_S3_BUCKET,
|
||||
Body: fs.readFileSync(file),
|
||||
ContentType: `${contentType}${charset ? '; charset=' + charset : ''}`,
|
||||
},
|
||||
(err) => {
|
||||
if (err) {
|
||||
console.log('Failed to upload artifact:', file);
|
||||
return rej(new Error(err));
|
||||
}
|
||||
res({success: true});
|
||||
},
|
||||
);
|
||||
});
|
||||
}).done();
|
||||
return {success: true};
|
||||
} catch (e) {
|
||||
console.log('Failed to upload artifact:', file);
|
||||
throw new Error(e);
|
||||
}
|
||||
}),
|
||||
(err) => {
|
||||
if (err) {
|
||||
|
||||
Ссылка в новой задаче
Block a user