Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit 80fff4b

Browse files
fix(webhook): replace node-fetch by axios #1247
1 parent 1e6c8b0 commit 80fff4b

File tree

3 files changed

+53
-7
lines changed

3 files changed

+53
-7
lines changed

Diff for: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"typescript": "^4.3.4"
3434
},
3535
"dependencies": {
36-
"node-fetch": "^2.6.1"
36+
"axios": "^0.22.0",
37+
"node-fetch": "^3.0.0"
3738
}
3839
}

Diff for: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/src/syncer/handler.ts

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Octokit } from '@octokit/rest';
22
import { PassThrough } from 'stream';
3-
import fetch from 'node-fetch';
43
import { S3 } from 'aws-sdk';
54
import AWS from 'aws-sdk';
5+
import axios from 'axios';
66

77
const versionKey = 'name';
88

@@ -74,16 +74,24 @@ async function uploadToS3(s3: S3, cacheObject: CacheObject, actionRunnerReleaseA
7474
.promise();
7575

7676
console.debug('Start downloading %s and uploading to S3.', actionRunnerReleaseAsset.name);
77+
7778
const readPromise = new Promise<void>((resolve, reject) => {
78-
fetch(actionRunnerReleaseAsset.downloadUrl)
79-
.then((res) =>
80-
res.body
79+
axios
80+
.request<NodeJS.ReadableStream>({
81+
method: 'get',
82+
url: actionRunnerReleaseAsset.downloadUrl,
83+
responseType: 'stream',
84+
})
85+
.then((res) => {
86+
res.data
8187
.pipe(writeStream)
88+
8289
.on('finish', () => resolve())
83-
.on('error', (error) => reject(error)),
84-
)
90+
.on('error', (error) => reject(error));
91+
})
8592
.catch((error) => reject(error));
8693
});
94+
8795
await Promise.all([readPromise, writePromise])
8896
.then(() => console.info(`The new distribution is uploaded to S3.`))
8997
.catch((error) => {

Diff for: modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/yarn.lock

+37
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,13 @@ aws-sdk@^2.970.0:
10261026
uuid "3.3.2"
10271027
xml2js "0.4.19"
10281028

1029+
axios@^0.22.0:
1030+
version "0.22.0"
1031+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.22.0.tgz#bf702c41fb50fbca4539589d839a077117b79b25"
1032+
integrity sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==
1033+
dependencies:
1034+
follow-redirects "^1.14.4"
1035+
10291036
babel-jest@^27.2.4:
10301037
version "27.2.4"
10311038
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.4.tgz#21ed6729d51bdd75470bbbf3c8b08d86209fb0dc"
@@ -1326,6 +1333,11 @@ cssstyle@^2.3.0:
13261333
dependencies:
13271334
cssom "~0.3.6"
13281335

1336+
data-uri-to-buffer@^3.0.1:
1337+
version "3.0.1"
1338+
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
1339+
integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
1340+
13291341
data-urls@^2.0.0:
13301342
version "2.0.0"
13311343
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -1684,6 +1696,13 @@ fb-watchman@^2.0.0:
16841696
dependencies:
16851697
bser "2.1.1"
16861698

1699+
fetch-blob@^3.1.2:
1700+
version "3.1.2"
1701+
resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.2.tgz#6bc438675f3851ecea51758ac91f6a1cd1bacabd"
1702+
integrity sha512-hunJbvy/6OLjCD0uuhLdp0mMPzP/yd2ssd1t2FCJsaA7wkWhpbp9xfuNVpv7Ll4jFhzp6T4LAupSiV9uOeg0VQ==
1703+
dependencies:
1704+
web-streams-polyfill "^3.0.3"
1705+
16871706
file-entry-cache@^6.0.1:
16881707
version "6.0.1"
16891708
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -1719,6 +1738,11 @@ flatted@^3.1.0:
17191738
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
17201739
integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
17211740

1741+
follow-redirects@^1.14.4:
1742+
version "1.14.4"
1743+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
1744+
integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
1745+
17221746
form-data@^2.5.0:
17231747
version "2.5.1"
17241748
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
@@ -2717,6 +2741,14 @@ node-fetch@^2.6.1:
27172741
dependencies:
27182742
whatwg-url "^5.0.0"
27192743

2744+
node-fetch@^3.0.0:
2745+
version "3.0.0"
2746+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.0.0.tgz#79da7146a520036f2c5f644e4a26095f17e411ea"
2747+
integrity sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==
2748+
dependencies:
2749+
data-uri-to-buffer "^3.0.1"
2750+
fetch-blob "^3.1.2"
2751+
27202752
node-int64@^0.4.0:
27212753
version "0.4.0"
27222754
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -3479,6 +3511,11 @@ walker@^1.0.7:
34793511
dependencies:
34803512
makeerror "1.0.x"
34813513

3514+
web-streams-polyfill@^3.0.3:
3515+
version "3.1.1"
3516+
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz#1516f2d4ea8f1bdbfed15eb65cb2df87098c8364"
3517+
integrity sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q==
3518+
34823519
webidl-conversions@^3.0.0:
34833520
version "3.0.1"
34843521
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

0 commit comments

Comments
 (0)