Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate AWS SDK for JavaScript v2 APIs to v3 in bin folder #4776

Merged
merged 4 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions bin/upload-to-cdn.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
const path = require('node:path')
const { pipeline, finished } = require('node:stream/promises')
const { readFile } = require('node:fs/promises')
const AWS = require('aws-sdk')
const { S3 } = require('@aws-sdk/client-s3');

const packlist = require('npm-packlist')
const tar = require('tar')
const pacote = require('pacote')
Expand Down Expand Up @@ -108,11 +109,11 @@ async function main (packageName, version) {
// where we force push a local build
if (version?.startsWith('-')) version = undefined // eslint-disable-line no-param-reassign

const s3 = new AWS.S3({
credentials: new AWS.Credentials({
const s3 = new S3({
credentials: {
accessKeyId: process.env.EDGLY_KEY,
secretAccessKey: process.env.EDGLY_SECRET,
}),
},
region: AWS_REGION,
})

Expand Down Expand Up @@ -146,7 +147,7 @@ async function main (packageName, version) {
const { Contents: existing } = await s3.listObjects({
Bucket: AWS_BUCKET,
Prefix: outputPath,
}).promise()
})
if (existing.length > 0) {
if (process.argv.includes('--force')) {
console.warn(`WARN Release files for ${dirName} v${version} already exist, overwriting...`)
Expand Down Expand Up @@ -178,7 +179,7 @@ async function main (packageName, version) {
Key: key,
ContentType: mime.lookup(filename),
Body: buffer,
}).promise()
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"e2e"
],
"devDependencies": {
"@aws-sdk/client-s3": "^3.338.0",
"@babel/cli": "^7.14.5",
"@babel/core": "^7.14.6",
"@babel/eslint-parser": "^7.11.3",
Expand All @@ -57,7 +58,6 @@
"@uppy-dev/remark-lint-uppy": "workspace:*",
"adm-zip": "^0.5.5",
"autoprefixer": "^10.2.6",
"aws-sdk": "^2.1038.0",
"babel-plugin-inline-package-json": "^2.0.0",
"chalk": "^5.0.0",
"concat-stream": "^2.0.0",
Expand Down
152 changes: 4 additions & 148 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8686,6 +8686,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@uppy-dev/build@workspace:."
dependencies:
"@aws-sdk/client-s3": ^3.338.0
"@babel/cli": ^7.14.5
"@babel/core": ^7.14.6
"@babel/eslint-parser": ^7.11.3
Expand All @@ -8705,7 +8706,6 @@ __metadata:
"@uppy-dev/remark-lint-uppy": "workspace:*"
adm-zip: ^0.5.5
autoprefixer: ^10.2.6
aws-sdk: ^2.1038.0
babel-plugin-inline-package-json: ^2.0.0
chalk: ^5.0.0
concat-stream: ^2.0.0
Expand Down Expand Up @@ -11358,24 +11358,6 @@ __metadata:
languageName: node
linkType: hard

"aws-sdk@npm:^2.1038.0":
version: 2.1206.0
resolution: "aws-sdk@npm:2.1206.0"
dependencies:
buffer: 4.9.2
events: 1.1.1
ieee754: 1.1.13
jmespath: 0.16.0
querystring: 0.2.0
sax: 1.2.1
url: 0.10.3
util: ^0.12.4
uuid: 8.0.0
xml2js: 0.4.19
checksum: c565bfd4bdfdedb486540e8681b3cf4a73bd95b560e4f27bc637fce31d30fb4321686e3def8b3e94a6a3d0384f50396dd74b52b346457b7779aa769c21fd9a59
languageName: node
linkType: hard

"aws-sign2@npm:~0.7.0":
version: 0.7.0
resolution: "aws-sign2@npm:0.7.0"
Expand Down Expand Up @@ -12082,17 +12064,6 @@ __metadata:
languageName: node
linkType: hard

"buffer@npm:4.9.2":
version: 4.9.2
resolution: "buffer@npm:4.9.2"
dependencies:
base64-js: ^1.0.2
ieee754: ^1.1.4
isarray: ^1.0.0
checksum: 8801bc1ba08539f3be70eee307a8b9db3d40f6afbfd3cf623ab7ef41dffff1d0a31de0addbe1e66e0ca5f7193eeb667bfb1ecad3647f8f1b0750de07c13295c3
languageName: node
linkType: hard

"buffer@npm:5.6.0":
version: 5.6.0
resolution: "buffer@npm:5.6.0"
Expand Down Expand Up @@ -15942,13 +15913,6 @@ __metadata:
languageName: node
linkType: hard

"events@npm:1.1.1":
version: 1.1.1
resolution: "events@npm:1.1.1"
checksum: 40431eb005cc4c57861b93d44c2981a49e7feb99df84cf551baed299ceea4444edf7744733f6a6667e942af687359b1f4a87ec1ec4f21d5127dac48a782039b9
languageName: node
linkType: hard

"events@npm:3.3.0, events@npm:^3.2.0":
version: 3.3.0
resolution: "events@npm:3.3.0"
Expand Down Expand Up @@ -18292,13 +18256,6 @@ __metadata:
languageName: node
linkType: hard

"ieee754@npm:1.1.13":
version: 1.1.13
resolution: "ieee754@npm:1.1.13"
checksum: 102df1ba662e316e6160f7ce29c7c7fa3e04f2014c288336c5a9ff40bbcc2a27d209fa2a81ebfb33f28b1941021343d30e9ad8ee85a2d61f79f5936c35edc33d
languageName: node
linkType: hard

"ieee754@npm:^1.1.13, ieee754@npm:^1.1.4":
version: 1.2.1
resolution: "ieee754@npm:1.2.1"
Expand Down Expand Up @@ -18662,7 +18619,7 @@ __metadata:
languageName: node
linkType: hard

"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
"is-arguments@npm:^1.1.1":
version: 1.1.1
resolution: "is-arguments@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -18941,15 +18898,6 @@ __metadata:
languageName: node
linkType: hard

"is-generator-function@npm:^1.0.7":
version: 1.0.10
resolution: "is-generator-function@npm:1.0.10"
dependencies:
has-tostringtag: ^1.0.0
checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
languageName: node
linkType: hard

"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
version: 4.0.3
resolution: "is-glob@npm:4.0.3"
Expand Down Expand Up @@ -19228,7 +19176,7 @@ __metadata:
languageName: node
linkType: hard

"is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
"is-typed-array@npm:^1.1.9":
version: 1.1.9
resolution: "is-typed-array@npm:1.1.9"
dependencies:
Expand Down Expand Up @@ -19318,7 +19266,7 @@ __metadata:
languageName: node
linkType: hard

"isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
"isarray@npm:1.0.0, isarray@npm:~1.0.0":
version: 1.0.0
resolution: "isarray@npm:1.0.0"
checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
Expand Down Expand Up @@ -20052,13 +20000,6 @@ __metadata:
languageName: node
linkType: hard

"jmespath@npm:0.16.0":
version: 0.16.0
resolution: "jmespath@npm:0.16.0"
checksum: 2d602493a1e4addfd1350ac8c9d54b1b03ed09e305fd863bab84a4ee1f52868cf939dd1a08c5cdea29ce9ba8f86875ebb458b6ed45dab3e1c3f2694503fb2fd9
languageName: node
linkType: hard

"joi@npm:^17.2.1":
version: 17.6.3
resolution: "joi@npm:17.6.3"
Expand Down Expand Up @@ -26222,13 +26163,6 @@ __metadata:
languageName: node
linkType: hard

"punycode@npm:1.3.2":
version: 1.3.2
resolution: "punycode@npm:1.3.2"
checksum: b8807fd594b1db33335692d1f03e8beeddde6fda7fbb4a2e32925d88d20a3aa4cd8dcc0c109ccaccbd2ba761c208dfaaada83007087ea8bfb0129c9ef1b99ed6
languageName: node
linkType: hard

"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
version: 2.1.1
resolution: "punycode@npm:2.1.1"
Expand Down Expand Up @@ -26298,13 +26232,6 @@ __metadata:
languageName: node
linkType: hard

"querystring@npm:0.2.0":
version: 0.2.0
resolution: "querystring@npm:0.2.0"
checksum: 8258d6734f19be27e93f601758858c299bdebe71147909e367101ba459b95446fbe5b975bf9beb76390156a592b6f4ac3a68b6087cea165c259705b8b4e56a69
languageName: node
linkType: hard

"querystring@npm:^0.2.1":
version: 0.2.1
resolution: "querystring@npm:0.2.1"
Expand Down Expand Up @@ -28001,13 +27928,6 @@ __metadata:
languageName: node
linkType: hard

"sax@npm:1.2.1":
version: 1.2.1
resolution: "sax@npm:1.2.1"
checksum: 8dca7d5e1cd7d612f98ac50bdf0b9f63fbc964b85f0c4e2eb271f8b9b47fd3bf344c4d6a592e69ecf726d1485ca62cd8a52e603bbc332d18a66af25a9a1045ad
languageName: node
linkType: hard

"sax@npm:>=0.6.0, sax@npm:^1.2.4":
version: 1.2.4
resolution: "sax@npm:1.2.4"
Expand Down Expand Up @@ -31199,16 +31119,6 @@ __metadata:
languageName: node
linkType: hard

"url@npm:0.10.3":
version: 0.10.3
resolution: "url@npm:0.10.3"
dependencies:
punycode: 1.3.2
querystring: 0.2.0
checksum: 7b83ddb106c27bf9bde8629ccbe8d26e9db789c8cda5aa7db72ca2c6f9b8a88a5adf206f3e10db78e6e2d042b327c45db34c7010c1bf0d9908936a17a2b57d05
languageName: node
linkType: hard

"use-subscription@npm:^1.0.0":
version: 1.8.0
resolution: "use-subscription@npm:1.8.0"
Expand Down Expand Up @@ -31243,20 +31153,6 @@ __metadata:
languageName: node
linkType: hard

"util@npm:^0.12.4":
version: 0.12.4
resolution: "util@npm:0.12.4"
dependencies:
inherits: ^2.0.3
is-arguments: ^1.0.4
is-generator-function: ^1.0.7
is-typed-array: ^1.1.3
safe-buffer: ^5.1.2
which-typed-array: ^1.1.2
checksum: 8eac7a6e6b341c0f1b3eb73bbe5dfcae31a7e9699c8fc3266789f3e95f7637946a7700dcf1904dbd3749a58a36760ebf7acf4bb5b717f7468532a8a79f44eff0
languageName: node
linkType: hard

"utility-types@npm:^3.10.0":
version: 3.10.0
resolution: "utility-types@npm:3.10.0"
Expand All @@ -31280,15 +31176,6 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:8.0.0":
version: 8.0.0
resolution: "uuid@npm:8.0.0"
bin:
uuid: dist/bin/uuid
checksum: 56d4e23aa7ac26fa2db6bd1778db34cb8c9f5a10df1770a27167874bf6705fc8f14a4ac414af58a0d96c7653b2bd4848510b29d1c2ef8c91ccb17429c1872b5e
languageName: node
linkType: hard

"uuid@npm:8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
Expand Down Expand Up @@ -32207,20 +32094,6 @@ __metadata:
languageName: node
linkType: hard

"which-typed-array@npm:^1.1.2":
version: 1.1.8
resolution: "which-typed-array@npm:1.1.8"
dependencies:
available-typed-arrays: ^1.0.5
call-bind: ^1.0.2
es-abstract: ^1.20.0
for-each: ^0.3.3
has-tostringtag: ^1.0.0
is-typed-array: ^1.1.9
checksum: bedf4d30a738e848404fe67fe0ace33433a7298cf3f5a4d4b2c624ba99c4d25f06a7fd6f3566c3d16af5f8a54f0c6293cbfded5b1208ce11812753990223b45a
languageName: node
linkType: hard

"which-typed-array@npm:^1.1.9":
version: 1.1.9
resolution: "which-typed-array@npm:1.1.9"
Expand Down Expand Up @@ -32505,16 +32378,6 @@ __metadata:
languageName: node
linkType: hard

"xml2js@npm:0.4.19":
version: 0.4.19
resolution: "xml2js@npm:0.4.19"
dependencies:
sax: ">=0.6.0"
xmlbuilder: ~9.0.1
checksum: ca8b2fee430d450a18947786bfd7cd1a353ee00fc6fd550acbc8a8e65f1b4df5e9786fcb2990c1a5514ecd554d445fb74e1d716b3a4fcfffc10554aeb5db482b
languageName: node
linkType: hard

"xml2js@npm:0.4.23, xml2js@npm:^0.4.23":
version: 0.4.23
resolution: "xml2js@npm:0.4.23"
Expand Down Expand Up @@ -32546,13 +32409,6 @@ __metadata:
languageName: node
linkType: hard

"xmlbuilder@npm:~9.0.1":
version: 9.0.7
resolution: "xmlbuilder@npm:9.0.7"
checksum: 8193bb323806a002764f013bea0c6e9ff2dc26fd29109408761b16b59a8ad2214c2abe8e691755fd8b525586e3a0e1efeb92335947d7b0899032b779f1705a53
languageName: node
linkType: hard

"xmlchars@npm:^2.2.0":
version: 2.2.0
resolution: "xmlchars@npm:2.2.0"
Expand Down