From 3ead8ebcea74decc6f9f545e6f56cd1786bddba4 Mon Sep 17 00:00:00 2001 From: Noopur Jain Date: Sun, 24 May 2020 16:47:07 +0800 Subject: [PATCH 1/2] Add timezone to database connection options set to UTC --- config/default.json | 3 ++- src/lib/config.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/default.json b/config/default.json index 0d8c47f23..c27d24ace 100644 --- a/config/default.json +++ b/config/default.json @@ -16,7 +16,8 @@ "IDLE_TIMEOUT_MILLIS": 30000, "REAP_INTERVAL_MILLIS": 1000, "CREATE_RETRY_INTERVAL_MILLIS": 200, - "DEBUG": false + "DEBUG": false, + "TIMEZONE": "Z" }, "MIGRATIONS": { "DISABLED": false, diff --git a/src/lib/config.js b/src/lib/config.js index c115c51ca..4281fdfc4 100644 --- a/src/lib/config.js +++ b/src/lib/config.js @@ -41,7 +41,8 @@ module.exports = { port: RC.DATABASE.PORT, user: RC.DATABASE.USER, password: RC.DATABASE.PASSWORD, - database: RC.DATABASE.SCHEMA + database: RC.DATABASE.SCHEMA, + timezone: RC.DATABASE.TIMEZONE }, pool: { // minimum size From cf69a8739affe39bb200d2e96d44c934e7d1fe6d Mon Sep 17 00:00:00 2001 From: Noopur Date: Fri, 12 Mar 2021 12:41:51 +0800 Subject: [PATCH 2/2] run resolve-audit and dep:update --- audit-resolve.json | 10 ++++++- package-lock.json | 72 +++++++++++++++++++++------------------------- package.json | 8 +++--- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/audit-resolve.json b/audit-resolve.json index b671d3c00..c3af087ae 100644 --- a/audit-resolve.json +++ b/audit-resolve.json @@ -124,8 +124,16 @@ "decision": "ignore", "madeAt": 1614766410157, "expiresAt": 1617358384743 + }, + "1649|@mojaloop/central-object-store>mongoose>mquery": { + "decision": "ignore", + "madeAt": 1615523563034 + }, + "1179|faucet>minimist": { + "decision": "ignore", + "madeAt": 1615523782712 } }, "rules": {}, "version": 1 -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 829abba21..f9b84624c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1027,9 +1027,9 @@ } }, "@mojaloop/central-services-shared": { - "version": "11.5.6", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-11.5.6.tgz", - "integrity": "sha512-tcHhrqgr5BW35ZBiBcsmHlyH290Wmn7EFFYYav1iSgP8d92Zo6agE1e2xMnUK+AvcpBslfc60PTMyQQwNkksTw==", + "version": "11.5.9", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-11.5.9.tgz", + "integrity": "sha512-5BQCaikbG9DlMMtdeLPCWNxNoouNl6htDMwhwk4rntNzivr8XMaejTXYz6ZbMx7hFCMQpfiGRmus+Js1sNu8Fg==", "requires": { "@hapi/catbox": "11.1.1", "@hapi/catbox-memory": "5.0.0", @@ -1430,16 +1430,15 @@ } }, "@npmcli/run-script": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.3.tgz", - "integrity": "sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.4.tgz", + "integrity": "sha512-Yd9HXTtF1JGDXZw0+SOn+mWLYS0e7bHBHVC/2C8yqs4wUrs/k8rwBSinD7rfk+3WG/MFGRZKxjyoD34Pch2E/A==", "dev": true, "requires": { "@npmcli/node-gyp": "^1.0.2", "@npmcli/promise-spawn": "^1.3.2", "infer-owner": "^1.0.4", "node-gyp": "^7.1.0", - "puka": "^1.0.1", "read-package-json-fast": "^2.0.1" } }, @@ -1617,9 +1616,9 @@ "dev": true }, "@types/mongodb": { - "version": "3.6.8", - "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.8.tgz", - "integrity": "sha512-8qNbL5/GFrljXc/QijcuQcUMYZ1iWNcqnJ6tneROwbfU0LsAjQ9bmq3aHi5lWXM4cyBPd2F/n9INAk/pZZttHw==", + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.9.tgz", + "integrity": "sha512-2XSGr/+IOKeFQ5tU9ATcIiIr7bpHqWyOXNGLOOhp0kg2NnfEvoKZF1SZ25j4zvJRqM2WeSUjfWSvymFJ3HBGJQ==", "requires": { "@types/bson": "*", "@types/node": "*" @@ -4310,9 +4309,9 @@ "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" }, "env-paths": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", - "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true }, "env-var": { @@ -5333,9 +5332,9 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -7839,9 +7838,9 @@ "dev": true }, "knex": { - "version": "0.95.1", - "resolved": "https://registry.npmjs.org/knex/-/knex-0.95.1.tgz", - "integrity": "sha512-8vAmH4M6ks0qXHqaIacUOTtGAVc1PPFuF8W/W9bzuUHcQur4809mtufw1LY6n/tNRTLwMFBSXWkUnfFQFqFvNQ==", + "version": "0.95.2", + "resolved": "https://registry.npmjs.org/knex/-/knex-0.95.2.tgz", + "integrity": "sha512-USnukuNnoVAfeV6OXrkHPLcUQRsRbTl3Tk5E3x0hmKs4uEu5vGfZHxD4luyrndIysyDrKXBWfASQ1wFpJWDDFg==", "requires": { "colorette": "1.2.1", "commander": "^7.1.0", @@ -8852,9 +8851,9 @@ } }, "mongoose": { - "version": "5.11.18", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.11.18.tgz", - "integrity": "sha512-RsrPR9nhkXZbO3ml0DcmdbfeMvFNhgFrP81S6o1P+lFnDTNEKYnGNRCIL+ojD69wj7H5jJaAdZ0SJ5IlKxCHqw==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.12.0.tgz", + "integrity": "sha512-s0Qpgf5lOk3AXtKnE+FA0HZhFKa2hesGVcTmx1wfTQ+7Q7ph0E79B6KUp1ZQERQyCwuE8WQ4wWllEhd7VPkxOg==", "requires": { "@types/mongodb": "^3.5.27", "bson": "^1.1.4", @@ -9320,9 +9319,9 @@ } }, "npm-check-updates": { - "version": "11.1.10", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.1.10.tgz", - "integrity": "sha512-T8o/3ls74Q8i3LbO9jjxI1YWA9ioJjjAnYt9BezbFn/D99STc+7pe633H0gLmNi4/5b1Xi3nlbI6UCbc6eb/pQ==", + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.2.2.tgz", + "integrity": "sha512-DZCwlP2L5Me6PlrEHQe1uPqjB4vFBFSG9O1hjv0rF3l8YLBpR6Nlhl00sa4wYKqMM9dkLT2Kyh/n4yTH8o952w==", "dev": true, "requires": { "chalk": "^4.1.0", @@ -9333,14 +9332,15 @@ "fp-and-or": "^0.1.3", "get-stdin": "^8.0.0", "globby": "^11.0.2", - "hosted-git-info": "^3.0.8", + "hosted-git-info": "^4.0.0", "json-parse-helpfulerror": "^1.0.3", "jsonlines": "^0.1.1", "libnpmconfig": "^1.2.1", "lodash": "^4.17.21", "mem": "^8.0.0", + "minimatch": "^3.0.4", "p-map": "^4.0.0", - "pacote": "^11.2.7", + "pacote": "^11.3.0", "parse-github-url": "^1.0.2", "progress": "^2.0.3", "prompts": "^2.4.0", @@ -9473,9 +9473,9 @@ } }, "hosted-git-info": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", - "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.0.tgz", + "integrity": "sha512-fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -10696,9 +10696,9 @@ } }, "pacote": { - "version": "11.2.7", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.7.tgz", - "integrity": "sha512-ogxPor11v/rnU9ukwLlI2dPx22q9iob1+yZyqSwerKsOvBMhU9e+SJHtxY4y2N0MRH4/5jGsGiRLsZeJWyM4dQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.3.0.tgz", + "integrity": "sha512-cygprcGpEVqvDzpuPMkGVXW/ooc2ibpoosuJ4YHcUXozDs9VJP7Vha+41pYppG2MVNis4t1BB8IygIBh7vVr2Q==", "dev": true, "requires": { "@npmcli/git": "^2.0.1", @@ -11286,12 +11286,6 @@ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", "dev": true }, - "puka": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/puka/-/puka-1.0.1.tgz", - "integrity": "sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g==", - "dev": true - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", diff --git a/package.json b/package.json index dff468909..fa91b3bf6 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@mojaloop/central-services-health": "11.0.0", "@mojaloop/central-services-logger": "10.6.0", "@mojaloop/central-services-metrics": "9.5.0", - "@mojaloop/central-services-shared": "11.5.6", + "@mojaloop/central-services-shared": "11.5.9", "@mojaloop/central-services-stream": "10.6.0", "@mojaloop/event-sdk": "10.6.0", "@mojaloop/forensic-logging-client": "8.3.0", @@ -112,10 +112,10 @@ "hapi-auth-bearer-token": "8.0.0", "hapi-swagger": "14.1.0", "ilp-packet": "2.2.0", - "knex": "0.95.1", + "knex": "0.95.2", "lodash": "4.17.21", "moment": "2.29.1", - "mongoose": "5.11.18", + "mongoose": "5.12.0", "npm-run-all": "4.1.5", "rc": "1.2.8", "require-glob": "3.2.0", @@ -132,7 +132,7 @@ "jsonpath": "1.1.0", "nodemon": "2.0.7", "npm-audit-resolver": "2.2.1", - "npm-check-updates": "11.1.10", + "npm-check-updates": "11.2.2", "nyc": "15.1.0", "pre-commit": "1.2.2", "proxyquire": "2.1.3",