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

e2e-tests/cypress/package.json

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

e2e-tests/cypress/utils/artifacts.js

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