@catladder/cli 3.30.2 → 3.30.4
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/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +18 -18
- package/dist/cli/src/gcloud/cloudSql/copyDb.js +6 -3
- package/dist/cli/src/gcloud/cloudSql/copyDb.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/mongodb.d.ts +4 -0
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js +4 -0
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/gcloud/cloudSql/copyDb.ts +7 -3
|
@@ -12,15 +12,18 @@ const spawnCopyDb = async (opts) => {
|
|
|
12
12
|
exports.spawnCopyDb = spawnCopyDb;
|
|
13
13
|
const createCopyDbScript = ({ targetPassword, targetPort, targetUsername, sourceUsername, sourcePassword, sourcePort, sourceDbName, targetDbName, }) => {
|
|
14
14
|
const targetPSQL = (command) => `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=${targetUsername} -q ${command}`;
|
|
15
|
+
// URL-encode credentials to handle special characters like @, :, /, etc.
|
|
16
|
+
const encodedSourceUsername = encodeURIComponent(sourceUsername);
|
|
17
|
+
const encodedSourcePassword = encodeURIComponent(sourcePassword);
|
|
15
18
|
const copyDBScript = `
|
|
16
19
|
set -e
|
|
17
|
-
|
|
18
|
-
|
|
20
|
+
|
|
21
|
+
|
|
19
22
|
|
|
20
23
|
dumptmp=$(mktemp /tmp/dump.XXXXXX)
|
|
21
24
|
|
|
22
25
|
echo "Dumping file to $dumptmp"
|
|
23
|
-
pg_dump --dbname=postgres://${
|
|
26
|
+
pg_dump --dbname=postgres://${encodedSourceUsername}:${encodedSourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $dumptmp
|
|
24
27
|
echo "dump done"
|
|
25
28
|
${targetPSQL(`-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`)}
|
|
26
29
|
${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copyDb.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudSql/copyDb.ts"],"names":[],"mappings":";;;AAAA,iEAA8C;AAWvC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,MAAM,IAAA,6BAAK,EAAC,MAAM,EAAE,EAAE,EAAE;QAC7B,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC,CAAC;AAPW,QAAA,WAAW,eAOtB;AACF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,cAAc,EACd,UAAU,EACV,cAAc,EACd,cAAc,EACd,cAAc,EACd,UAAU,EACV,YAAY,EACZ,YAAY,GACP,EAAE,EAAE;IACT,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE,CACrC,cAAc,cAAc,YAAY,UAAU,4BAA4B,cAAc,OAAO,OAAO,EAAE,CAAC;IAE/G,MAAM,YAAY,GAAG;;;;;;;;oCAQa,
|
|
1
|
+
{"version":3,"file":"copyDb.js","sourceRoot":"","sources":["../../../../../src/gcloud/cloudSql/copyDb.ts"],"names":[],"mappings":";;;AAAA,iEAA8C;AAWvC,MAAM,WAAW,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,MAAM,IAAA,6BAAK,EAAC,MAAM,EAAE,EAAE,EAAE;QAC7B,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC,CAAC;AAPW,QAAA,WAAW,eAOtB;AACF,MAAM,kBAAkB,GAAG,CAAC,EAC1B,cAAc,EACd,UAAU,EACV,cAAc,EACd,cAAc,EACd,cAAc,EACd,UAAU,EACV,YAAY,EACZ,YAAY,GACP,EAAE,EAAE;IACT,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE,CACrC,cAAc,cAAc,YAAY,UAAU,4BAA4B,cAAc,OAAO,OAAO,EAAE,CAAC;IAE/G,yEAAyE;IACzE,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAG;;;;;;;;oCAQa,qBAAqB,IAAI,qBAAqB,cAAc,UAAU,IAAI,YAAY;;QAElH,UAAU,CACV,sBAAsB,YAAY,sCAAsC,CACzE;QACC,UAAU,CAAC,wBAAwB,YAAY,iBAAiB,CAAC;;QAEjE,UAAU,CAAC,IAAI,YAAY,2BAA2B,CAAC;;;;;;;OAOxD,CAAC;IACN,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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"}
|