dbdock 1.1.5 → 1.1.6
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/dist/cli/utils/config.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.loadConfig = loadConfig;
|
|
|
7
7
|
exports.saveConfig = saveConfig;
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = require("path");
|
|
10
|
+
const secrets_validator_1 = require("../../config/secrets.validator");
|
|
10
11
|
exports.CONFIG_FILE = 'dbdock.config.json';
|
|
11
12
|
function getConfigPath() {
|
|
12
13
|
return process.env.DBDOCK_CONFIG_PATH || (0, path_1.join)(process.cwd(), exports.CONFIG_FILE);
|
|
@@ -20,7 +21,13 @@ function loadConfig() {
|
|
|
20
21
|
throw new Error(`Config file not found at ${configPath}`);
|
|
21
22
|
}
|
|
22
23
|
const content = (0, fs_1.readFileSync)(configPath, 'utf-8');
|
|
23
|
-
|
|
24
|
+
const config = JSON.parse(content);
|
|
25
|
+
const envSecrets = (0, secrets_validator_1.loadSecretsFromEnv)();
|
|
26
|
+
const mergedConfig = (0, secrets_validator_1.mergeSecretsIntoConfig)(config, envSecrets);
|
|
27
|
+
if (mergedConfig.postgres?.password && !mergedConfig.database?.password) {
|
|
28
|
+
mergedConfig.database.password = mergedConfig.postgres.password;
|
|
29
|
+
}
|
|
30
|
+
return mergedConfig;
|
|
24
31
|
}
|
|
25
32
|
function saveConfig(config) {
|
|
26
33
|
const configPath = getConfigPath();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":";;;AAuFA,sCAEC;AAED,oCAEC;AAED,gCAmBC;AAED,gCAGC;AAvHD,2BAA6D;AAC7D,+BAA4B;AAC5B,sEAGwC;AAE3B,QAAA,WAAW,GAAG,oBAAoB,CAAC;AAgFhD,SAAgB,aAAa;IAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAW,CAAC,CAAC;AAC5E,CAAC;AAED,SAAgB,YAAY;IAC1B,OAAO,IAAA,eAAU,EAAC,aAAa,EAAE,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,UAAU;IACxB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAc,CAAC;IAEhD,MAAM,UAAU,GAAG,IAAA,sCAAkB,GAAE,CAAC;IACxC,MAAM,YAAY,GAAG,IAAA,0CAAsB,EACzC,MAA4C,EAC5C,UAAU,CACoD,CAAC;IAEjE,IAAI,YAAY,CAAC,QAAQ,EAAE,QAAQ,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACxE,YAAY,CAAC,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAClE,CAAC;IAED,OAAO,YAAyB,CAAC;AACnC,CAAC;AAED,SAAgB,UAAU,CAAC,MAAiB;IAC1C,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,IAAA,kBAAa,EAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dbdock",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"description": "Enterprise-grade PostgreSQL backup and restore in under 60 seconds. CLI-first tool with encryption, compression, and multi-cloud storage.",
|
|
5
5
|
"author": "Naheem Olaide <naheemolaide@gmail.com>",
|
|
6
6
|
"private": false,
|