joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Upgrade pg-promise to 11.3.0 and pg-monitor to 2.0.0 (#8453)

Browse Source
This commit is contained in:
Corey
2023-03-05 18:16:04 -05:00
committed by GitHub
parent 94d558edbb
commit 87cab09b6a
4 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
package-lock.json generated
View File

@@ -41,8 +41,8 @@
"mustache": "4.2.0", "mustache": "4.2.0",
"parse": "4.0.1", "parse": "4.0.1",
"path-to-regexp": "0.1.7", "path-to-regexp": "0.1.7",
"pg-monitor": "1.5.0", "pg-monitor": "2.0.0",
"pg-promise": "10.12.1", "pg-promise": "11.3.0",
"pluralize": "8.0.0", "pluralize": "8.0.0",
"redis": "4.0.6", "redis": "4.0.6",
"semver": "7.3.8", "semver": "7.3.8",
@@ -4060,11 +4060,11 @@
} }
}, },
"node_modules/assert-options": { "node_modules/assert-options": {
"version": "0.7.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz", "resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.8.0.tgz",
"integrity": "sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==", "integrity": "sha512-qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA==",
"engines": { "engines": {
"node": ">=8.0.0" "node": ">=10.0.0"
} }
}, },
"node_modules/assert-plus": { "node_modules/assert-plus": {
@@ -16069,15 +16069,15 @@
"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
}, },
"node_modules/pg": { "node_modules/pg": {
"version": "8.8.0", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz", "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
"integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==", "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
"dependencies": { "dependencies": {
"buffer-writer": "2.0.0", "buffer-writer": "2.0.0",
"packet-reader": "1.0.0", "packet-reader": "1.0.0",
"pg-connection-string": "^2.5.0", "pg-connection-string": "^2.5.0",
"pg-pool": "^3.5.2", "pg-pool": "^3.5.2",
"pg-protocol": "^1.5.0", "pg-protocol": "^1.6.0",
"pg-types": "^2.1.0", "pg-types": "^2.1.0",
"pgpass": "1.x" "pgpass": "1.x"
}, },
@@ -16115,14 +16115,14 @@
} }
}, },
"node_modules/pg-monitor": { "node_modules/pg-monitor": {
"version": "1.5.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/pg-monitor/-/pg-monitor-1.5.0.tgz", "resolved": "https://registry.npmjs.org/pg-monitor/-/pg-monitor-2.0.0.tgz",
"integrity": "sha512-Zg5RpoYaz0zyRwAQWKrRxUZgzZ+/r4McMP4vEvg+qE8765SHAB1wHZL58uAjocG4WSK/NLP/zZhUuoyurw4l6Q==", "integrity": "sha512-UqjhroM701sRrJHhXeF1OwNBGxkN9R0YgkVU8A46wWn3RwK/K7QDylChMoDxo8TmGp86CBP4ZSf+RK9vD8XyVA==",
"dependencies": { "dependencies": {
"cli-color": "2.0.3" "cli-color": "2.0.3"
}, },
"engines": { "engines": {
"node": ">=7.6" "node": ">=14"
} }
}, },
"node_modules/pg-monitor/node_modules/cli-color": { "node_modules/pg-monitor/node_modules/cli-color": {
@@ -16189,23 +16189,23 @@
} }
}, },
"node_modules/pg-promise": { "node_modules/pg-promise": {
"version": "10.12.1", "version": "11.3.0",
"resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.1.tgz", "resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-11.3.0.tgz",
"integrity": "sha512-SiJkBUDGq7PNfJFJbWferodsSH+vLrhte0Q0kVgQbwlNYeKmp9Hhkr+357+5DWEuBGOHhSu1UQffSSf5HVqRtA==", "integrity": "sha512-A2CYmax5gsqVAO2N0ET9oPRCPX3kpKymj9qLVK7+jszlJL6l8uJDq/DGqLpxNi5VHwK7Dmm2WNRdrwkh1xuaxQ==",
"dependencies": { "dependencies": {
"assert-options": "0.7.0", "assert-options": "0.8.0",
"pg": "8.8.0", "pg": "8.9.0",
"pg-minify": "1.6.2", "pg-minify": "1.6.2",
"spex": "3.2.0" "spex": "3.2.0"
}, },
"engines": { "engines": {
"node": ">=12.0" "node": ">=14.0"
} }
}, },
"node_modules/pg-protocol": { "node_modules/pg-protocol": {
"version": "1.5.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz", "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz",
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==" "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="
}, },
"node_modules/pg-types": { "node_modules/pg-types": {
"version": "2.2.0", "version": "2.2.0",
@@ -23386,9 +23386,9 @@
} }
}, },
"assert-options": { "assert-options": {
"version": "0.7.0", "version": "0.8.0",
"resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz", "resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.8.0.tgz",
"integrity": "sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ==" "integrity": "sha512-qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA=="
}, },
"assert-plus": { "assert-plus": {
"version": "1.0.0", "version": "1.0.0",
@@ -32524,15 +32524,15 @@
"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
}, },
"pg": { "pg": {
"version": "8.8.0", "version": "8.9.0",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz", "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
"integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==", "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
"requires": { "requires": {
"buffer-writer": "2.0.0", "buffer-writer": "2.0.0",
"packet-reader": "1.0.0", "packet-reader": "1.0.0",
"pg-connection-string": "^2.5.0", "pg-connection-string": "^2.5.0",
"pg-pool": "^3.5.2", "pg-pool": "^3.5.2",
"pg-protocol": "^1.5.0", "pg-protocol": "^1.6.0",
"pg-types": "^2.1.0", "pg-types": "^2.1.0",
"pgpass": "1.x" "pgpass": "1.x"
} }
@@ -32553,9 +32553,9 @@
"integrity": "sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==" "integrity": "sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="
}, },
"pg-monitor": { "pg-monitor": {
"version": "1.5.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/pg-monitor/-/pg-monitor-1.5.0.tgz", "resolved": "https://registry.npmjs.org/pg-monitor/-/pg-monitor-2.0.0.tgz",
"integrity": "sha512-Zg5RpoYaz0zyRwAQWKrRxUZgzZ+/r4McMP4vEvg+qE8765SHAB1wHZL58uAjocG4WSK/NLP/zZhUuoyurw4l6Q==", "integrity": "sha512-UqjhroM701sRrJHhXeF1OwNBGxkN9R0YgkVU8A46wWn3RwK/K7QDylChMoDxo8TmGp86CBP4ZSf+RK9vD8XyVA==",
"requires": { "requires": {
"cli-color": "2.0.3" "cli-color": "2.0.3"
}, },
@@ -32621,20 +32621,20 @@
"requires": {} "requires": {}
}, },
"pg-promise": { "pg-promise": {
"version": "10.12.1", "version": "11.3.0",
"resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.1.tgz", "resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-11.3.0.tgz",
"integrity": "sha512-SiJkBUDGq7PNfJFJbWferodsSH+vLrhte0Q0kVgQbwlNYeKmp9Hhkr+357+5DWEuBGOHhSu1UQffSSf5HVqRtA==", "integrity": "sha512-A2CYmax5gsqVAO2N0ET9oPRCPX3kpKymj9qLVK7+jszlJL6l8uJDq/DGqLpxNi5VHwK7Dmm2WNRdrwkh1xuaxQ==",
"requires": { "requires": {
"assert-options": "0.7.0", "assert-options": "0.8.0",
"pg": "8.8.0", "pg": "8.9.0",
"pg-minify": "1.6.2", "pg-minify": "1.6.2",
"spex": "3.2.0" "spex": "3.2.0"
} }
}, },
"pg-protocol": { "pg-protocol": {
"version": "1.5.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz", "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz",
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==" "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="
}, },
"pg-types": { "pg-types": {
"version": "2.2.0", "version": "2.2.0",

4
package.json
View File

@@ -50,8 +50,8 @@
"mustache": "4.2.0", "mustache": "4.2.0",
"parse": "4.0.1", "parse": "4.0.1",
"path-to-regexp": "0.1.7", "path-to-regexp": "0.1.7",
"pg-monitor": "1.5.0", "pg-monitor": "2.0.0",
"pg-promise": "10.12.1", "pg-promise": "11.3.0",
"pluralize": "8.0.0", "pluralize": "8.0.0",
"redis": "4.0.6", "redis": "4.0.6",
"semver": "7.3.8", "semver": "7.3.8",

20
spec/PostgresConfigParser.spec.js
View File

@@ -27,13 +27,13 @@ const baseURI = 'postgres://username:password@localhost:5432/db-name';
const testfile = fs.readFileSync('./Dockerfile').toString(); const testfile = fs.readFileSync('./Dockerfile').toString();
const dbOptionsTest = {}; const dbOptionsTest = {};
dbOptionsTest[ dbOptionsTest[
`${baseURI}?ssl=true&binary=true&application_name=app_name&fallback_application_name=f_app_name&poolSize=10` `${baseURI}?ssl=true&binary=true&application_name=app_name&fallback_application_name=f_app_name&poolSize=12`
] = { ] = {
ssl: true, ssl: true,
binary: true, binary: true,
application_name: 'app_name', application_name: 'app_name',
fallback_application_name: 'f_app_name', fallback_application_name: 'f_app_name',
poolSize: 10, max: 12,
}; };
dbOptionsTest[`${baseURI}?ssl=&binary=aa`] = { dbOptionsTest[`${baseURI}?ssl=&binary=aa`] = {
binary: false, binary: false,
@@ -83,6 +83,20 @@ describe('PostgresConfigParser.getDatabaseOptionsFromURI', () => {
it('sets the poolSize to 10 if the it is not a number', () => { it('sets the poolSize to 10 if the it is not a number', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?poolSize=sdf`); const result = parser.getDatabaseOptionsFromURI(`${baseURI}?poolSize=sdf`);
expect(result.poolSize).toEqual(10); expect(result.max).toEqual(10);
});
it('sets the max to 10 if the it is not a number', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?&max=sdf`);
expect(result.poolSize).toBeUndefined();
expect(result.max).toEqual(10);
});
it('max should take precedence over poolSize', () => {
const result = parser.getDatabaseOptionsFromURI(`${baseURI}?poolSize=20&max=12`);
expect(result.poolSize).toBeUndefined();
expect(result.max).toEqual(12);
}); });
}); });

2
src/Adapters/Storage/Postgres/PostgresConfigParser.js
View File

@@ -58,7 +58,7 @@ function getDatabaseOptionsFromURI(uri) {
databaseOptions.fallback_application_name = queryParams.fallback_application_name; databaseOptions.fallback_application_name = queryParams.fallback_application_name;
if (queryParams.poolSize) { if (queryParams.poolSize) {
databaseOptions.poolSize = parseInt(queryParams.poolSize) || 10; databaseOptions.max = parseInt(queryParams.poolSize) || 10;
} }
if (queryParams.max) { if (queryParams.max) {
databaseOptions.max = parseInt(queryParams.max) || 10; databaseOptions.max = parseInt(queryParams.max) || 10;