Skip to content

Commit e3bdd6a

Browse files
committed
update aws sdk we use in tests
1 parent ca0d0f6 commit e3bdd6a

File tree

3 files changed

+5729
-3011
lines changed

3 files changed

+5729
-3011
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
"test": "electron-mocha -t 80000 --js-flags=\"--expose-gc\" -c true -r ts-node/register tests/osn-tests/src/**/*.ts --reporter tests/osn-tests/util/list-reporter.js"
2525
},
2626
"devDependencies": {
27+
"@aws-sdk/client-s3": "^3.0.0",
28+
"@aws-sdk/lib-storage": "^3.0.0",
2729
"@types/chai": "^4.1.7",
2830
"@types/chai-subset": "^1.3.5",
2931
"@types/mocha": "^5.2.5",
3032
"@types/node": "^16.7.13",
3133
"archiver": "^3.1.1",
32-
"aws-sdk": "^2.1164.0",
3334
"chai": "^4.2.0",
3435
"chai-subset": "^1.6.0",
3536
"colors": "^1.4.0",
@@ -68,5 +69,6 @@
6869
"audio",
6970
"mixer",
7071
"beam"
71-
]
72+
],
73+
"packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538"
7274
}

tests/osn-tests/util/cache-uploader.ts

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
3-
import * as aws from 'aws-sdk';
3+
import { S3Client } from '@aws-sdk/client-s3';
4+
import { Upload } from '@aws-sdk/lib-storage';
45
import * as archiver from 'archiver';
56
import { logInfo } from '../util/logger';
67

@@ -39,23 +40,25 @@ export class CacheUploader {
3940
const file = fs.createReadStream(cacheFile);
4041
const keyname = this.dateStr + '-' + this.testName + '-test-cache-' + this.releaseName + '.zip';
4142

42-
aws.config.region = 'us-west-2';
43-
4443
// This is a restricted cache upload account
45-
aws.config.credentials = new aws.Credentials({
46-
accessKeyId: process.env.OSN_ACCESS_KEY_ID,
47-
secretAccessKey: process.env.OSN_SECRET_ACCESS_KEY,
44+
const s3 = new S3Client({
45+
region: 'us-west-2',
46+
credentials: {
47+
accessKeyId: process.env.OSN_ACCESS_KEY_ID,
48+
secretAccessKey: process.env.OSN_SECRET_ACCESS_KEY,
49+
},
4850
});
49-
50-
const upload = new aws.S3.ManagedUpload({
51-
params: {
52-
Bucket: 'obs-studio-node-tests-cache',
53-
Key: keyname,
54-
Body: file,
55-
},
51+
52+
const upload = new Upload({
53+
client: s3,
54+
params: {
55+
Bucket: 'obs-studio-node-tests-cache',
56+
Key: keyname,
57+
Body: file,
58+
},
5659
});
57-
58-
upload.promise().then(() => {
60+
61+
upload.done().then(() => {
5962
logInfo(this.testName, 'Finished uploading cache');
6063
logInfo(this.testName, keyname);
6164
resolve(keyname);

0 commit comments

Comments
 (0)