From 4896121bf3ea0959e9f43f3b7112c606ffca683c Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Mon, 15 Jul 2024 09:59:40 -0700 Subject: [PATCH] build: project-wide upgrade of joi to v17.13.3 1. Also sneaking in a fix for the ci.yaml where the coverage path env variables were not declared for the stellar connector's tests and that was causing the test job to fail entirely. Signed-off-by: Peter Somogyvari --- .github/workflows/ci.yaml | 2 + .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../cactus-plugin-htlc-eth-besu/package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 2 +- packages/cactus-test-tooling/package.json | 2 +- yarn.lock | 99 +++++++------------ 11 files changed, 48 insertions(+), 73 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b8c7c68a09..6936f60ef9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1407,6 +1407,8 @@ jobs: JEST_TEST_PATTERN: packages/cacti-plugin-ledger-connector-stellar/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts JEST_TEST_RUNNER_DISABLED: false TAPE_TEST_RUNNER_DISABLED: true + JEST_TEST_COVERAGE_PATH: ./code-coverage-ts/cpl-connector-stellar + JEST_TEST_CODE_COVERAGE_ENABLED: true runs-on: ubuntu-22.04 steps: - name: Use Node.js ${{ env.NODEJS_VERSION }} diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/package.json b/extensions/cactus-plugin-htlc-coordinator-besu/package.json index 2cb8211fe2..e2482a537d 100644 --- a/extensions/cactus-plugin-htlc-coordinator-besu/package.json +++ b/extensions/cactus-plugin-htlc-coordinator-besu/package.json @@ -67,7 +67,7 @@ "axios": "1.7.2", "body-parser": "1.20.2", "fast-safe-stringify": "2.1.1", - "joi": "14.3.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "prom-client": "15.1.3", "run-time-error-cjs": "1.4.0", diff --git a/packages/cacti-plugin-ledger-connector-stellar/package.json b/packages/cacti-plugin-ledger-connector-stellar/package.json index 56b08d5850..0568bf8e09 100644 --- a/packages/cacti-plugin-ledger-connector-stellar/package.json +++ b/packages/cacti-plugin-ledger-connector-stellar/package.json @@ -65,7 +65,7 @@ "axios": "1.7.2", "express": "4.19.2", "http-errors-enhanced-cjs": "2.0.1", - "joi": "17.9.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "prom-client": "15.1.3", "run-time-error-cjs": "1.4.0", diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/package.json b/packages/cactus-plugin-htlc-eth-besu-erc20/package.json index 9f7aac2811..613aeb98d5 100644 --- a/packages/cactus-plugin-htlc-eth-besu-erc20/package.json +++ b/packages/cactus-plugin-htlc-eth-besu-erc20/package.json @@ -66,7 +66,7 @@ "@hyperledger/cactus-plugin-ledger-connector-besu": "2.0.0-rc.2", "axios": "1.6.0", "express": "4.19.2", - "joi": "17.9.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "typescript-optional": "2.0.1" }, diff --git a/packages/cactus-plugin-htlc-eth-besu/package.json b/packages/cactus-plugin-htlc-eth-besu/package.json index d054dd5ade..48ef727e10 100644 --- a/packages/cactus-plugin-htlc-eth-besu/package.json +++ b/packages/cactus-plugin-htlc-eth-besu/package.json @@ -77,7 +77,7 @@ "dotenv": "16.0.3", "ethers": "6.3.0", "express": "4.19.2", - "joi": "17.9.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "typescript-optional": "2.0.1", "web3js-quorum": "22.4.0" diff --git a/packages/cactus-plugin-ledger-connector-besu/package.json b/packages/cactus-plugin-ledger-connector-besu/package.json index 3c46cdec51..370aa949cb 100644 --- a/packages/cactus-plugin-ledger-connector-besu/package.json +++ b/packages/cactus-plugin-ledger-connector-besu/package.json @@ -67,7 +67,7 @@ "google-protobuf": "3.21.2", "http-errors": "2.0.0", "http-errors-enhanced-cjs": "2.0.1", - "joi": "17.9.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "prom-client": "15.1.3", "run-time-error-cjs": "1.4.0", diff --git a/packages/cactus-plugin-ledger-connector-corda/package.json b/packages/cactus-plugin-ledger-connector-corda/package.json index 8d1e9e3ec2..4c055be5e6 100644 --- a/packages/cactus-plugin-ledger-connector-corda/package.json +++ b/packages/cactus-plugin-ledger-connector-corda/package.json @@ -62,7 +62,7 @@ "axios": "1.6.0", "express-openapi-validator": "5.0.4", "internal-ip": "6.2.0", - "joi": "17.9.1", + "joi": "17.13.3", "node-ssh": "13.1.0", "prom-client": "15.1.3", "rxjs": "7.8.1", diff --git a/packages/cactus-plugin-ledger-connector-polkadot/package.json b/packages/cactus-plugin-ledger-connector-polkadot/package.json index f5f20bcbad..39ad00c061 100644 --- a/packages/cactus-plugin-ledger-connector-polkadot/package.json +++ b/packages/cactus-plugin-ledger-connector-polkadot/package.json @@ -79,7 +79,7 @@ "fs-extra": "11.2.0", "http-errors": "2.0.0", "http-status-codes": "2.1.4", - "joi": "14.3.1", + "joi": "17.13.3", "multer": "1.4.2", "ngo": "2.6.2", "openapi-types": "12.1.3", @@ -95,7 +95,7 @@ "@hyperledger/cactus-test-tooling": "2.0.0-rc.2", "@types/express": "4.17.21", "@types/http-errors": "2.0.4", - "@types/joi": "14.3.4", + "@types/joi": "17.2.3", "@types/multer": "1.4.7", "@types/ssh2": "0.5.44", "@types/supertest": "2.0.11", diff --git a/packages/cactus-plugin-ledger-connector-xdai/package.json b/packages/cactus-plugin-ledger-connector-xdai/package.json index 5ecdc8e7ac..65e7ab0a7c 100644 --- a/packages/cactus-plugin-ledger-connector-xdai/package.json +++ b/packages/cactus-plugin-ledger-connector-xdai/package.json @@ -59,7 +59,7 @@ "@hyperledger/cactus-core-api": "2.0.0-rc.2", "axios": "1.6.0", "express": "4.19.2", - "joi": "17.9.1", + "joi": "17.13.3", "openapi-types": "12.1.3", "prom-client": "15.1.3", "run-time-error-cjs": "1.4.0", diff --git a/packages/cactus-test-tooling/package.json b/packages/cactus-test-tooling/package.json index 7d0d3de4b5..877408fc22 100644 --- a/packages/cactus-test-tooling/package.json +++ b/packages/cactus-test-tooling/package.json @@ -76,7 +76,7 @@ "fs-extra": "11.2.0", "internal-ip": "6.2.0", "is-port-reachable": "3.0.0", - "joi": "17.9.1", + "joi": "17.13.3", "js-yaml": "4.1.0", "keycloak-admin": "1.14.22", "lodash": "4.17.21", diff --git a/yarn.lock b/yarn.lock index 8f9f6fe171..26eba0089a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8918,7 +8918,14 @@ __metadata: languageName: node linkType: hard -"@hapi/topo@npm:^5.0.0": +"@hapi/hoek@npm:^9.3.0": + version: 9.3.0 + resolution: "@hapi/hoek@npm:9.3.0" + checksum: 10/ad83a223787749f3873bce42bd32a9a19673765bf3edece0a427e138859ff729469e68d5fdf9ff6bbee6fb0c8e21bab61415afa4584f527cfc40b59ea1957e70 + languageName: node + linkType: hard + +"@hapi/topo@npm:^5.1.0": version: 5.1.0 resolution: "@hapi/topo@npm:5.1.0" dependencies: @@ -9093,7 +9100,7 @@ __metadata: body-parser: "npm:1.20.2" express: "npm:4.19.2" http-errors-enhanced-cjs: "npm:2.0.1" - joi: "npm:17.9.1" + joi: "npm:17.13.3" npm-run-all2: "npm:6.1.2" openapi-types: "npm:12.1.3" prom-client: "npm:15.1.3" @@ -9974,7 +9981,7 @@ __metadata: body-parser: "npm:1.20.2" express: "npm:4.19.2" fast-safe-stringify: "npm:2.1.1" - joi: "npm:14.3.1" + joi: "npm:17.13.3" openapi-types: "npm:12.1.3" prom-client: "npm:15.1.3" run-time-error-cjs: "npm:1.4.0" @@ -9998,7 +10005,7 @@ __metadata: "@types/express": "npm:4.17.21" axios: "npm:1.6.0" express: "npm:4.19.2" - joi: "npm:17.9.1" + joi: "npm:17.13.3" openapi-types: "npm:12.1.3" typescript-optional: "npm:2.0.1" languageName: unknown @@ -10022,7 +10029,7 @@ __metadata: ethers: "npm:6.3.0" express: "npm:4.19.2" forge-std: "https://github.com/foundry-rs/forge-std.git#66bf4e2c92cf507531599845e8d5a08cc2e3b5bb" - joi: "npm:17.9.1" + joi: "npm:17.13.3" openapi-types: "npm:12.1.3" typescript-optional: "npm:2.0.1" web3js-quorum: "npm:22.4.0" @@ -10233,7 +10240,7 @@ __metadata: grpc_tools_node_protoc_ts: "npm:5.3.3" http-errors: "npm:2.0.0" http-errors-enhanced-cjs: "npm:2.0.1" - joi: "npm:17.9.1" + joi: "npm:17.13.3" key-encoder: "npm:2.0.3" npm-run-all2: "npm:6.1.2" openapi-types: "npm:12.1.3" @@ -10292,7 +10299,7 @@ __metadata: express: "npm:4.19.2" express-openapi-validator: "npm:5.0.4" internal-ip: "npm:6.2.0" - joi: "npm:17.9.1" + joi: "npm:17.13.3" node-ssh: "npm:13.1.0" prom-client: "npm:15.1.3" rxjs: "npm:7.8.1" @@ -10487,7 +10494,7 @@ __metadata: "@polkadot/util": "npm:12.6.2" "@types/express": "npm:4.17.21" "@types/http-errors": "npm:2.0.4" - "@types/joi": "npm:14.3.4" + "@types/joi": "npm:17.2.3" "@types/multer": "npm:1.4.7" "@types/ssh2": "npm:0.5.44" "@types/supertest": "npm:2.0.11" @@ -10501,7 +10508,7 @@ __metadata: fs-extra: "npm:11.2.0" http-errors: "npm:2.0.0" http-status-codes: "npm:2.1.4" - joi: "npm:14.3.1" + joi: "npm:17.13.3" multer: "npm:1.4.2" ngo: "npm:2.6.2" openapi-types: "npm:12.1.3" @@ -10577,7 +10584,7 @@ __metadata: axios: "npm:1.6.0" body-parser: "npm:1.20.2" express: "npm:4.19.2" - joi: "npm:17.9.1" + joi: "npm:17.13.3" openapi-types: "npm:12.1.3" prom-client: "npm:15.1.3" run-time-error-cjs: "npm:1.4.0" @@ -10928,7 +10935,7 @@ __metadata: fs-extra: "npm:11.2.0" internal-ip: "npm:6.2.0" is-port-reachable: "npm:3.0.0" - joi: "npm:17.9.1" + joi: "npm:17.13.3" js-yaml: "npm:4.1.0" keycloak-admin: "npm:1.14.22" lodash: "npm:4.17.21" @@ -15161,12 +15168,12 @@ __metadata: languageName: node linkType: hard -"@sideway/address@npm:^4.1.3": - version: 4.1.4 - resolution: "@sideway/address@npm:4.1.4" +"@sideway/address@npm:^4.1.5": + version: 4.1.5 + resolution: "@sideway/address@npm:4.1.5" dependencies: "@hapi/hoek": "npm:^9.0.0" - checksum: 10/48c422bd2d1d1c7bff7e834f395b870a66862125e9f2302f50c781a33e9f4b2b004b4db0003b232899e71c5f649d39f34aa6702a55947145708d7689ae323cc5 + checksum: 10/c4c73ac0339504f34e016d3a687118e7ddf197c1c968579572123b67b230be84caa705f0f634efdfdde7f2e07a6e0224b3c70665dc420d8bc95bf400cfc4c998 languageName: node linkType: hard @@ -17121,10 +17128,12 @@ __metadata: languageName: node linkType: hard -"@types/joi@npm:14.3.4": - version: 14.3.4 - resolution: "@types/joi@npm:14.3.4" - checksum: 10/f37d83cb2e84919caaccc65bb2b752eecdc323a8d466059beb437a51747ca32cdecc6b8720cb7a42248c25c217edd6ceea1fce8e6aeb47d44d7ad32de652a049 +"@types/joi@npm:17.2.3": + version: 17.2.3 + resolution: "@types/joi@npm:17.2.3" + dependencies: + joi: "npm:*" + checksum: 10/f26d0132b4e16d667176a0dce52a013fce1557a9d7a7b68c67e1bdb1ca470a221e638f2ad4566ca8fcfad544ca0845f6e241b3e86cb387ffee07910bad1147bb languageName: node linkType: hard @@ -32277,13 +32286,6 @@ __metadata: languageName: node linkType: hard -"hoek@npm:6.x.x": - version: 6.1.3 - resolution: "hoek@npm:6.1.3" - checksum: 10/eb038b7fc48135822763b76163b4de0baa77827df508e12bdd9ae5bfcae388926a22b552dc7be234ed3cca0f71a1f61c98c5f14cb4f3900c260905074af1c5cf - languageName: node - linkType: hard - "hoist-non-react-statics@npm:^3.3.1": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" @@ -34493,15 +34495,6 @@ __metadata: languageName: node linkType: hard -"isemail@npm:3.x.x": - version: 3.2.0 - resolution: "isemail@npm:3.2.0" - dependencies: - punycode: "npm:2.x.x" - checksum: 10/1a94cc2bb47f0dbc316faaab06610abbe55da5d01f0e154ef414ba331e101e848de34a30d7a5da3ab645b922281fc098c81a8be6d928b85a8f3d1289c952e8bc - languageName: node - linkType: hard - "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -36067,27 +36060,16 @@ __metadata: languageName: node linkType: hard -"joi@npm:14.3.1": - version: 14.3.1 - resolution: "joi@npm:14.3.1" - dependencies: - hoek: "npm:6.x.x" - isemail: "npm:3.x.x" - topo: "npm:3.x.x" - checksum: 10/91ab75602343ec3eedb1a24bf120a291e2f2654757b4b90e49bf0a03db1cc27398a9104b18924aafb739c0b35f79db7393670d9603e4630a812b604a3767fd18 - languageName: node - linkType: hard - -"joi@npm:17.9.1": - version: 17.9.1 - resolution: "joi@npm:17.9.1" +"joi@npm:*, joi@npm:17.13.3": + version: 17.13.3 + resolution: "joi@npm:17.13.3" dependencies: - "@hapi/hoek": "npm:^9.0.0" - "@hapi/topo": "npm:^5.0.0" - "@sideway/address": "npm:^4.1.3" + "@hapi/hoek": "npm:^9.3.0" + "@hapi/topo": "npm:^5.1.0" + "@sideway/address": "npm:^4.1.5" "@sideway/formula": "npm:^3.0.1" "@sideway/pinpoint": "npm:^2.0.0" - checksum: 10/2ffc81be5b88b123b715df2dd52adcc5333ba995d9dc36c4179572fa459831bbdaa25b32f75654342bbe18c04931125c4fa44445f46341369598993550e4db76 + checksum: 10/4c150db0c820c3a52f4a55c82c1fc5e144a5b5f4da9ffebc7339a15469d1a447ebb427ced446efcb9709ab56bd71a06c4c67c9381bc1b9f9ae63fc7c89209bdf languageName: node linkType: hard @@ -44920,7 +44902,7 @@ __metadata: languageName: node linkType: hard -"punycode@npm:2.x.x, punycode@npm:^2.0.0, punycode@npm:^2.1.0, punycode@npm:^2.1.1": +"punycode@npm:^2.0.0, punycode@npm:^2.1.0, punycode@npm:^2.1.1": version: 2.1.1 resolution: "punycode@npm:2.1.1" checksum: 10/939daa010c2cacebdb060c40ecb52fef0a739324a66f7fffe0f94353a1ee83e3b455e9032054c4a0c4977b0a28e27086f2171c392832b59a01bd948fd8e20914 @@ -50901,15 +50883,6 @@ __metadata: languageName: node linkType: hard -"topo@npm:3.x.x": - version: 3.0.3 - resolution: "topo@npm:3.0.3" - dependencies: - hoek: "npm:6.x.x" - checksum: 10/98caec35d0fe9b9d1ef740c5fd26082fdefa06b567b2e314fe1a93282c5570abfe9ca0692bdfd38d3930be509e891e732dbbbae12d8724db037e7887acd41cd2 - languageName: node - linkType: hard - "touch@npm:^3.1.0": version: 3.1.0 resolution: "touch@npm:3.1.0"