From 1e6ab07cf9fa0c9a39617a8cfe26e761ab919282 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Wed, 15 Jan 2020 16:27:16 +0100 Subject: [PATCH 1/2] Update dependencies and fix unit test --- .ncurc.json | 2 + package-lock.json | 350 +++++++++++++++------------------ package.json | 15 +- src/interface/swagger.json | 3 +- test/unit/model/quotes.test.js | 2 +- 5 files changed, 172 insertions(+), 200 deletions(-) diff --git a/.ncurc.json b/.ncurc.json index a5569505..6dacf9b6 100644 --- a/.ncurc.json +++ b/.ncurc.json @@ -1,4 +1,6 @@ { "reject": [ + "@hapi/hapi", + "@hapi/good" ] } diff --git a/package-lock.json b/package-lock.json index 85775560..7665620d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "quoting-service", - "version": "8.8.0-snapshot", + "version": "8.8.0-snapshot.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -377,9 +377,9 @@ } }, "@hapi/joi": { - "version": "16.1.7", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.7.tgz", - "integrity": "sha512-anaIgnZhNooG3LJLrTFzgGALTiO97zRA1UkvQHm9KxxoSiIzCozB3RCNCpDnfhTJD72QlrHA8nwGmNgpFFCIeg==", + "version": "16.1.8", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz", + "integrity": "sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==", "requires": { "@hapi/address": "^2.1.2", "@hapi/formula": "^1.2.0", @@ -782,11 +782,11 @@ "optional": true }, "@mojaloop/central-services-error-handling": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-8.6.2.tgz", - "integrity": "sha512-VaIkDLNkICvb9EMvKQKXPuaxhsOhrcnJbAO6DrQKuqYl3hq7FD/4w6bAmOhJ6OEUNVbn3Baukk0hHigKcv2YGw==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-8.7.0.tgz", + "integrity": "sha512-3CanhajjN1l3dHy4P2f5IM8DGe6A+aXMn1v46RDfFwwKehfoJfmwV2sYNumXWUDRmEYsYL4L3IdoY+E8hHTZzA==", "requires": { - "@mojaloop/sdk-standard-components": "8.6.1", + "@mojaloop/sdk-standard-components": "8.6.7", "lodash": "4.17.15" } }, @@ -808,62 +808,84 @@ } }, "@mojaloop/central-services-shared": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.7.1.tgz", - "integrity": "sha512-kA3jq0HwTfcZV6tWYKJpvVvlD9U+lxyOa9ZDsK7uXmxXJc5DekU8TySRbL6bPMDSeiqYHJaCO3lvhFvK6dD/ng==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-8.8.1.tgz", + "integrity": "sha512-FRBYdjVZlkVJ/AD8yDNTUwnKQ8PCTsxIuAQCT4wPKINedLSgXAcJ+bV27J8nK+1iETSHCar+IVrv3+aRG9Q54Q==", "requires": { "@hapi/catbox": "10.2.3", - "@hapi/catbox-memory": "4.1.1", - "@mojaloop/central-services-error-handling": "8.6.2", + "@hapi/catbox-memory": "5.0.0", + "@mojaloop/central-services-error-handling": "8.7.0", "@mojaloop/central-services-logger": "8.6.0", - "@mojaloop/central-services-stream": "8.4.0", - "@mojaloop/event-sdk": "8.6.2", - "axios": "0.19.0", + "@mojaloop/event-sdk": "8.8.1-snapshot.2", + "axios": "0.19.1", "base64url": "3.0.1", "clone": "2.1.2", - "data-urls": "1.1.0", - "glob": "7.1.6", + "data-urls": "2.0.0", "immutable": "3.8.2", "lodash": "4.17.15", - "mustache": "3.1.0", - "raw-body": "2.4.1" - } - }, - "@mojaloop/central-services-stream": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-8.4.0.tgz", - "integrity": "sha512-8bxafIFGHb4pZn7lT9xxMh+QyHV9vojSWHSrzST3Z74CyQv5Llj2AzaXpKP0En22Rt7GUc7PKRGs/qSEdMaSUg==", - "requires": { - "@mojaloop/central-services-error-handling": "8.3.0", - "@mojaloop/central-services-logger": "8.1.2", - "async": "3.1.0", - "debug": "4.1.1", - "events": "3.0.0", - "node-rdkafka": "2.7.1", + "mustache": "3.2.1", "raw-body": "2.4.1" }, "dependencies": { + "@hapi/boom": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.0.0.tgz", + "integrity": "sha512-D+Or4yahLq3L7D1Jf0fR1+Lgr+HPK1lej8tc6hS/fBLmK66XdpvTyKv8YUR5ls1GeQy+KGtbpKAs+ZxyzNtUyA==", + "requires": { + "@hapi/hoek": "9.x.x" + } + }, + "@hapi/catbox-memory": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-5.0.0.tgz", + "integrity": "sha512-ByuxVJPHNaXwLzbBv4GdTr6ccpe1nG+AfYt+8ftDWEJY7EWBWzD+Klhy5oPTDGzU26pNUh1e7fcYI1ILZRxAXQ==", + "requires": { + "@hapi/boom": "9.x.x", + "@hapi/hoek": "9.x.x" + } + }, + "@hapi/hoek": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.2.tgz", + "integrity": "sha512-LyibKv2QnD9BPI5g2L+g85yiIPv3ajYpENGFgy4u0xCLPhXWG1Zdx29neSB8sgX0/wz6k5TMjHzTwJ6+DaBYOA==" + }, "@mojaloop/central-services-error-handling": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-8.3.0.tgz", - "integrity": "sha512-2m/TyJ45AGJ+1hCobLiIj9idb1BGKGhq1LJ5n6nRlF6cJR7wx0+Y2cOlI2khl7VZ+PNdonHL9ODbRo7ZGqFczQ==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-8.7.0.tgz", + "integrity": "sha512-3CanhajjN1l3dHy4P2f5IM8DGe6A+aXMn1v46RDfFwwKehfoJfmwV2sYNumXWUDRmEYsYL4L3IdoY+E8hHTZzA==", "requires": { - "@mojaloop/sdk-standard-components": "8.1.4", + "@mojaloop/sdk-standard-components": "8.6.7", "lodash": "4.17.15" } }, - "@mojaloop/central-services-logger": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-8.1.2.tgz", - "integrity": "sha512-wNnr07xcJNAy+KX2C8Djb6ubeH2c1KkfXMyMJz+/dKrfqyVcqcI0RuhneERZrJMI5Ah4X9Sjcuz+LqH9HQoW/w==", - "requires": { + "@mojaloop/event-sdk": { + "version": "8.8.1-snapshot.2", + "resolved": "https://registry.npmjs.org/@mojaloop/event-sdk/-/event-sdk-8.8.1-snapshot.2.tgz", + "integrity": "sha512-ufq+PCbASUfVA24jJ7yFKBUNVVeayop9Us8eKh05Ow5AD+JNfoulVDKPnhqDplTuRQ8Jss88u2kjPmcx9B8IXA==", + "requires": { + "@grpc/proto-loader": "0.5.3", + "@mojaloop/central-services-logger": "8.6.0", + "@types/protobufjs": "6.0.0", + "brototype": "0.0.6", + "error-callsites": "2.0.2", + "grpc": "1.24.2", + "lodash": "4.17.15", + "moment": "2.24.0", + "parse-strings-in-object": "2.0.0", + "protobufjs": "6.8.8", + "rc": "1.2.8", + "serialize-error": "4.1.0", + "sinon": "8.0.4", + "traceparent": "1.0.0", + "tslib": "1.10.0", + "uuid4": "1.1.4", "winston": "3.2.1" } }, "@mojaloop/sdk-standard-components": { - "version": "8.1.4", - "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-8.1.4.tgz", - "integrity": "sha512-OyUYb3DenwZyUQdvdfpOqUHXlOaHCqedh12Y7RIXPUwanadL/AU+b5RWKm6HY1PrELhvTaBoyzOLRaCrAegx5Q==", + "version": "8.6.7", + "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-8.6.7.tgz", + "integrity": "sha512-pDojVFEkHYGp2znje9qUQor1WsUx9ue5v3ToxBrl60X/Ydq//KbraknnedHvpAhwkxXS0SkaJwQp9Qc3sWau1Q==", "requires": { "base64url": "^3.0.1", "ilp-packet": "2.2.0", @@ -873,17 +895,53 @@ "request-promise-native": "^1.0.7" } }, - "async": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", - "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" + "axios": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz", + "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, + "tr46": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz", + "integrity": "sha512-LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==", + "requires": { + "punycode": "^2.1.1" + } + }, + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" + }, + "whatwg-url": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz", + "integrity": "sha512-41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.0", + "webidl-conversions": "^5.0.0" + } } } }, "@mojaloop/event-sdk": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/@mojaloop/event-sdk/-/event-sdk-8.6.2.tgz", - "integrity": "sha512-ZeQffxnRNU7+/2PF2viuje2F5cz5EvvDkfajYZJtL9SBPxPqHlXxEV+J3FmHsM8JMDMr5j8rDwz++mVCyYj8Kw==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@mojaloop/event-sdk/-/event-sdk-8.7.0.tgz", + "integrity": "sha512-pJX9R7lDUt0UgE+2cddcJ6pCpLzX/J3fV5lO84Es+mK/pym2W7QVPcJF3flK7I46tYJ9fNC/Z+wYnmmLMbFuYQ==", "requires": { "@grpc/proto-loader": "0.5.3", "@mojaloop/central-services-logger": "8.6.0", @@ -897,77 +955,10 @@ "protobufjs": "6.8.8", "rc": "1.2.8", "serialize-error": "4.1.0", - "sinon": "7.5.0", + "sinon": "8.0.4", "traceparent": "1.0.0", "tslib": "1.10.0", "uuid4": "1.1.4" - }, - "dependencies": { - "@sinonjs/formatio": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", - "requires": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^3.1.0" - } - }, - "@sinonjs/samsam": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", - "requires": { - "@sinonjs/commons": "^1.3.0", - "array-from": "^2.1.1", - "lodash": "^4.17.15" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" - }, - "lolex": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.2.0.tgz", - "integrity": "sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg==" - }, - "nise": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", - "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", - "requires": { - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "lolex": "^5.0.1", - "path-to-regexp": "^1.7.0" - }, - "dependencies": { - "lolex": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "requires": { - "@sinonjs/commons": "^1.7.0" - } - } - } - }, - "sinon": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", - "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", - "requires": { - "@sinonjs/commons": "^1.4.0", - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/samsam": "^3.3.3", - "diff": "^3.5.0", - "lolex": "^4.2.0", - "nise": "^1.5.2", - "supports-color": "^5.5.0" - } - } } }, "@mojaloop/ml-number": { @@ -986,9 +977,9 @@ } }, "@mojaloop/sdk-standard-components": { - "version": "8.6.1", - "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-8.6.1.tgz", - "integrity": "sha512-KN8OO+uwoIfUZG9XamUNtY+doXlaNSae9ZZDpNhYjsVkaR1uE6TKPXiisH1gHMGkr9nNMCw8ON6EQr8s4jSO+A==", + "version": "8.6.7", + "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-8.6.7.tgz", + "integrity": "sha512-pDojVFEkHYGp2znje9qUQor1WsUx9ue5v3ToxBrl60X/Ydq//KbraknnedHvpAhwkxXS0SkaJwQp9Qc3sWau1Q==", "requires": { "base64url": "^3.0.1", "ilp-packet": "2.2.0", @@ -1070,7 +1061,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-4.0.1.tgz", "integrity": "sha512-asIdlLFrla/WZybhm0C8eEzaDNNrzymiTqHMeJl6zPW2881l3uuVRpm0QlRQEjqYWv6CcKMGYME3LbrLJsORBw==", - "dev": true, "requires": { "@sinonjs/commons": "^1", "@sinonjs/samsam": "^4.2.0" @@ -1080,7 +1070,6 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-4.2.1.tgz", "integrity": "sha512-7+5S4C4wpug5pzHS+z/63+XUwsH7dtyYELDafoT1QnfruFh7eFjlDWwZXltUB0GLk6y5eMeAt34Bjx8wJ4KfSA==", - "dev": true, "requires": { "@sinonjs/commons": "^1.6.0", "lodash.get": "^4.4.2", @@ -1183,9 +1172,9 @@ } }, "@types/jest": { - "version": "24.0.25", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.25.tgz", - "integrity": "sha512-hnP1WpjN4KbGEK4dLayul6lgtys6FPz0UfxMeMQCv0M+sTnzN3ConfiO72jHgLxl119guHgI8gLqDOrRLsyp2g==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.0.tgz", + "integrity": "sha512-dXvuABY9nM1xgsXlOtLQXJKdacxZJd7AtvLsKZ/0b57ruMXDKCOXAC/M75GbllQX6o1pcZ5hAG4JzYy7Z/wM2w==", "dev": true, "requires": { "jest-diff": "^24.3.0" @@ -1197,9 +1186,9 @@ "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" }, "@types/node": { - "version": "10.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.9.tgz", - "integrity": "sha512-+6VygF9LbG7Gaqeog2G7u1+RUcmo0q1rI+2ZxdIg2fAUngk5Vz9fOCHXdloNUOHEPd1EuuOpL5O0CdgN9Fx5UQ==" + "version": "10.17.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz", + "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==" }, "@types/protobufjs": { "version": "6.0.0", @@ -1448,11 +1437,6 @@ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, - "array-from": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=" - }, "array-includes": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", @@ -1571,12 +1555,11 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, "axios": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", - "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz", + "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==", "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" + "follow-redirects": "1.5.10" } }, "babel-jest": { @@ -1628,7 +1611,8 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true }, "base": { "version": "0.11.2", @@ -1698,14 +1682,6 @@ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-5.0.0.tgz", "integrity": "sha512-KWTu6ZMVk9sxlDJQh2YH1UOnfDP8O8TpxUxgQG/vKASoSnEjK9aVuOueFaPcQEYQ5fyNXNTOYwYw3099RYebWg==" }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "requires": { - "file-uri-to-path": "1.0.0" - } - }, "blipp": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/blipp/-/blipp-4.0.1.tgz", @@ -1795,6 +1771,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2303,7 +2280,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "concat-stream": { "version": "1.6.2", @@ -2437,6 +2415,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "dev": true, "requires": { "abab": "^2.0.0", "whatwg-mimetype": "^2.2.0", @@ -2635,8 +2614,7 @@ "diff": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", - "dev": true + "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==" }, "diff-sequences": { "version": "24.9.0", @@ -3354,6 +3332,11 @@ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", "dev": true }, + "esm": { + "version": "3.2.25", + "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", + "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==" + }, "espree": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", @@ -3673,11 +3656,6 @@ "flat-cache": "^2.0.1" } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" - }, "fill-keys": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", @@ -3987,7 +3965,8 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "fsevents": { "version": "1.2.9", @@ -4604,6 +4583,7 @@ "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5518,6 +5498,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -5675,11 +5656,6 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, "is-callable": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", @@ -7043,14 +7019,15 @@ "dev": true }, "knex": { - "version": "0.20.6", - "resolved": "https://registry.npmjs.org/knex/-/knex-0.20.6.tgz", - "integrity": "sha512-yuqAwRShmUOXqFiQMyQz+iBTJYiUcPAiE3Vy7Biuo64LLBDu7afwJeGhrr5/qwIgJ9idC/2kORGIwU9YrnLXEw==", + "version": "0.20.8", + "resolved": "https://registry.npmjs.org/knex/-/knex-0.20.8.tgz", + "integrity": "sha512-fLiSg5PIBisORs0M+UGjg2s1P/E1BrYvb/NkSVk6Y90HJujkqLufSC6ag+hDgXqW73mFAF283M6+q3/NW0TrHw==", "requires": { "bluebird": "^3.7.2", "colorette": "1.1.0", - "commander": "^4.0.1", + "commander": "^4.1.0", "debug": "4.1.1", + "esm": "^3.2.25", "getopts": "2.2.5", "inherits": "~2.0.4", "interpret": "^2.0.0", @@ -7258,7 +7235,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" } @@ -7450,6 +7426,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7602,9 +7579,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "mustache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz", - "integrity": "sha512-3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz", + "integrity": "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==" }, "mute-stream": { "version": "0.0.8", @@ -7681,7 +7658,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/nise/-/nise-3.0.1.tgz", "integrity": "sha512-fYcH9y0drBGSoi88kvhpbZEsenX58Yr+wOJ4/Mi1K4cy+iGP/a73gNoyNhu5E9QxPdgTlVChfIaAlnyOy/gHUA==", - "dev": true, "requires": { "@sinonjs/commons": "^1.7.0", "@sinonjs/formatio": "^4.0.1", @@ -7767,15 +7743,6 @@ "process-on-spawn": "^1.0.0" } }, - "node-rdkafka": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/node-rdkafka/-/node-rdkafka-2.7.1.tgz", - "integrity": "sha512-LrPTNtAoENJedyvYDI/AhBieq+aaFD+ImEIFAxJzL1HAYDZdCwe+TjivSK6N4YLXtxlbXVA1i43DK04VOWebeA==", - "requires": { - "bindings": "^1.3.1", - "nan": "^2.14.0" - } - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -8950,7 +8917,8 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, "path-is-inside": { "version": "1.0.2", @@ -9850,7 +9818,6 @@ "version": "8.0.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-8.0.4.tgz", "integrity": "sha512-cFsmgmvsgFb87e7SV7IcekogITlHX2KmlplyI9Pda0FH1Z8Ms/kWbpLs25Idp0m6ZJ3HEEjhaYYXbcTtWWUn4w==", - "dev": true, "requires": { "@sinonjs/commons": "^1.7.0", "@sinonjs/formatio": "^4.0.1", @@ -9864,14 +9831,12 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -10506,9 +10471,9 @@ "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" }, "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" }, "string-length": { "version": "2.0.0", @@ -11003,6 +10968,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -11323,7 +11289,8 @@ "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true }, "whatwg-encoding": { "version": "1.0.5", @@ -11343,6 +11310,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dev": true, "requires": { "lodash.sortby": "^4.7.0", "tr46": "^1.0.1", diff --git a/package.json b/package.json index a80c95c6..bee4a178 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "quoting-service", "description": "Quoting Service hosted by a scheme", "license": "Apache-2.0", - "version": "8.8.0-snapshot", + "version": "8.8.0-snapshot.1", "author": "Modusbox", "contributors": [ "James Bush ", @@ -36,6 +36,7 @@ ], "scripts": { "start": "node src/index.js", + "test": "npm run test:unit", "test:unit": "jest --testMatch '**/test/unit/**/*.test.js'", "test:coverage": "jest --coverage --coverageThreshold='{}' --testMatch '**/test/unit/**/*.test.js'", "test:coverage-check": "jest --coverage --testMatch '**/test/unit/**/*.test.js'", @@ -56,19 +57,19 @@ "dependencies": { "@hapi/good": "8.2.4", "@hapi/hapi": "18.4.0", - "@mojaloop/central-services-error-handling": "8.6.2", + "@mojaloop/central-services-error-handling": "8.7.0", "@mojaloop/central-services-logger": "8.6.0", - "@mojaloop/central-services-shared": "8.7.1", - "@mojaloop/event-sdk": "8.6.2", + "@mojaloop/central-services-shared": "8.8.1", + "@mojaloop/event-sdk": "8.7.0", "@mojaloop/ml-number": "8.2.0", - "axios": "0.19.0", + "axios": "0.19.1", "blipp": "4.0.1", "eslint-config-standard": "14.1.0", "good-console": "8.0.0", "good-squeeze": "5.1.0", "hapi-openapi": "1.2.6", "json-rules-engine": "5.0.0", - "knex": "0.20.6", + "knex": "0.20.8", "memory-cache": "0.2.0", "mysql": "2.17.1", "node-fetch": "2.6.0", @@ -76,7 +77,7 @@ "rc": "1.2.8" }, "devDependencies": { - "@types/jest": "^24.0.25", + "@types/jest": "24.9.0", "eslint": "6.8.0", "jest": "24.9.0", "jest-junit": "10.0.0", diff --git a/src/interface/swagger.json b/src/interface/swagger.json index e4c890a3..a9c38748 100644 --- a/src/interface/swagger.json +++ b/src/interface/swagger.json @@ -2898,7 +2898,8 @@ "name": "id", "in": "path", "required": true, - "type": "string" + "type": "string", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$" }, "Type": { "name": "Type", diff --git a/test/unit/model/quotes.test.js b/test/unit/model/quotes.test.js index 6969fad4..c4892737 100644 --- a/test/unit/model/quotes.test.js +++ b/test/unit/model/quotes.test.js @@ -1668,7 +1668,7 @@ describe('QuotesModel', () => { const action = async () => quotesModel.handleQuoteError(mockData.headers, mockData.quoteId, error, mockSpan) // Assert - await expect(action()).rejects.toThrowError('Validation failed due to error code being invalid - undefined.') + await expect(action()).rejects.toThrowError('Factory function createFSPIOPError failed due to apiErrorCode being invalid - {"message":"Test Error"}.') }) }) From 70b5d630450681082f2875b4d7fce62a52eca1f3 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Wed, 15 Jan 2020 16:33:25 +0100 Subject: [PATCH 2/2] Fix version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7665620d..5099c9af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "quoting-service", - "version": "8.8.0-snapshot.1", + "version": "8.8.1-snapshot", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bee4a178..caea4b7d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "quoting-service", "description": "Quoting Service hosted by a scheme", "license": "Apache-2.0", - "version": "8.8.0-snapshot.1", + "version": "8.8.1-snapshot", "author": "Modusbox", "contributors": [ "James Bush ",