From 59fcd06debc2712ca9fdd027400450d52a21caeb Mon Sep 17 00:00:00 2001 From: Vanessa Rodriguez Cristobal Date: Thu, 11 Apr 2024 11:29:28 +0100 Subject: [PATCH] chore: upgrade Axios version to 0.28.0 BREAKING CHANGE: upgrade cardano-services, cardano-services-client, e2e and util-dev packages to use version 0.28.0 of Axios --- packages/cardano-services-client/package.json | 2 +- packages/cardano-services/package.json | 2 +- .../test/Asset/CardanoTokenRegistry.test.ts | 6 ++++-- .../test/Handle/HandleHttpService.test.ts | 6 +++++- .../HttpMetadataService.test.ts | 11 ++++++---- packages/e2e/package.json | 2 +- packages/util-dev/package.json | 2 +- yarn-project.nix | 1 + yarn.lock | 21 ++++++++++++++----- 9 files changed, 37 insertions(+), 16 deletions(-) diff --git a/packages/cardano-services-client/package.json b/packages/cardano-services-client/package.json index c421411a3ed..b625b62aa6d 100644 --- a/packages/cardano-services-client/package.json +++ b/packages/cardano-services-client/package.json @@ -56,7 +56,7 @@ "dependencies": { "@cardano-sdk/core": "workspace:~", "@cardano-sdk/util": "workspace:~", - "axios": "^0.27.2", + "axios": "^0.28.0", "class-validator": "^0.14.0", "json-bigint": "~1.0.0", "ts-log": "^2.2.4" diff --git a/packages/cardano-services/package.json b/packages/cardano-services/package.json index 4eaa6b12621..40314966ff8 100644 --- a/packages/cardano-services/package.json +++ b/packages/cardano-services/package.json @@ -95,7 +95,7 @@ "@cardano-sdk/util": "workspace:~", "@cardano-sdk/util-rxjs": "workspace:~", "@hapi/topo": "^6.0.2", - "axios": "^0.27.2", + "axios": "^0.28.0", "backoff-rxjs": "^7.0.0", "bignumber.js": "^9.1.0", "body-parser": "^1.19.2", diff --git a/packages/cardano-services/test/Asset/CardanoTokenRegistry.test.ts b/packages/cardano-services/test/Asset/CardanoTokenRegistry.test.ts index 5061963abc5..9b3b010b862 100644 --- a/packages/cardano-services/test/Asset/CardanoTokenRegistry.test.ts +++ b/packages/cardano-services/test/Asset/CardanoTokenRegistry.test.ts @@ -179,6 +179,7 @@ describe('CardanoTokenRegistry', () => { it('internal server error', async () => { const failedMetadata = null; const succeededMetadata = { assetId: validAssetId, name: 'test' }; + const innerError = 'AxiosError: Request failed with status code 500'; let alreadyCalled = false; const record = async () => { @@ -204,7 +205,7 @@ describe('CardanoTokenRegistry', () => { await expect(tokenRegistry.getTokenMetadata([invalidAssetId, validAssetId])).rejects.toThrow( new ProviderError( ProviderFailure.Unhealthy, - null, + innerError, 'CardanoTokenRegistry failed to fetch asset metadata from the token registry server due to: Request failed with status code 500' ) ); @@ -212,6 +213,7 @@ describe('CardanoTokenRegistry', () => { it('timeout server error', async () => { const exceededTimeout = defaultTimeout + 1000; + const innerError = `AxiosError: timeout of ${defaultTimeout}ms exceeded`; const record = async () => { await sleep(exceededTimeout); @@ -231,7 +233,7 @@ describe('CardanoTokenRegistry', () => { await expect(tokenRegistry.getTokenMetadata([validAssetId])).rejects.toThrow( new ProviderError( ProviderFailure.Unhealthy, - null, + innerError, `CardanoTokenRegistry failed to fetch asset metadata from the token registry server due to: timeout of ${defaultTimeout}ms exceeded` ) ); diff --git a/packages/cardano-services/test/Handle/HandleHttpService.test.ts b/packages/cardano-services/test/Handle/HandleHttpService.test.ts index f67384ed71d..165d91750a7 100644 --- a/packages/cardano-services/test/Handle/HandleHttpService.test.ts +++ b/packages/cardano-services/test/Handle/HandleHttpService.test.ts @@ -56,7 +56,11 @@ describe('HandleHttpService', () => { const { message, response } = error; - if (!response) return { message, statusText: error.status }; + if (!response) + return { + message, + statusText: `${typeof error.status === 'string' ? error.status : JSON.stringify(error.status)}` + }; const { data, status, statusText } = response; diff --git a/packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts b/packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts index b01615f6b88..5b8e5520006 100644 --- a/packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts +++ b/packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts @@ -52,6 +52,9 @@ describe('StakePoolMetadataService', () => { await closeMock(); }); + const innerError500 = 'AxiosError: Request failed with status code 500'; + const innerError404 = 'AxiosError: Request failed with status code 404'; + describe('getStakePoolMetadata', () => { it('fetch stake pool JSON metadata without extended data', async () => { ({ closeMock, serverUrl } = await mockPoolExtMetadataServer(async () => ({ @@ -116,7 +119,7 @@ describe('StakePoolMetadataService', () => { expect(result).toEqual( new StakePoolMetadataServiceError( StakePoolMetadataServiceFailure.FailedToFetchMetadata, - null, + innerError500, `StakePoolMetadataService failed to fetch metadata JSON from ${serverUrl} due to Request failed with status code 500` ) ); @@ -205,7 +208,7 @@ describe('StakePoolMetadataService', () => { expect(result).toEqual( new StakePoolMetadataServiceError( StakePoolMetadataServiceFailure.FailedToFetchExtendedSignature, - null, + innerError404, `StakePoolMetadataService failed to fetch extended signature from ${metadata.extSigUrl} due to connection error` ) ); @@ -372,7 +375,7 @@ describe('StakePoolMetadataService', () => { await expect(metadataService.getStakePoolExtendedMetadata(extMetadata)).rejects.toThrow( new StakePoolMetadataServiceError( StakePoolMetadataServiceFailure.FailedToFetchExtendedMetadata, - null, + innerError500, `StakePoolMetadataService failed to fetch extended metadata from ${serverUrl}/${ExtMetadataFormat.CIP6} due to connection error` ) ); @@ -402,7 +405,7 @@ describe('StakePoolMetadataService', () => { await expect(metadataService.getStakePoolExtendedMetadata(extMetadata)).rejects.toThrow( new StakePoolMetadataServiceError( StakePoolMetadataServiceFailure.FailedToFetchExtendedMetadata, - null, + innerError404, `StakePoolMetadataService failed to fetch extended metadata from ${serverUrl}/${ExtMetadataFormat.CIP6} due to resource not found` ) ); diff --git a/packages/e2e/package.json b/packages/e2e/package.json index 9614ff6a0f1..de0271f1103 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -96,7 +96,7 @@ "@cardano-sdk/wallet": "workspace:~", "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1", "@vespaiach/axios-fetch-adapter": "^0.3.0", - "axios": "^0.27.2", + "axios": "^0.28.0", "bunyan": "^1.8.15", "chalk": "4.1.2", "cli-spinners": "^2.9.0", diff --git a/packages/util-dev/package.json b/packages/util-dev/package.json index 9f970fa22e2..1c36064dacc 100644 --- a/packages/util-dev/package.json +++ b/packages/util-dev/package.json @@ -59,7 +59,7 @@ "@cardano-sdk/key-management": "workspace:~", "@cardano-sdk/util": "workspace:~", "@types/dockerode": "^3.3.8", - "axios": "^0.27.2", + "axios": "^0.28.0", "delay": "^5.0.0", "dockerode": "^3.3.1", "dockerode-utils": "^0.0.7", diff --git a/yarn-project.nix b/yarn-project.nix index d6edd5efaa7..3b8b993b4c1 100644 --- a/yarn-project.nix +++ b/yarn-project.nix @@ -898,6 +898,7 @@ cacheEntries = { "axios-mock-adapter@npm:1.21.2" = { filename = "axios-mock-adapter-npm-1.21.2-67858a7fb9-0d334838a8.zip"; sha512 = "0d334838a819597f49fd5bf807e2a46cd846397cbea734fd53dcb425dee914e2d3e57cff65eb36af70cdbba848416c48979b75223afbfc1ab49789fd12011618"; }; "axios@npm:0.25.0" = { filename = "axios-npm-0.25.0-a1c287d287-2a8a3787c0.zip"; sha512 = "2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad"; }; "axios@npm:0.27.2" = { filename = "axios-npm-0.27.2-dbe3a48aea-38cb754046.zip"; sha512 = "38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854"; }; +"axios@npm:0.28.1" = { filename = "axios-npm-0.28.1-84ca28650b-5115a38d79.zip"; sha512 = "5115a38d79064d07437c5a28f15841e3607634040e3120ec06a2c4367a7d07cf213b16496eab53b6f58ebc5fb377a440ba9ed4782529b14449a1e285734bfb54"; }; "axios@npm:1.6.2" = { filename = "axios-npm-1.6.2-2334cb6eee-4a7429e2b7.zip"; sha512 = "4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8"; }; "b4a@npm:1.6.1" = { filename = "b4a-npm-1.6.1-11ac2fd316-9d085922d4.zip"; sha512 = "9d085922d4a6bcaac69e68520681cd60da0e2dca8ea80a89cd27a3a3037058d4669a2904aa9925c7f567d84f62f64beafaf0c831771bd4eb86ca5ecbbca402d8"; }; "babel-eslint@npm:10.0.3" = { filename = "babel-eslint-npm-10.0.3-ba50cae6ec-d3bf355c20.zip"; sha512 = "d3bf355c20d1a2f0667ace6c43263eecb0d09342a833129c67cc9f554a5dbc335bd6a73cbd3001ee6074570ca2184366ddff6c58afccf8fd55e249c02ff54288"; }; diff --git a/yarn.lock b/yarn.lock index 38f248b2e73..1fdeda38db0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3108,7 +3108,7 @@ __metadata: "@cardano-sdk/util-dev": "workspace:~" "@koralabs/handles-public-api-interfaces": 2.4.3 "@types/validator": ^13.7.1 - axios: ^0.27.2 + axios: ^0.28.0 axios-mock-adapter: ^1.20.0 class-validator: ^0.14.0 eslint: ^7.32.0 @@ -3149,7 +3149,7 @@ __metadata: "@types/lodash": ^4.14.182 "@types/pg": ^8.6.5 "@types/wait-on": ^5.3.1 - axios: ^0.27.2 + axios: ^0.28.0 axios-mock-adapter: ^1.20.0 backoff-rxjs: ^7.0.0 bignumber.js: ^9.1.0 @@ -3341,7 +3341,7 @@ __metadata: "@wdio/spec-reporter": ^7.19.5 "@wdio/static-server-service": ^7.19.5 artillery: ^2.0.0-35 - axios: ^0.27.2 + axios: ^0.28.0 babel-loader: ^8.2.5 blake2b-no-wasm: 2.1.4 buffer: ^6.0.3 @@ -3670,7 +3670,7 @@ __metadata: "@cardano-sdk/util": "workspace:~" "@types/dockerode": ^3.3.8 "@types/jest": ^26.0.24 - axios: ^0.27.2 + axios: ^0.28.0 delay: ^5.0.0 dockerode: ^3.3.1 dockerode-utils: ^0.0.7 @@ -9097,7 +9097,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.27.0, axios@npm:^0.27.2": +"axios@npm:^0.27.0": version: 0.27.2 resolution: "axios@npm:0.27.2" dependencies: @@ -9107,6 +9107,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.28.0": + version: 0.28.1 + resolution: "axios@npm:0.28.1" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 5115a38d79064d07437c5a28f15841e3607634040e3120ec06a2c4367a7d07cf213b16496eab53b6f58ebc5fb377a440ba9ed4782529b14449a1e285734bfb54 + languageName: node + linkType: hard + "axios@npm:^1.6.0": version: 1.6.2 resolution: "axios@npm:1.6.2"