IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate AWS SDK for JavaScript v2 APIs to v3 in e2e-tests (#25301)

Browse Source
This commit is contained in:
Trivikram Kamat 2023-11-10 10:39:17 -08:00 committed by GitHub
parent f74bf47f07
commit 10026972b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2956 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3172
e2e-tests/cypress/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
e2e-tests/cypress/package.json
View File

@ -1,6 +1,8 @@
{ {
"name": "cypress", "name": "cypress",
"devDependencies": { "devDependencies": {
"@aws-sdk/client-s3": "3.441.0",
"@aws-sdk/lib-storage": "3.441.0",
"@babel/eslint-parser": "7.22.15", "@babel/eslint-parser": "7.22.15",
"@babel/eslint-plugin": "7.22.10", "@babel/eslint-plugin": "7.22.10",
"@cypress/request": "3.0.1", "@cypress/request": "3.0.1",
@ -25,7 +27,6 @@
"@typescript-eslint/parser": "6.7.4", "@typescript-eslint/parser": "6.7.4",
"async": "3.2.4", "async": "3.2.4",
"authenticator": "1.1.5", "authenticator": "1.1.5",
"aws-sdk": "2.1468.0",
"axios": "1.5.1", "axios": "1.5.1",
"axios-retry": "3.8.0", "axios-retry": "3.8.0",
"chai": "4.3.10", "chai": "4.3.10",

34
e2e-tests/cypress/utils/artifacts.js
View File

@ -8,7 +8,8 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const async = require('async'); 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 mime = require('mime-types');
const readdir = require('recursive-readdir'); const readdir = require('recursive-readdir');
@ -25,10 +26,11 @@ const {
BUILD_TAG, BUILD_TAG,
} = process.env; } = process.env;
const s3 = new AWS.S3({ const s3 = new S3({
signatureVersion: 'v4', credentials: {
accessKeyId: AWS_ACCESS_KEY_ID, accessKeyId: AWS_ACCESS_KEY_ID,
secretAccessKey: AWS_SECRET_ACCESS_KEY, secretAccessKey: AWS_SECRET_ACCESS_KEY,
},
}); });
function getFiles(dirPath) { function getFiles(dirPath) {
@ -55,23 +57,21 @@ async function saveArtifacts() {
const contentType = mime.lookup(file); const contentType = mime.lookup(file);
const charset = mime.charset(contentType); const charset = mime.charset(contentType);
return new Promise((res, rej) => { try {
s3.upload( await new Upload({
{ client: s3,
params: {
Key, Key,
Bucket: AWS_S3_BUCKET, Bucket: AWS_S3_BUCKET,
Body: fs.readFileSync(file), Body: fs.readFileSync(file),
ContentType: `${contentType}${charset ? '; charset=' + charset : ''}`, ContentType: `${contentType}${charset ? '; charset=' + charset : ''}`,
}, },
(err) => { }).done();
if (err) { return {success: true};
console.log('Failed to upload artifact:', file); } catch (e) {
return rej(new Error(err)); console.log('Failed to upload artifact:', file);
} throw new Error(e);
res({success: true}); }
},
);
});
}), }),
(err) => { (err) => {
if (err) { if (err) {