dbdock 1.1.7 → 1.1.8
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
|
@@ -30,7 +30,7 @@ function loadConfig() {
|
|
|
30
30
|
if (mergedConfig.storage) {
|
|
31
31
|
const storage = mergedConfig.storage;
|
|
32
32
|
const provider = storage.provider;
|
|
33
|
-
if (provider === 's3' && storage.s3) {
|
|
33
|
+
if ((provider === 's3' || provider === 'r2') && storage.s3) {
|
|
34
34
|
if (storage.accessKeyId && !storage.s3.accessKeyId) {
|
|
35
35
|
storage.s3.accessKeyId = storage.accessKeyId;
|
|
36
36
|
}
|
|
@@ -38,7 +38,7 @@ function loadConfig() {
|
|
|
38
38
|
storage.s3.secretAccessKey = storage.secretAccessKey;
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
-
if (provider === 'r2' && storage.r2) {
|
|
41
|
+
if (provider === 'r2' && storage.r2 && !storage.s3) {
|
|
42
42
|
if (storage.accessKeyId && !storage.r2.accessKeyId) {
|
|
43
43
|
storage.r2.accessKeyId = storage.accessKeyId;
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":";;;AAuFA,sCAEC;AAED,oCAEC;AAED,gCAuFC;AAED,gCAGC;AA3LD,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,CAcX,CAAC;IAEF,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,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;QACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAElC,IAAI,QAAQ,KAAK,IAAI,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.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.8",
|
|
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,
|