@storyous/mongodb 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/getMongoConfig.js +8 -5
- package/lib/getMongoConfig.ts +8 -4
- package/package.json +2 -2
package/lib/getMongoConfig.js
CHANGED
|
@@ -38,20 +38,23 @@ exports.default = (envPrefix = 'DOCUMENTDB', mongoOptions = {}, documentDbOption
|
|
|
38
38
|
const engine = getEnv(envPrefix, 'ENGINE');
|
|
39
39
|
const protocol = getEnv(envPrefix, 'PROTOCOL', 'mongodb');
|
|
40
40
|
const endpoint = getEnv(envPrefix, 'ENDPOINT');
|
|
41
|
-
const port = getEnv(envPrefix, 'PORT', '
|
|
41
|
+
const port = getEnv(envPrefix, 'PORT', '');
|
|
42
42
|
const username = getEnv(envPrefix, 'USERNAME');
|
|
43
43
|
const password = getEnv(envPrefix, 'PASSWORD');
|
|
44
44
|
const database = getEnv(envPrefix, 'DATABASE', '');
|
|
45
|
-
const query = getEnv(envPrefix, 'QUERY', '
|
|
45
|
+
const query = getEnv(envPrefix, 'QUERY', '');
|
|
46
|
+
const fullPort = port !== '' ? `:${port}` : '';
|
|
47
|
+
const fullDatabase = database !== '' ? `/${database}` : '';
|
|
48
|
+
const fullQuery = query !== '' ? `?${query}` : '';
|
|
46
49
|
if (engine === 'mongodb') {
|
|
47
50
|
return {
|
|
48
|
-
mongodbUrl: `${protocol}://${username}:${password}@${endpoint}
|
|
51
|
+
mongodbUrl: `${protocol}://${username}:${password}@${endpoint}${fullPort}${fullDatabase}${fullQuery}`,
|
|
49
52
|
mongoOptions,
|
|
50
53
|
};
|
|
51
54
|
}
|
|
52
55
|
if (engine === 'documentdb') {
|
|
53
56
|
return {
|
|
54
|
-
mongodbUrl: `${protocol}://${endpoint}
|
|
57
|
+
mongodbUrl: `${protocol}://${endpoint}${fullPort}${fullDatabase}${fullQuery}`,
|
|
55
58
|
mongoOptions: {
|
|
56
59
|
tlsCAFile: path.resolve(__dirname, 'global-bundle.pem'),
|
|
57
60
|
tls: true,
|
|
@@ -72,4 +75,4 @@ exports.default = (envPrefix = 'DOCUMENTDB', mongoOptions = {}, documentDbOption
|
|
|
72
75
|
}
|
|
73
76
|
throw new Error(`Invalid ${envPrefix}_ENGINE value "${engine}", values "mongodb" or "documentdb" allowed.`);
|
|
74
77
|
};
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0TW9uZ29Db25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJnZXRNb25nb0NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkNBQTZCO0FBTzdCLE1BQU0sTUFBTSxHQUFHLENBQUMsTUFBYyxFQUFFLFFBQWdCLEVBQUUsZUFBNEIsSUFBSSxFQUFVLEVBQUU7SUFDMUYsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sSUFBSSxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBRW5ELElBQUksS0FBSyxLQUFLLFNBQVMsSUFBSSxZQUFZLEtBQUssSUFBSSxFQUFFO1FBQzlDLE9BQU8sWUFBWSxDQUFDO0tBQ3ZCO0lBRUQsSUFBSSxLQUFLLEtBQUssU0FBUyxFQUFFO1FBQ3JCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLE1BQU0sSUFBSSxRQUFRLFlBQVksQ0FBQyxDQUFDO0tBQzVFO0lBRUQsT0FBTyxLQUFLLENBQUM7QUFDakIsQ0FBQyxDQUFDO0FBRUYsa0JBQWUsQ0FDWCxZQUFvQixZQUFZLEVBQ2hDLFlBQVksR0FBRyxFQUFFLEVBQ2pCLGlCQUFpQixHQUFHLEVBQUUsRUFDaEIsRUFBRTtJQUNSLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDM0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDMUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMvQyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMzQyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFN0MsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQy9DLE1BQU0sWUFBWSxHQUFHLFFBQVEsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUMzRCxNQUFNLFNBQVMsR0FBRyxLQUFLLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFbEQsSUFBSSxNQUFNLEtBQUssU0FBUyxFQUFFO1FBQ3RCLE9BQU87WUFDSCxVQUFVLEVBQUUsR0FBRyxRQUFRLE1BQU0sUUFBUSxJQUFJLFFBQVEsSUFBSSxRQUFRLEdBQUcsUUFBUSxHQUFHLFlBQVksR0FBRyxTQUFTLEVBQUU7WUFDckcsWUFBWTtTQUNmLENBQUM7S0FDTDtJQUVELElBQUksTUFBTSxLQUFLLFlBQVksRUFBRTtRQUN6QixPQUFPO1lBQ0gsVUFBVSxFQUFFLEdBQUcsUUFBUSxNQUFNLFFBQVEsR0FBRyxRQUFRLEdBQUcsWUFBWSxHQUFHLFNBQVMsRUFBRTtZQUM3RSxZQUFZLEVBQUU7Z0JBQ1YsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLG1CQUFtQixDQUFDO2dCQUN2RCxHQUFHLEVBQUUsSUFBSTtnQkFDVCxJQUFJLEVBQUU7b0JBQ0YsUUFBUTtvQkFDUixRQUFRO2lCQUNYO2dCQUNELFVBQVUsRUFBRSxLQUFLO2dCQUVqQixnQkFBZ0IsRUFBRSxJQUFJO2dCQUN0QixhQUFhLEVBQUUsSUFBSTtnQkFDbkIsZUFBZSxFQUFFLElBQUk7Z0JBQ3JCLGtCQUFrQixFQUFFLElBQUk7Z0JBQ3hCLFVBQVUsRUFBRSxJQUFJO2dCQUNoQix3QkFBd0IsRUFBRSxJQUFJO2dCQUM5QixHQUFHLGlCQUFpQjthQUN2QjtTQUNKLENBQUM7S0FDTDtJQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsV0FBVyxTQUFTLGtCQUFrQixNQUFNLDhDQUE4QyxDQUFDLENBQUM7QUFDaEgsQ0FBQyxDQUFDIn0=
|
package/lib/getMongoConfig.ts
CHANGED
|
@@ -27,22 +27,26 @@ export default (
|
|
|
27
27
|
const engine = getEnv(envPrefix, 'ENGINE');
|
|
28
28
|
const protocol = getEnv(envPrefix, 'PROTOCOL', 'mongodb');
|
|
29
29
|
const endpoint = getEnv(envPrefix, 'ENDPOINT');
|
|
30
|
-
const port = getEnv(envPrefix, 'PORT', '
|
|
30
|
+
const port = getEnv(envPrefix, 'PORT', '');
|
|
31
31
|
const username = getEnv(envPrefix, 'USERNAME');
|
|
32
32
|
const password = getEnv(envPrefix, 'PASSWORD');
|
|
33
33
|
const database = getEnv(envPrefix, 'DATABASE', '');
|
|
34
|
-
const query = getEnv(envPrefix, 'QUERY', '
|
|
34
|
+
const query = getEnv(envPrefix, 'QUERY', '');
|
|
35
|
+
|
|
36
|
+
const fullPort = port !== '' ? `:${port}` : '';
|
|
37
|
+
const fullDatabase = database !== '' ? `/${database}` : '';
|
|
38
|
+
const fullQuery = query !== '' ? `?${query}` : '';
|
|
35
39
|
|
|
36
40
|
if (engine === 'mongodb') {
|
|
37
41
|
return {
|
|
38
|
-
mongodbUrl: `${protocol}://${username}:${password}@${endpoint}
|
|
42
|
+
mongodbUrl: `${protocol}://${username}:${password}@${endpoint}${fullPort}${fullDatabase}${fullQuery}`,
|
|
39
43
|
mongoOptions,
|
|
40
44
|
};
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
if (engine === 'documentdb') {
|
|
44
48
|
return {
|
|
45
|
-
mongodbUrl: `${protocol}://${endpoint}
|
|
49
|
+
mongodbUrl: `${protocol}://${endpoint}${fullPort}${fullDatabase}${fullQuery}`,
|
|
46
50
|
mongoOptions: {
|
|
47
51
|
tlsCAFile: path.resolve(__dirname, 'global-bundle.pem'),
|
|
48
52
|
tls: true,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storyous/mongodb",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://github.com/Storyous/mono-utils#readme",
|
|
6
6
|
"license": "ISC",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"mongodb": ">=4 <5"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "91bb669e4e72e3ec6b2fe082e434659174e7a396"
|
|
50
50
|
}
|