dbdock 1.1.17 → 1.1.19
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/README.md +14 -5
- package/dist/cli/utils/config.js +125 -5
- package/dist/cli/utils/config.js.map +1 -1
- package/dist/config/config.service.js +21 -3
- package/dist/config/config.service.js.map +1 -1
- package/dist/config/env-url.helper.d.ts +11 -0
- package/dist/config/env-url.helper.js +56 -0
- package/dist/config/env-url.helper.js.map +1 -0
- package/dist/config/secrets.validator.js +5 -1
- package/dist/config/secrets.validator.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -73,6 +73,8 @@ It asks for your database connection, picks your storage (Local, S3, R2, Cloudin
|
|
|
73
73
|
- Config (safe stuff) goes to `dbdock.config.json` — commit this
|
|
74
74
|
- Secrets go to `.env` — never committed, `.gitignore` updated automatically
|
|
75
75
|
|
|
76
|
+
You can also run **without a config file**: set `DBDOCK_DB_URL` (or `DATABASE_URL`) and other env vars and DBDock will use env-only configuration.
|
|
77
|
+
|
|
76
78
|
---
|
|
77
79
|
|
|
78
80
|
### `dbdock backup` — One command, full backup
|
|
@@ -543,13 +545,20 @@ DBDock splits your config into two parts by design:
|
|
|
543
545
|
|
|
544
546
|
| What | Where | Git safe? |
|
|
545
547
|
|------|-------|-----------|
|
|
546
|
-
| Host, port, bucket names, settings | `dbdock.config.json` | Yes |
|
|
547
|
-
| Passwords, API keys, secrets | `.env` | No (auto-gitignored) |
|
|
548
|
+
| Host, port, bucket names, settings | `dbdock.config.json` or env | Yes (if in config) |
|
|
549
|
+
| Passwords, API keys, secrets | `.env` or `DBDOCK_DB_URL` | No (auto-gitignored) |
|
|
548
550
|
|
|
549
551
|
### Environment Variables
|
|
550
552
|
|
|
553
|
+
Use either a **full database URL** or **separate credentials**:
|
|
554
|
+
|
|
551
555
|
```bash
|
|
552
|
-
|
|
556
|
+
# Option 1: Full URL (env-only config, no password var needed)
|
|
557
|
+
DBDOCK_DB_URL=postgresql://user:password@host:5432/database
|
|
558
|
+
# or DATABASE_URL=postgresql://user:password@host:5432/database
|
|
559
|
+
|
|
560
|
+
# Option 2: Separate credentials (with or without dbdock.config.json)
|
|
561
|
+
DBDOCK_DB_PASSWORD=your-database-password # Required if not using URL
|
|
553
562
|
DBDOCK_STORAGE_ACCESS_KEY=your-access-key # For cloud storage
|
|
554
563
|
DBDOCK_STORAGE_SECRET_KEY=your-secret-key # For cloud storage
|
|
555
564
|
DBDOCK_ENCRYPTION_SECRET=64-char-hex-string # If encryption enabled
|
|
@@ -558,7 +567,7 @@ DBDOCK_SMTP_PASS=your-app-password # For email alerts
|
|
|
558
567
|
DBDOCK_SLACK_WEBHOOK=https://hooks.slack.com/... # For Slack alerts
|
|
559
568
|
```
|
|
560
569
|
|
|
561
|
-
Reads from both `.env` and `.env.local` (`.env.local` takes priority).
|
|
570
|
+
When `DBDOCK_DB_URL` or `DATABASE_URL` is set, it overrides database settings from `dbdock.config.json`. You can run with **env-only** (no config file) by setting the URL plus storage/encryption/alert vars in `.env`. Reads from both `.env` and `.env.local` (`.env.local` takes priority).
|
|
562
571
|
|
|
563
572
|
### .pgpass Support
|
|
564
573
|
|
|
@@ -647,7 +656,7 @@ Don't just use the CLI — drop DBDock into your Node.js app and trigger backups
|
|
|
647
656
|
npm install dbdock
|
|
648
657
|
```
|
|
649
658
|
|
|
650
|
-
|
|
659
|
+
Use `dbdock.config.json` (run `npx dbdock init`) or configure entirely via env vars (`DBDOCK_DB_URL` / `DATABASE_URL` plus storage and other env vars).
|
|
651
660
|
|
|
652
661
|
### Create a Backup
|
|
653
662
|
|
package/dist/cli/utils/config.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.saveConfig = saveConfig;
|
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const secrets_validator_1 = require("../../config/secrets.validator");
|
|
11
|
+
const env_url_helper_1 = require("../../config/env-url.helper");
|
|
11
12
|
exports.CONFIG_FILE = 'dbdock.config.json';
|
|
12
13
|
function getConfigPath() {
|
|
13
14
|
return process.env.DBDOCK_CONFIG_PATH || (0, path_1.join)(process.cwd(), exports.CONFIG_FILE);
|
|
@@ -15,15 +16,129 @@ function getConfigPath() {
|
|
|
15
16
|
function configExists() {
|
|
16
17
|
return (0, fs_1.existsSync)(getConfigPath());
|
|
17
18
|
}
|
|
19
|
+
function loadConfigFromEnv() {
|
|
20
|
+
const dbUrl = (0, env_url_helper_1.getDbUrlFromEnv)();
|
|
21
|
+
let database;
|
|
22
|
+
if (dbUrl) {
|
|
23
|
+
const parsed = (0, env_url_helper_1.parsePostgresUrlToConfig)(dbUrl);
|
|
24
|
+
database = {
|
|
25
|
+
type: 'postgres',
|
|
26
|
+
host: parsed.host,
|
|
27
|
+
port: parsed.port,
|
|
28
|
+
username: parsed.user,
|
|
29
|
+
user: parsed.user,
|
|
30
|
+
password: parsed.password,
|
|
31
|
+
database: parsed.database,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
const host = process.env.DB_HOST || process.env.DBDOCK_DB_HOST || 'localhost';
|
|
36
|
+
const port = parseInt(process.env.DB_PORT || process.env.DBDOCK_DB_PORT || '5432');
|
|
37
|
+
const user = process.env.DB_USER || process.env.DBDOCK_DB_USER || 'postgres';
|
|
38
|
+
const password = process.env.DBDOCK_DB_PASSWORD || process.env.DB_PASSWORD || '';
|
|
39
|
+
const dbName = process.env.DB_NAME || process.env.DBDOCK_DB_NAME || 'postgres';
|
|
40
|
+
database = {
|
|
41
|
+
type: 'postgres',
|
|
42
|
+
host,
|
|
43
|
+
port: Number.isNaN(port) ? 5432 : port,
|
|
44
|
+
username: user,
|
|
45
|
+
user,
|
|
46
|
+
password,
|
|
47
|
+
database: dbName,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
const storageProvider = process.env.STORAGE_PROVIDER ||
|
|
51
|
+
process.env.DBDOCK_STORAGE_PROVIDER ||
|
|
52
|
+
'local';
|
|
53
|
+
const storage = {
|
|
54
|
+
provider: storageProvider,
|
|
55
|
+
};
|
|
56
|
+
if (storageProvider === 'local') {
|
|
57
|
+
storage.local = {
|
|
58
|
+
path: process.env.STORAGE_LOCAL_PATH ||
|
|
59
|
+
process.env.DBDOCK_STORAGE_LOCAL_PATH ||
|
|
60
|
+
'./backups',
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
else if (storageProvider === 's3' || storageProvider === 'r2') {
|
|
64
|
+
storage.s3 = {
|
|
65
|
+
bucket: process.env.STORAGE_BUCKET ||
|
|
66
|
+
process.env.DBDOCK_STORAGE_BUCKET ||
|
|
67
|
+
'dbdock-backups',
|
|
68
|
+
region: process.env.STORAGE_REGION || process.env.AWS_REGION || 'us-east-1',
|
|
69
|
+
accessKeyId: process.env.DBDOCK_STORAGE_ACCESS_KEY ||
|
|
70
|
+
process.env.STORAGE_ACCESS_KEY ||
|
|
71
|
+
'',
|
|
72
|
+
secretAccessKey: process.env.DBDOCK_STORAGE_SECRET_KEY ||
|
|
73
|
+
process.env.STORAGE_SECRET_KEY ||
|
|
74
|
+
'',
|
|
75
|
+
endpoint: process.env.STORAGE_ENDPOINT || process.env.DBDOCK_STORAGE_ENDPOINT,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
else if (storageProvider === 'cloudinary') {
|
|
79
|
+
storage.cloudinary = {
|
|
80
|
+
cloudName: process.env.CLOUDINARY_CLOUD_NAME ||
|
|
81
|
+
process.env.DBDOCK_CLOUDINARY_CLOUD_NAME ||
|
|
82
|
+
'',
|
|
83
|
+
apiKey: process.env.DBDOCK_CLOUDINARY_API_KEY ||
|
|
84
|
+
process.env.CLOUDINARY_API_KEY ||
|
|
85
|
+
'',
|
|
86
|
+
apiSecret: process.env.DBDOCK_CLOUDINARY_API_SECRET ||
|
|
87
|
+
process.env.CLOUDINARY_API_SECRET ||
|
|
88
|
+
'',
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
const config = { database, storage };
|
|
92
|
+
const encryptionEnabled = process.env.ENCRYPTION_ENABLED !== 'false';
|
|
93
|
+
if (encryptionEnabled) {
|
|
94
|
+
config.backup = {
|
|
95
|
+
encryption: {
|
|
96
|
+
enabled: true,
|
|
97
|
+
key: process.env.DBDOCK_ENCRYPTION_SECRET || process.env.ENCRYPTION_SECRET,
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
const smtpHost = process.env.SMTP_HOST || process.env.DBDOCK_SMTP_HOST;
|
|
102
|
+
const slackWebhook = process.env.DBDOCK_SLACK_WEBHOOK || process.env.SLACK_WEBHOOK;
|
|
103
|
+
if (smtpHost || slackWebhook) {
|
|
104
|
+
config.alerts = {};
|
|
105
|
+
if (smtpHost) {
|
|
106
|
+
config.alerts.email = {
|
|
107
|
+
enabled: true,
|
|
108
|
+
smtp: {
|
|
109
|
+
host: smtpHost,
|
|
110
|
+
port: parseInt(process.env.SMTP_PORT || process.env.DBDOCK_SMTP_PORT || '587', 10),
|
|
111
|
+
secure: process.env.SMTP_SECURE === 'true',
|
|
112
|
+
auth: {
|
|
113
|
+
user: process.env.DBDOCK_SMTP_USER || process.env.SMTP_USER || '',
|
|
114
|
+
pass: process.env.DBDOCK_SMTP_PASS || process.env.SMTP_PASS || '',
|
|
115
|
+
},
|
|
116
|
+
},
|
|
117
|
+
from: process.env.SMTP_FROM || process.env.DBDOCK_SMTP_FROM || '',
|
|
118
|
+
to: (process.env.ALERT_EMAILS || process.env.DBDOCK_ALERT_EMAILS || '')
|
|
119
|
+
.split(',')
|
|
120
|
+
.filter(Boolean),
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
if (slackWebhook) {
|
|
124
|
+
config.alerts.slack = { enabled: true, webhookUrl: slackWebhook };
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return config;
|
|
128
|
+
}
|
|
18
129
|
function loadConfig() {
|
|
19
130
|
const configPath = getConfigPath();
|
|
131
|
+
let config;
|
|
20
132
|
if (!(0, fs_1.existsSync)(configPath)) {
|
|
21
|
-
|
|
133
|
+
config = loadConfigFromEnv();
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
const content = (0, fs_1.readFileSync)(configPath, 'utf-8');
|
|
137
|
+
config = JSON.parse(content);
|
|
22
138
|
}
|
|
23
|
-
const content = (0, fs_1.readFileSync)(configPath, 'utf-8');
|
|
24
|
-
const config = JSON.parse(content);
|
|
25
139
|
const envSecrets = (0, secrets_validator_1.loadSecretsFromEnv)();
|
|
26
|
-
|
|
140
|
+
let mergedConfig = (0, secrets_validator_1.mergeSecretsIntoConfig)(config, envSecrets);
|
|
141
|
+
mergedConfig = (0, env_url_helper_1.applyDbUrlToCliDatabase)(mergedConfig);
|
|
27
142
|
if (mergedConfig.postgres?.password && !mergedConfig.database?.password) {
|
|
28
143
|
mergedConfig.database.password = mergedConfig.postgres.password;
|
|
29
144
|
}
|
|
@@ -60,7 +175,12 @@ function loadConfig() {
|
|
|
60
175
|
if (alerts?.smtpUser || alerts?.smtpPass) {
|
|
61
176
|
if (alerts.email) {
|
|
62
177
|
if (!alerts.email.smtp) {
|
|
63
|
-
alerts.email.smtp = {
|
|
178
|
+
alerts.email.smtp = {
|
|
179
|
+
host: '',
|
|
180
|
+
port: 587,
|
|
181
|
+
secure: false,
|
|
182
|
+
auth: { user: '', pass: '' },
|
|
183
|
+
};
|
|
64
184
|
}
|
|
65
185
|
if (!alerts.email.smtp.auth) {
|
|
66
186
|
alerts.email.smtp.auth = { user: '', pass: '' };
|
|
@@ -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":"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"}
|
|
@@ -51,6 +51,7 @@ const config_schema_1 = require("./config.schema");
|
|
|
51
51
|
const fs = __importStar(require("fs"));
|
|
52
52
|
const secrets_validator_1 = require("./secrets.validator");
|
|
53
53
|
const permissions_checker_1 = require("./permissions.checker");
|
|
54
|
+
const env_url_helper_1 = require("./env-url.helper");
|
|
54
55
|
let DBDockConfigService = class DBDockConfigService {
|
|
55
56
|
nestConfig;
|
|
56
57
|
config;
|
|
@@ -74,6 +75,7 @@ let DBDockConfigService = class DBDockConfigService {
|
|
|
74
75
|
configData = this.transformCLIToProgrammatic(configData);
|
|
75
76
|
const envSecrets = (0, secrets_validator_1.loadSecretsFromEnv)();
|
|
76
77
|
configData = (0, secrets_validator_1.mergeSecretsIntoConfig)(configData, envSecrets);
|
|
78
|
+
configData = (0, env_url_helper_1.applyDbUrlToPostgresConfig)(configData);
|
|
77
79
|
if (configFromFile) {
|
|
78
80
|
this.warnAboutLegacySecrets(configData);
|
|
79
81
|
}
|
|
@@ -223,15 +225,31 @@ let DBDockConfigService = class DBDockConfigService {
|
|
|
223
225
|
return transformed;
|
|
224
226
|
}
|
|
225
227
|
loadFromEnvironment() {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
+
const dbUrl = this.nestConfig.get('DBDOCK_DB_URL') ||
|
|
229
|
+
this.nestConfig.get('DATABASE_URL');
|
|
230
|
+
let postgres;
|
|
231
|
+
if (dbUrl) {
|
|
232
|
+
const parsed = (0, env_url_helper_1.parsePostgresUrlToConfig)(dbUrl);
|
|
233
|
+
postgres = {
|
|
234
|
+
host: parsed.host,
|
|
235
|
+
port: parsed.port,
|
|
236
|
+
user: parsed.user,
|
|
237
|
+
password: parsed.password,
|
|
238
|
+
database: parsed.database,
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
postgres = {
|
|
228
243
|
host: this.nestConfig.get('DB_HOST', 'localhost'),
|
|
229
244
|
port: this.nestConfig.get('DB_PORT', 5432),
|
|
230
245
|
user: this.nestConfig.get('DB_USER', 'postgres'),
|
|
231
246
|
password: this.nestConfig.get('DBDOCK_DB_PASSWORD') ||
|
|
232
247
|
this.nestConfig.get('DB_PASSWORD', ''),
|
|
233
248
|
database: this.nestConfig.get('DB_NAME', 'postgres'),
|
|
234
|
-
}
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
return {
|
|
252
|
+
postgres,
|
|
235
253
|
storage: {
|
|
236
254
|
provider: this.nestConfig.get('STORAGE_PROVIDER', config_schema_1.StorageProvider.LOCAL),
|
|
237
255
|
bucket: this.nestConfig.get('STORAGE_BUCKET', 'dbdock-backups'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/config/config.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/config/config.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface PostgresConfigFromUrl {
|
|
2
|
+
host: string;
|
|
3
|
+
port: number;
|
|
4
|
+
user: string;
|
|
5
|
+
password: string;
|
|
6
|
+
database: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function parsePostgresUrlToConfig(urlString: string): PostgresConfigFromUrl;
|
|
9
|
+
export declare function getDbUrlFromEnv(): string | undefined;
|
|
10
|
+
export declare function applyDbUrlToPostgresConfig(config: Record<string, unknown>): Record<string, unknown>;
|
|
11
|
+
export declare function applyDbUrlToCliDatabase(config: Record<string, unknown>): Record<string, unknown>;
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parsePostgresUrlToConfig = parsePostgresUrlToConfig;
|
|
4
|
+
exports.getDbUrlFromEnv = getDbUrlFromEnv;
|
|
5
|
+
exports.applyDbUrlToPostgresConfig = applyDbUrlToPostgresConfig;
|
|
6
|
+
exports.applyDbUrlToCliDatabase = applyDbUrlToCliDatabase;
|
|
7
|
+
function parsePostgresUrlToConfig(urlString) {
|
|
8
|
+
const url = new URL(urlString);
|
|
9
|
+
if (url.protocol !== 'postgresql:' && url.protocol !== 'postgres:') {
|
|
10
|
+
throw new Error(`Invalid protocol "${url.protocol}". Expected "postgresql://" or "postgres://"`);
|
|
11
|
+
}
|
|
12
|
+
const database = (url.pathname || '/').replace(/^\//, '') || 'postgres';
|
|
13
|
+
const port = parseInt(url.port || '5432', 10);
|
|
14
|
+
return {
|
|
15
|
+
host: url.hostname || 'localhost',
|
|
16
|
+
port: Number.isNaN(port) ? 5432 : port,
|
|
17
|
+
user: url.username ? decodeURIComponent(url.username) : 'postgres',
|
|
18
|
+
password: url.password ? decodeURIComponent(url.password) : '',
|
|
19
|
+
database: database,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function getDbUrlFromEnv() {
|
|
23
|
+
return process.env.DBDOCK_DB_URL || process.env.DATABASE_URL;
|
|
24
|
+
}
|
|
25
|
+
function applyDbUrlToPostgresConfig(config) {
|
|
26
|
+
const url = getDbUrlFromEnv();
|
|
27
|
+
if (!url || !url.trim())
|
|
28
|
+
return config;
|
|
29
|
+
const parsed = parsePostgresUrlToConfig(url);
|
|
30
|
+
const merged = JSON.parse(JSON.stringify(config));
|
|
31
|
+
if (!merged.postgres)
|
|
32
|
+
merged.postgres = {};
|
|
33
|
+
merged.postgres.host = parsed.host;
|
|
34
|
+
merged.postgres.port = parsed.port;
|
|
35
|
+
merged.postgres.user = parsed.user;
|
|
36
|
+
merged.postgres.password = parsed.password;
|
|
37
|
+
merged.postgres.database = parsed.database;
|
|
38
|
+
return merged;
|
|
39
|
+
}
|
|
40
|
+
function applyDbUrlToCliDatabase(config) {
|
|
41
|
+
const url = getDbUrlFromEnv();
|
|
42
|
+
if (!url || !url.trim())
|
|
43
|
+
return config;
|
|
44
|
+
const parsed = parsePostgresUrlToConfig(url);
|
|
45
|
+
const merged = JSON.parse(JSON.stringify(config));
|
|
46
|
+
if (!merged.database)
|
|
47
|
+
merged.database = {};
|
|
48
|
+
merged.database.host = parsed.host;
|
|
49
|
+
merged.database.port = parsed.port;
|
|
50
|
+
merged.database.username = parsed.user;
|
|
51
|
+
merged.database.user = parsed.user;
|
|
52
|
+
merged.database.password = parsed.password;
|
|
53
|
+
merged.database.database = parsed.database;
|
|
54
|
+
return merged;
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=env-url.helper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-url.helper.js","sourceRoot":"","sources":["../../src/config/env-url.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,7 @@ exports.formatMigrationInstructions = formatMigrationInstructions;
|
|
|
45
45
|
const fs = __importStar(require("fs"));
|
|
46
46
|
const path = __importStar(require("path"));
|
|
47
47
|
const dotenv = __importStar(require("dotenv"));
|
|
48
|
+
const env_url_helper_1 = require("./env-url.helper");
|
|
48
49
|
dotenv.config({ path: path.join(process.cwd(), '.env') });
|
|
49
50
|
const envLocalPath = path.join(process.cwd(), '.env.local');
|
|
50
51
|
if (fs.existsSync(envLocalPath)) {
|
|
@@ -174,7 +175,10 @@ function validateSecrets(config, requireEnvOnly = false) {
|
|
|
174
175
|
}
|
|
175
176
|
function getRequiredSecrets(config) {
|
|
176
177
|
const required = [];
|
|
177
|
-
|
|
178
|
+
const dbUrl = (0, env_url_helper_1.getDbUrlFromEnv)();
|
|
179
|
+
if (!dbUrl || !dbUrl.trim()) {
|
|
180
|
+
required.push('postgres.password');
|
|
181
|
+
}
|
|
178
182
|
const storageProvider = getNestedValue(config, 'storage.provider');
|
|
179
183
|
if (storageProvider === 's3' || storageProvider === 'r2') {
|
|
180
184
|
required.push('storage.accessKeyId');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.validator.js","sourceRoot":"","sources":["../../src/config/secrets.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"secrets.validator.js","sourceRoot":"","sources":["../../src/config/secrets.validator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dbdock",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.19",
|
|
4
4
|
"description": "Enterprise-grade database backup, restore, and cross-database migration (MongoDB ↔ PostgreSQL). CLI-first tool with encryption, compression, and multi-cloud storage.",
|
|
5
5
|
"author": "Naheem Olaide <naheemolaide@gmail.com>",
|
|
6
6
|
"private": false,
|