Skip to content

Commit eb469a0

Browse files
authored
Merge pull request #1207 from input-output-hk/feat/lw-10266-upgrade-axios-version
[LW-10266] Upgrade Axios version to 0.28.0
2 parents b0c08fd + 59fcd06 commit eb469a0

File tree

9 files changed

+37
-16
lines changed

9 files changed

+37
-16
lines changed

packages/cardano-services-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"dependencies": {
5757
"@cardano-sdk/core": "workspace:~",
5858
"@cardano-sdk/util": "workspace:~",
59-
"axios": "^0.27.2",
59+
"axios": "^0.28.0",
6060
"class-validator": "^0.14.0",
6161
"json-bigint": "~1.0.0",
6262
"ts-log": "^2.2.4"

packages/cardano-services/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"@cardano-sdk/util": "workspace:~",
9696
"@cardano-sdk/util-rxjs": "workspace:~",
9797
"@hapi/topo": "^6.0.2",
98-
"axios": "^0.27.2",
98+
"axios": "^0.28.0",
9999
"backoff-rxjs": "^7.0.0",
100100
"bignumber.js": "^9.1.0",
101101
"body-parser": "^1.19.2",

packages/cardano-services/test/Asset/CardanoTokenRegistry.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ describe('CardanoTokenRegistry', () => {
179179
it('internal server error', async () => {
180180
const failedMetadata = null;
181181
const succeededMetadata = { assetId: validAssetId, name: 'test' };
182+
const innerError = 'AxiosError: Request failed with status code 500';
182183

183184
let alreadyCalled = false;
184185
const record = async () => {
@@ -204,14 +205,15 @@ describe('CardanoTokenRegistry', () => {
204205
await expect(tokenRegistry.getTokenMetadata([invalidAssetId, validAssetId])).rejects.toThrow(
205206
new ProviderError(
206207
ProviderFailure.Unhealthy,
207-
null,
208+
innerError,
208209
'CardanoTokenRegistry failed to fetch asset metadata from the token registry server due to: Request failed with status code 500'
209210
)
210211
);
211212
});
212213

213214
it('timeout server error', async () => {
214215
const exceededTimeout = defaultTimeout + 1000;
216+
const innerError = `AxiosError: timeout of ${defaultTimeout}ms exceeded`;
215217
const record = async () => {
216218
await sleep(exceededTimeout);
217219

@@ -231,7 +233,7 @@ describe('CardanoTokenRegistry', () => {
231233
await expect(tokenRegistry.getTokenMetadata([validAssetId])).rejects.toThrow(
232234
new ProviderError(
233235
ProviderFailure.Unhealthy,
234-
null,
236+
innerError,
235237
`CardanoTokenRegistry failed to fetch asset metadata from the token registry server due to: timeout of ${defaultTimeout}ms exceeded`
236238
)
237239
);

packages/cardano-services/test/Handle/HandleHttpService.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ describe('HandleHttpService', () => {
5656

5757
const { message, response } = error;
5858

59-
if (!response) return { message, statusText: error.status };
59+
if (!response)
60+
return {
61+
message,
62+
statusText: `${typeof error.status === 'string' ? error.status : JSON.stringify(error.status)}`
63+
};
6064

6165
const { data, status, statusText } = response;
6266

packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ describe('StakePoolMetadataService', () => {
5252
await closeMock();
5353
});
5454

55+
const innerError500 = 'AxiosError: Request failed with status code 500';
56+
const innerError404 = 'AxiosError: Request failed with status code 404';
57+
5558
describe('getStakePoolMetadata', () => {
5659
it('fetch stake pool JSON metadata without extended data', async () => {
5760
({ closeMock, serverUrl } = await mockPoolExtMetadataServer(async () => ({
@@ -116,7 +119,7 @@ describe('StakePoolMetadataService', () => {
116119
expect(result).toEqual(
117120
new StakePoolMetadataServiceError(
118121
StakePoolMetadataServiceFailure.FailedToFetchMetadata,
119-
null,
122+
innerError500,
120123
`StakePoolMetadataService failed to fetch metadata JSON from ${serverUrl} due to Request failed with status code 500`
121124
)
122125
);
@@ -205,7 +208,7 @@ describe('StakePoolMetadataService', () => {
205208
expect(result).toEqual(
206209
new StakePoolMetadataServiceError(
207210
StakePoolMetadataServiceFailure.FailedToFetchExtendedSignature,
208-
null,
211+
innerError404,
209212
`StakePoolMetadataService failed to fetch extended signature from ${metadata.extSigUrl} due to connection error`
210213
)
211214
);
@@ -372,7 +375,7 @@ describe('StakePoolMetadataService', () => {
372375
await expect(metadataService.getStakePoolExtendedMetadata(extMetadata)).rejects.toThrow(
373376
new StakePoolMetadataServiceError(
374377
StakePoolMetadataServiceFailure.FailedToFetchExtendedMetadata,
375-
null,
378+
innerError500,
376379
`StakePoolMetadataService failed to fetch extended metadata from ${serverUrl}/${ExtMetadataFormat.CIP6} due to connection error`
377380
)
378381
);
@@ -402,7 +405,7 @@ describe('StakePoolMetadataService', () => {
402405
await expect(metadataService.getStakePoolExtendedMetadata(extMetadata)).rejects.toThrow(
403406
new StakePoolMetadataServiceError(
404407
StakePoolMetadataServiceFailure.FailedToFetchExtendedMetadata,
405-
null,
408+
innerError404,
406409
`StakePoolMetadataService failed to fetch extended metadata from ${serverUrl}/${ExtMetadataFormat.CIP6} due to resource not found`
407410
)
408411
);

packages/e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"@cardano-sdk/wallet": "workspace:~",
9797
"@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1",
9898
"@vespaiach/axios-fetch-adapter": "^0.3.0",
99-
"axios": "^0.27.2",
99+
"axios": "^0.28.0",
100100
"bunyan": "^1.8.15",
101101
"chalk": "4.1.2",
102102
"cli-spinners": "^2.9.0",

packages/util-dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@cardano-sdk/key-management": "workspace:~",
6060
"@cardano-sdk/util": "workspace:~",
6161
"@types/dockerode": "^3.3.8",
62-
"axios": "^0.27.2",
62+
"axios": "^0.28.0",
6363
"delay": "^5.0.0",
6464
"dockerode": "^3.3.1",
6565
"dockerode-utils": "^0.0.7",

yarn-project.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ cacheEntries = {
898898
"axios-mock-adapter@npm:1.21.2" = { filename = "axios-mock-adapter-npm-1.21.2-67858a7fb9-0d334838a8.zip"; sha512 = "0d334838a819597f49fd5bf807e2a46cd846397cbea734fd53dcb425dee914e2d3e57cff65eb36af70cdbba848416c48979b75223afbfc1ab49789fd12011618"; };
899899
"axios@npm:0.25.0" = { filename = "axios-npm-0.25.0-a1c287d287-2a8a3787c0.zip"; sha512 = "2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad"; };
900900
"axios@npm:0.27.2" = { filename = "axios-npm-0.27.2-dbe3a48aea-38cb754046.zip"; sha512 = "38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854"; };
901+
"axios@npm:0.28.1" = { filename = "axios-npm-0.28.1-84ca28650b-5115a38d79.zip"; sha512 = "5115a38d79064d07437c5a28f15841e3607634040e3120ec06a2c4367a7d07cf213b16496eab53b6f58ebc5fb377a440ba9ed4782529b14449a1e285734bfb54"; };
901902
"axios@npm:1.6.2" = { filename = "axios-npm-1.6.2-2334cb6eee-4a7429e2b7.zip"; sha512 = "4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8"; };
902903
"b4a@npm:1.6.1" = { filename = "b4a-npm-1.6.1-11ac2fd316-9d085922d4.zip"; sha512 = "9d085922d4a6bcaac69e68520681cd60da0e2dca8ea80a89cd27a3a3037058d4669a2904aa9925c7f567d84f62f64beafaf0c831771bd4eb86ca5ecbbca402d8"; };
903904
"babel-eslint@npm:10.0.3" = { filename = "babel-eslint-npm-10.0.3-ba50cae6ec-d3bf355c20.zip"; sha512 = "d3bf355c20d1a2f0667ace6c43263eecb0d09342a833129c67cc9f554a5dbc335bd6a73cbd3001ee6074570ca2184366ddff6c58afccf8fd55e249c02ff54288"; };

yarn.lock

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@ __metadata:
31083108
"@cardano-sdk/util-dev": "workspace:~"
31093109
"@koralabs/handles-public-api-interfaces": 2.4.3
31103110
"@types/validator": ^13.7.1
3111-
axios: ^0.27.2
3111+
axios: ^0.28.0
31123112
axios-mock-adapter: ^1.20.0
31133113
class-validator: ^0.14.0
31143114
eslint: ^7.32.0
@@ -3149,7 +3149,7 @@ __metadata:
31493149
"@types/lodash": ^4.14.182
31503150
"@types/pg": ^8.6.5
31513151
"@types/wait-on": ^5.3.1
3152-
axios: ^0.27.2
3152+
axios: ^0.28.0
31533153
axios-mock-adapter: ^1.20.0
31543154
backoff-rxjs: ^7.0.0
31553155
bignumber.js: ^9.1.0
@@ -3341,7 +3341,7 @@ __metadata:
33413341
"@wdio/spec-reporter": ^7.19.5
33423342
"@wdio/static-server-service": ^7.19.5
33433343
artillery: ^2.0.0-35
3344-
axios: ^0.27.2
3344+
axios: ^0.28.0
33453345
babel-loader: ^8.2.5
33463346
blake2b-no-wasm: 2.1.4
33473347
buffer: ^6.0.3
@@ -3670,7 +3670,7 @@ __metadata:
36703670
"@cardano-sdk/util": "workspace:~"
36713671
"@types/dockerode": ^3.3.8
36723672
"@types/jest": ^26.0.24
3673-
axios: ^0.27.2
3673+
axios: ^0.28.0
36743674
delay: ^5.0.0
36753675
dockerode: ^3.3.1
36763676
dockerode-utils: ^0.0.7
@@ -9097,7 +9097,7 @@ __metadata:
90979097
languageName: node
90989098
linkType: hard
90999099

9100-
"axios@npm:^0.27.0, axios@npm:^0.27.2":
9100+
"axios@npm:^0.27.0":
91019101
version: 0.27.2
91029102
resolution: "axios@npm:0.27.2"
91039103
dependencies:
@@ -9107,6 +9107,17 @@ __metadata:
91079107
languageName: node
91089108
linkType: hard
91099109

9110+
"axios@npm:^0.28.0":
9111+
version: 0.28.1
9112+
resolution: "axios@npm:0.28.1"
9113+
dependencies:
9114+
follow-redirects: ^1.15.0
9115+
form-data: ^4.0.0
9116+
proxy-from-env: ^1.1.0
9117+
checksum: 5115a38d79064d07437c5a28f15841e3607634040e3120ec06a2c4367a7d07cf213b16496eab53b6f58ebc5fb377a440ba9ed4782529b14449a1e285734bfb54
9118+
languageName: node
9119+
linkType: hard
9120+
91109121
"axios@npm:^1.6.0":
91119122
version: 1.6.2
91129123
resolution: "axios@npm:1.6.2"

0 commit comments

Comments
 (0)