From 45ba64dc12cd73c630d57a53b99e05debf398886 Mon Sep 17 00:00:00 2001 From: Gerald Baulig Date: Mon, 27 Nov 2023 14:53:07 +0100 Subject: [PATCH] chore(grpc-js): hotfix, override grpc-js --- cfg/config_test.json | 42 +++++++++++++++++++++++++++--------------- package-lock.json | 42 +++--------------------------------------- package.json | 5 ++++- 3 files changed, 34 insertions(+), 55 deletions(-) diff --git a/cfg/config_test.json b/cfg/config_test.json index e09187b..5a3e37a 100644 --- a/cfg/config_test.json +++ b/cfg/config_test.json @@ -7,12 +7,24 @@ "prettyPrint": true } }, + "authorization": { + "client": null + }, + "server": { + "transports": [ + { + "name": "grpcOrdering", + "provider": "grpc", + "addr": "0.0.0.0:50165" + } + ] + }, "client": { "order": { - "address": "localhost:50065" + "address": "localhost:50165" }, "acs-srv": { - "address": "localhost:50061", + "address": "localhost:50161", "mock": { "protoPath": "io/restorecommerce/access_control.proto", "packageName": "io.restorecommerce.access_control", @@ -25,7 +37,7 @@ } }, "user": { - "address": "localhost:50062", + "address": "localhost:50162", "mock": { "protoPath": "io/restorecommerce/user.proto", "packageName": "io.restorecommerce.user", @@ -38,7 +50,7 @@ } }, "product": { - "address": "localhost:50066", + "address": "localhost:50166", "mock": { "protoPath": "io/restorecommerce/product.proto", "packageName": "io.restorecommerce.product", @@ -51,7 +63,7 @@ } }, "contact_point": { - "address": "localhost:50067", + "address": "localhost:50167", "mock": { "protoPath": "io/restorecommerce/contact_point.proto", "packageName": "io.restorecommerce.contact_point", @@ -64,7 +76,7 @@ } }, "address": { - "address": "localhost:50068", + "address": "localhost:50168", "mock": { "protoPath": "io/restorecommerce/address.proto", "packageName": "io.restorecommerce.address", @@ -77,7 +89,7 @@ } }, "country": { - "address": "localhost:50069", + "address": "localhost:50169", "mock": { "protoPath": "io/restorecommerce/country.proto", "packageName": "io.restorecommerce.country", @@ -90,7 +102,7 @@ } }, "tax": { - "address": "localhost:50070", + "address": "localhost:50170", "mock": { "protoPath": "io/restorecommerce/tax.proto", "packageName": "io.restorecommerce.tax", @@ -103,7 +115,7 @@ } }, "tax_type": { - "address": "localhost:50071", + "address": "localhost:50171", "mock": { "protoPath": "io/restorecommerce/tax_type.proto", "packageName": "io.restorecommerce.tax_type", @@ -116,7 +128,7 @@ } }, "customer": { - "address": "localhost:50072", + "address": "localhost:50172", "mock": { "protoPath": "io/restorecommerce/customer.proto", "packageName": "io.restorecommerce.customer", @@ -129,7 +141,7 @@ } }, "shop": { - "address": "localhost:50073", + "address": "localhost:50173", "mock": { "protoPath": "io/restorecommerce/shop.proto", "packageName": "io.restorecommerce.shop", @@ -142,7 +154,7 @@ } }, "organization": { - "address": "localhost:50074", + "address": "localhost:50174", "mock": { "protoPath": "io/restorecommerce/organization.proto", "packageName": "io.restorecommerce.organization", @@ -156,7 +168,7 @@ }, "fulfillment": { "disabled": false, - "address": "localhost:50075", + "address": "localhost:50175", "mock": { "protoPath": "io/restorecommerce/fulfillment.proto", "packageName": "io.restorecommerce.fulfillment", @@ -170,7 +182,7 @@ }, "fulfillment_product": { "disabled": false, - "address": "localhost:50076", + "address": "localhost:50176", "mock": { "protoPath": "io/restorecommerce/fulfillment_product.proto", "packageName": "io.restorecommerce.fulfillment_product", @@ -184,7 +196,7 @@ }, "invoice": { "disabled": true, - "address": "localhost:50077", + "address": "localhost:50177", "mock": { "protoPath": "io/restorecommerce/invoice.proto", "packageName": "io.restorecommerce.invoice", diff --git a/package-lock.json b/package-lock.json index bb86056..e5b130d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -838,9 +838,9 @@ } }, "node_modules/@grpc/grpc-js": { - "version": "1.9.9", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.9.tgz", - "integrity": "sha512-vQ1qwi/Kiyprt+uhb1+rHMpyk4CVRMTGNUGGPRGS7pLNfWkdCHrGEnT6T3/JyC2VZgoOX/X1KwdoU0WYQAeYcQ==", + "version": "1.9.11", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.11.tgz", + "integrity": "sha512-QDhMfbTROOXUhLHMroow8f3EHiCKUOh6UwxMP5S3EuXMnWMNSVIhatGZRwkpg9OUTYdZPsDUVH3cOAkWhGFUJw==", "dependencies": { "@grpc/proto-loader": "^0.7.8", "@types/node": ">=12.12.47" @@ -1352,18 +1352,6 @@ "node": ">= 18.0.0" } }, - "node_modules/@restorecommerce/chassis-srv/node_modules/@grpc/grpc-js": { - "version": "1.9.11", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.11.tgz", - "integrity": "sha512-QDhMfbTROOXUhLHMroow8f3EHiCKUOh6UwxMP5S3EuXMnWMNSVIhatGZRwkpg9OUTYdZPsDUVH3cOAkWhGFUJw==", - "dependencies": { - "@grpc/proto-loader": "^0.7.8", - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, "node_modules/@restorecommerce/cluster-service": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@restorecommerce/cluster-service/-/cluster-service-1.0.2.tgz", @@ -1398,18 +1386,6 @@ "node": ">= 12.18.0" } }, - "node_modules/@restorecommerce/grpc-client/node_modules/@grpc/grpc-js": { - "version": "1.9.11", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.11.tgz", - "integrity": "sha512-QDhMfbTROOXUhLHMroow8f3EHiCKUOh6UwxMP5S3EuXMnWMNSVIhatGZRwkpg9OUTYdZPsDUVH3cOAkWhGFUJw==", - "dependencies": { - "@grpc/proto-loader": "^0.7.8", - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, "node_modules/@restorecommerce/kafka-client": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/@restorecommerce/kafka-client/-/kafka-client-1.1.12.tgz", @@ -1470,18 +1446,6 @@ "node": ">= 12.18.0" } }, - "node_modules/@restorecommerce/rc-grpc-clients/node_modules/@grpc/grpc-js": { - "version": "1.9.11", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.11.tgz", - "integrity": "sha512-QDhMfbTROOXUhLHMroow8f3EHiCKUOh6UwxMP5S3EuXMnWMNSVIhatGZRwkpg9OUTYdZPsDUVH3cOAkWhGFUJw==", - "dependencies": { - "@grpc/proto-loader": "^0.7.8", - "@types/node": ">=12.12.47" - }, - "engines": { - "node": "^8.13.0 || >=10.10.0" - } - }, "node_modules/@restorecommerce/resource-base-interface": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/@restorecommerce/resource-base-interface/-/resource-base-interface-1.4.4.tgz", diff --git a/package.json b/package.json index 895f18c..f796a51 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@restorecommerce/ordering-srv", "version": "0.0.12", "description": "Restore Commerce microservice for managing orders", - "main": "./lib/index.js", + "main": "./lib/start.js", "author": "n-fuse GmbH", "repository": { "type": "git", @@ -53,6 +53,9 @@ "tslint": "^6.1.3", "typescript": "^4.9.5" }, + "overrides": { + "@grpc/grpc-js": "^1.9.11" + }, "scripts": { "build": "npm-run-all lint build:clean build:tsc", "build:clean": "rimraf lib",