@catladder/cli 0.0.0-main-1f9c0121 → 0.0.0-main-4a04eb13
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/bundles/cli/index.js +32 -11
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +3 -11
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.d.ts +9 -0
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js +22 -0
- package/dist/cli/src/gcloud/cloudSql/parseConnectionString.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +3 -13
- package/src/gcloud/cloudSql/parseConnectionString.ts +28 -0
|
@@ -857,7 +857,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
|
857
857
|
const getProjectConfig_1 = __nccwpck_require__(50001);
|
|
858
858
|
const startProxy_1 = __nccwpck_require__(95540);
|
|
859
859
|
const autocompletions_1 = __nccwpck_require__(52468);
|
|
860
|
-
const
|
|
860
|
+
const parseConnectionString_1 = __nccwpck_require__(77992);
|
|
861
861
|
const copyDb_1 = __nccwpck_require__(57151);
|
|
862
862
|
exports["default"] = async (vorpal) => vorpal
|
|
863
863
|
.command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
|
|
@@ -888,11 +888,7 @@ exports["default"] = async (vorpal) => vorpal
|
|
|
888
888
|
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
889
889
|
};
|
|
890
890
|
if (sourceEnv === "local") {
|
|
891
|
-
const
|
|
892
|
-
scheme: "postgres",
|
|
893
|
-
hosts: [],
|
|
894
|
-
});
|
|
895
|
-
const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
|
|
891
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
|
|
896
892
|
sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
|
|
897
893
|
sourceUsername = parsersResult.username;
|
|
898
894
|
sourcePassword = parsersResult.password;
|
|
@@ -918,11 +914,7 @@ exports["default"] = async (vorpal) => vorpal
|
|
|
918
914
|
const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
|
|
919
915
|
const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
|
|
920
916
|
if (targetEnv === "local") {
|
|
921
|
-
const
|
|
922
|
-
scheme: "postgres",
|
|
923
|
-
hosts: [],
|
|
924
|
-
});
|
|
925
|
-
const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
|
|
917
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
|
|
926
918
|
targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
|
|
927
919
|
targetUsername = parsersResult.username;
|
|
928
920
|
targetPassword = parsersResult.password;
|
|
@@ -3002,6 +2994,35 @@ const createCopyDbScript = ({ targetPassword, targetPort, targetUsername, source
|
|
|
3002
2994
|
|
|
3003
2995
|
/***/ }),
|
|
3004
2996
|
|
|
2997
|
+
/***/ 77992:
|
|
2998
|
+
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
|
|
2999
|
+
|
|
3000
|
+
"use strict";
|
|
3001
|
+
|
|
3002
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
3003
|
+
exports.parseConnectionString = void 0;
|
|
3004
|
+
const connection_string_parser_1 = __nccwpck_require__(27827);
|
|
3005
|
+
/**
|
|
3006
|
+
* Parses a PostgreSQL connection string.
|
|
3007
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
3008
|
+
*
|
|
3009
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
3010
|
+
* @returns Parsed connection string parameters
|
|
3011
|
+
*/
|
|
3012
|
+
function parseConnectionString(connectionString) {
|
|
3013
|
+
const parser = new connection_string_parser_1.ConnectionStringParser({
|
|
3014
|
+
scheme: "postgresql",
|
|
3015
|
+
hosts: [],
|
|
3016
|
+
});
|
|
3017
|
+
// Normalize postgres:// to postgresql:// (the official IANA scheme)
|
|
3018
|
+
const normalizedConnectionString = connectionString.replace(/^postgres:\/\//, "postgresql://");
|
|
3019
|
+
return parser.parse(normalizedConnectionString);
|
|
3020
|
+
}
|
|
3021
|
+
exports.parseConnectionString = parseConnectionString;
|
|
3022
|
+
//# sourceMappingURL=parseConnectionString.js.map
|
|
3023
|
+
|
|
3024
|
+
/***/ }),
|
|
3025
|
+
|
|
3005
3026
|
/***/ 95540:
|
|
3006
3027
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
3007
3028
|
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
|
|
4
4
|
const startProxy_1 = require("../../../../../gcloud/cloudSql/startProxy");
|
|
5
5
|
const autocompletions_1 = require("../utils/autocompletions");
|
|
6
|
-
const
|
|
6
|
+
const parseConnectionString_1 = require("../../../../../gcloud/cloudSql/parseConnectionString");
|
|
7
7
|
const copyDb_1 = require("../../../../../gcloud/cloudSql/copyDb");
|
|
8
8
|
exports.default = async (vorpal) => vorpal
|
|
9
9
|
.command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
|
|
@@ -34,11 +34,7 @@ exports.default = async (vorpal) => vorpal
|
|
|
34
34
|
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
35
35
|
};
|
|
36
36
|
if (sourceEnv === "local") {
|
|
37
|
-
const
|
|
38
|
-
scheme: "postgres",
|
|
39
|
-
hosts: [],
|
|
40
|
-
});
|
|
41
|
-
const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
|
|
37
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(sourceEnvVars.DATABASE_URL.toString());
|
|
42
38
|
sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
|
|
43
39
|
sourceUsername = parsersResult.username;
|
|
44
40
|
sourcePassword = parsersResult.password;
|
|
@@ -64,11 +60,7 @@ exports.default = async (vorpal) => vorpal
|
|
|
64
60
|
const targetContext = await (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent);
|
|
65
61
|
const targetEnvVars = await (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name);
|
|
66
62
|
if (targetEnv === "local") {
|
|
67
|
-
const
|
|
68
|
-
scheme: "postgres",
|
|
69
|
-
hosts: [],
|
|
70
|
-
});
|
|
71
|
-
const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
|
|
63
|
+
const parsersResult = (0, parseConnectionString_1.parseConnectionString)(targetEnvVars.DATABASE_URL.toString());
|
|
72
64
|
targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
|
|
73
65
|
targetUsername = parsersResult.username;
|
|
74
66
|
targetPassword = parsersResult.password;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":";;AACA,6EAGgD;AAEhD,0EAA2F;AAC3F,8DAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type IConnectionStringParameters } from "connection-string-parser";
|
|
2
|
+
/**
|
|
3
|
+
* Parses a PostgreSQL connection string.
|
|
4
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
5
|
+
*
|
|
6
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
7
|
+
* @returns Parsed connection string parameters
|
|
8
|
+
*/
|
|
9
|
+
export declare function parseConnectionString(connectionString: string): IConnectionStringParameters;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseConnectionString = void 0;
|
|
4
|
+
const connection_string_parser_1 = require("connection-string-parser");
|
|
5
|
+
/**
|
|
6
|
+
* Parses a PostgreSQL connection string.
|
|
7
|
+
* Accepts both postgres:// and postgresql:// schemes and normalizes to postgresql://
|
|
8
|
+
*
|
|
9
|
+
* @param connectionString - The connection string to parse (e.g., "postgresql://user:pass@localhost:5432/dbname")
|
|
10
|
+
* @returns Parsed connection string parameters
|
|
11
|
+
*/
|
|
12
|
+
function parseConnectionString(connectionString) {
|
|
13
|
+
const parser = new connection_string_parser_1.ConnectionStringParser({
|
|
14
|
+
scheme: "postgresql",
|
|
15
|
+
hosts: [],
|
|
16
|
+
});
|
|
17
|
+
// Normalize postgres:// to postgresql:// (the official IANA scheme)
|
|
18
|
+
const normalizedConnectionString = connectionString.replace(/^postgres:\/\//, "postgresql://");
|
|
19
|
+
return parser.parse(normalizedConnectionString);
|
|
20
|
+
}
|
|
21
|
+
exports.parseConnectionString = parseConnectionString;
|
|
22
|
+
//# sourceMappingURL=parseConnectionString.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parseConnectionString.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudSql/parseConnectionString.ts"],"names":[],"mappings":";;;AAAA,uEAGkC;AAElC;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,gBAAwB;IAExB,MAAM,MAAM,GAAG,IAAI,iDAAsB,CAAC;QACxC,MAAM,EAAE,YAAY;QACpB,KAAK,EAAE,EAAE;KACV,CAAC,CAAC;IAEH,oEAAoE;IACpE,MAAM,0BAA0B,GAAG,gBAAgB,CAAC,OAAO,CACzD,gBAAgB,EAChB,eAAe,CAChB,CAAC;IAEF,OAAO,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAClD,CAAC;AAfD,sDAeC"}
|