@catladder/cli 1.75.4 → 1.76.0
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/apps/cli/commands/cloudSQL/commandRestoreDb.js +42 -26
- package/dist/apps/cli/commands/cloudSQL/commandRestoreDb.js.map +1 -1
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js +9 -6
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/bundles/catenv/index.js +2 -2
- package/dist/bundles/cli/index.js +4 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/cloudSQL/commandRestoreDb.ts +17 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +6 -2
|
@@ -62,7 +62,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
62
62
|
.command("cloud-sql-restore-db", "restore a db from one source to another target")
|
|
63
63
|
.action(function restoreDb() {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function () {
|
|
65
|
-
var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
|
|
65
|
+
var sourceInstance, sourceProxy, targetProxy, sourcePort, targetPort, sourceLocalPort, sourceUsername, sourcePassword, sourceDbName, targetInstance, targetLocalPort, targetUsername, targetPassword, targetDbName, shouldContinue, targetPSQL, copyDBScript;
|
|
66
66
|
return __generator(this, function (_a) {
|
|
67
67
|
switch (_a.label) {
|
|
68
68
|
case 0: return [4 /*yield*/, this.prompt({
|
|
@@ -91,82 +91,98 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
91
91
|
_a.label = 5;
|
|
92
92
|
case 5: return [4 /*yield*/, this.prompt({
|
|
93
93
|
type: "input",
|
|
94
|
-
name: "
|
|
95
|
-
|
|
94
|
+
name: "sourceUsername",
|
|
95
|
+
"default": "postgres",
|
|
96
|
+
message: "Source Username? 🤔 "
|
|
96
97
|
})];
|
|
97
98
|
case 6:
|
|
99
|
+
sourceUsername = (_a.sent()).sourceUsername;
|
|
100
|
+
return [4 /*yield*/, this.prompt({
|
|
101
|
+
type: "input",
|
|
102
|
+
name: "sourcePassword",
|
|
103
|
+
message: "Source Password? 🤔 "
|
|
104
|
+
})];
|
|
105
|
+
case 7:
|
|
98
106
|
sourcePassword = (_a.sent()).sourcePassword;
|
|
99
107
|
return [4 /*yield*/, this.prompt({
|
|
100
108
|
type: "input",
|
|
101
109
|
name: "sourceDbName",
|
|
102
110
|
message: "Source DB name? 🤔 "
|
|
103
111
|
})];
|
|
104
|
-
case
|
|
112
|
+
case 8:
|
|
105
113
|
sourceDbName = (_a.sent()).sourceDbName;
|
|
106
114
|
return [4 /*yield*/, this.prompt({
|
|
107
115
|
type: "input",
|
|
108
116
|
name: "targetInstance",
|
|
109
117
|
message: "Targe INSTANCE (connection string or 'local')? 🤔 "
|
|
110
118
|
})];
|
|
111
|
-
case
|
|
119
|
+
case 9:
|
|
112
120
|
targetInstance = (_a.sent()).targetInstance;
|
|
113
|
-
if (!(targetInstance === "local")) return [3 /*break*/,
|
|
121
|
+
if (!(targetInstance === "local")) return [3 /*break*/, 11];
|
|
114
122
|
return [4 /*yield*/, this.prompt({
|
|
115
123
|
type: "number",
|
|
116
124
|
name: "targetLocalPort",
|
|
117
125
|
"default": 5432,
|
|
118
126
|
message: "Local Port for target? 🤔 "
|
|
119
127
|
})];
|
|
120
|
-
case
|
|
128
|
+
case 10:
|
|
121
129
|
targetLocalPort = (_a.sent()).targetLocalPort;
|
|
122
130
|
targetPort = targetLocalPort;
|
|
123
|
-
return [3 /*break*/,
|
|
124
|
-
case
|
|
131
|
+
return [3 /*break*/, 13];
|
|
132
|
+
case 11:
|
|
125
133
|
targetPort = 54499;
|
|
126
134
|
return [4 /*yield*/, createProxy(targetInstance, targetPort)];
|
|
127
|
-
case
|
|
135
|
+
case 12:
|
|
128
136
|
targetProxy = _a.sent();
|
|
129
|
-
_a.label =
|
|
130
|
-
case
|
|
137
|
+
_a.label = 13;
|
|
138
|
+
case 13: return [4 /*yield*/, this.prompt({
|
|
131
139
|
type: "input",
|
|
132
|
-
name: "
|
|
133
|
-
|
|
140
|
+
name: "targetUsername",
|
|
141
|
+
"default": "postgres",
|
|
142
|
+
message: "Target Username? 🤔 "
|
|
134
143
|
})];
|
|
135
|
-
case
|
|
144
|
+
case 14:
|
|
145
|
+
targetUsername = (_a.sent()).targetUsername;
|
|
146
|
+
return [4 /*yield*/, this.prompt({
|
|
147
|
+
type: "input",
|
|
148
|
+
name: "targetPassword",
|
|
149
|
+
message: "Target Password? 🤔 "
|
|
150
|
+
})];
|
|
151
|
+
case 15:
|
|
136
152
|
targetPassword = (_a.sent()).targetPassword;
|
|
137
153
|
return [4 /*yield*/, this.prompt({
|
|
138
154
|
type: "input",
|
|
139
155
|
name: "targetDbName",
|
|
140
156
|
message: "Target DB name? 🤔 "
|
|
141
157
|
})];
|
|
142
|
-
case
|
|
158
|
+
case 16:
|
|
143
159
|
targetDbName = (_a.sent()).targetDbName;
|
|
144
160
|
return [4 /*yield*/, this.prompt({
|
|
145
161
|
type: "confirm",
|
|
146
162
|
name: "shouldContinue",
|
|
147
163
|
message: "This will drop ".concat(targetInstance, "/").concat(targetDbName, " and replace it with ").concat(sourceInstance, "/").concat(sourceDbName, ". Continue? \uD83E\uDD14 ")
|
|
148
164
|
})];
|
|
149
|
-
case
|
|
165
|
+
case 17:
|
|
150
166
|
shouldContinue = (_a.sent()).shouldContinue;
|
|
151
167
|
if (!shouldContinue) {
|
|
152
168
|
return [2 /*return*/];
|
|
153
169
|
}
|
|
154
170
|
targetPSQL = function (command) {
|
|
155
|
-
return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=
|
|
171
|
+
return "PGPASSWORD=".concat(targetPassword, " psql -p ").concat(targetPort, " --host=localhost --user=").concat(targetUsername, " -q ").concat(command);
|
|
156
172
|
};
|
|
157
|
-
copyDBScript = "\n set -e\n \n \n\n dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n echo \"Dumping file to $dumptmp\"\n pg_dump --dbname=postgres://
|
|
158
|
-
_a.label =
|
|
159
|
-
case
|
|
160
|
-
_a.trys.push([
|
|
173
|
+
copyDBScript = "\n set -e\n \n \n\n dumptmp=$(mktemp /tmp/dump.XXXXXX)\n\n echo \"Dumping file to $dumptmp\"\n pg_dump --dbname=postgres://".concat(sourceUsername, ":").concat(sourcePassword, "@localhost:").concat(sourcePort, "/").concat(sourceDbName, " --no-owner --no-privileges > $dumptmp\n echo \"dump done\"\n ").concat(targetPSQL("-c 'drop database \"".concat(targetDbName, "\" WITH (FORCE)' 1> /dev/null || true")), "\n ").concat(targetPSQL("-c 'create database \"".concat(targetDbName, "\"' 1> /dev/null")), "\n echo \"Restoring dump...\"\n ").concat(targetPSQL("\"".concat(targetDbName, "\" < $dumptmp 1> /dev/null")), "\n \n\n echo \"Clean up...\"\n set +e\n rm $dumptmp\n echo \"\n\uD83D\uDC31 Done!\"\n ");
|
|
174
|
+
_a.label = 18;
|
|
175
|
+
case 18:
|
|
176
|
+
_a.trys.push([18, , 20, 21]);
|
|
161
177
|
return [4 /*yield*/, (0, child_process_promise_1.spawn)(copyDBScript, [], { shell: "bash", stdio: "inherit" })];
|
|
162
|
-
case
|
|
178
|
+
case 19:
|
|
163
179
|
_a.sent();
|
|
164
|
-
return [3 /*break*/,
|
|
165
|
-
case
|
|
180
|
+
return [3 /*break*/, 21];
|
|
181
|
+
case 20:
|
|
166
182
|
sourceProxy === null || sourceProxy === void 0 ? void 0 : sourceProxy.stop();
|
|
167
183
|
targetProxy === null || targetProxy === void 0 ? void 0 : targetProxy.stop();
|
|
168
184
|
return [7 /*endfinally*/];
|
|
169
|
-
case
|
|
185
|
+
case 21: return [2 /*return*/];
|
|
170
186
|
}
|
|
171
187
|
});
|
|
172
188
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA8C;AAG9C,IAAM,WAAW,GAAG,UAAO,QAAgB,EAAE,IAAY;;;;;gBACjD,KAAK,GAAG,IAAA,6BAAK,EACjB,qCAA8B,QAAQ,kBAAQ,IAAI,CAAE,EACpD,EAAE,EACF,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,CAAC;gBACF,uBAAuB;gBACvB,qBAAM,IAAA,6BAAK,EACT,+EACoC,IAAI,2EAGrB,EACnB,EAAE,EACF,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,EAAA;;gBATD,uBAAuB;gBACvB,SAQC,CAAC;gBACI,IAAI,GAAG,cAAM,OAAA,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,EAAzB,CAAyB,CAAC;gBAC7C,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAE/B,sBAAO;wBACL,IAAI,MAAA;qBACL,EAAC;;;KACH,CAAC;AAEF,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,sBAAsB,EACtB,gDAAgD,CACjD;iBACA,MAAM,CAAC,SAAe,SAAS;;;;;oCACH,qBAAM,IAAI,CAAC,MAAM,CAAC;oCAC3C,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE,gBAAgB;oCAEtB,OAAO,EAAE,qDAAqD;iCAC/D,CAAC,EAAA;;gCALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;qCAclB,CAAA,cAAc,KAAK,OAAO,CAAA,EAA1B,wBAA0B;gCACA,qBAAM,IAAI,CAAC,MAAM,CAAC;wCAC5C,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,iBAAiB;wCACvB,SAAO,EAAE,IAAI;wCAEb,OAAO,EAAE,4BAA4B;qCACtC,CAAC,EAAA;;gCANM,eAAe,GAAK,CAAA,SAM1B,CAAA,gBANqB;gCAOvB,UAAU,GAAG,eAAe,CAAC;;;gCAE7B,UAAU,GAAG,KAAK,CAAC;gCACL,qBAAM,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,EAAA;;gCAA3D,WAAW,GAAG,SAA6C,CAAC;;oCAGnC,qBAAM,IAAI,CAAC,MAAM,CAAC;oCAC3C,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
64
64
|
.action(function (_a) {
|
|
65
65
|
var envComponent = _a.envComponent;
|
|
66
66
|
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, instanceName, localPort, cloudsqlProxyCredentials;
|
|
67
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort, cloudsqlProxyCredentials;
|
|
68
68
|
var _this = this;
|
|
69
69
|
return __generator(this, function (_c) {
|
|
70
70
|
switch (_c.label) {
|
|
@@ -89,7 +89,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
89
89
|
return [3 /*break*/, 6];
|
|
90
90
|
case 5: throw new Error("unsupported environment");
|
|
91
91
|
case 6:
|
|
92
|
-
DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, instanceName = proxyInfo.instanceName;
|
|
92
|
+
DB_PASSWORD = proxyInfo.DB_PASSWORD, DB_NAME = proxyInfo.DB_NAME, DB_USER = proxyInfo.DB_USER, instanceName = proxyInfo.instanceName;
|
|
93
93
|
return [4 /*yield*/, this.prompt({
|
|
94
94
|
type: "number",
|
|
95
95
|
name: "localPort",
|
|
@@ -101,7 +101,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
101
101
|
this.log("");
|
|
102
102
|
this.log("postgres-PW: ".concat(DB_PASSWORD));
|
|
103
103
|
this.log("");
|
|
104
|
-
this.log("POSTGRESQL_URL=postgresql://
|
|
104
|
+
this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
105
105
|
this.log("");
|
|
106
106
|
return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
|
|
107
107
|
case 8:
|
|
@@ -168,13 +168,14 @@ var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, vo
|
|
|
168
168
|
return [2 /*return*/, {
|
|
169
169
|
instanceName: instanceName,
|
|
170
170
|
DB_PASSWORD: DB_PASSWORD,
|
|
171
|
-
DB_NAME: DB_NAME
|
|
171
|
+
DB_NAME: DB_NAME,
|
|
172
|
+
DB_USER: "postgres"
|
|
172
173
|
}];
|
|
173
174
|
}
|
|
174
175
|
});
|
|
175
176
|
}); };
|
|
176
177
|
var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
177
|
-
var envVars, DB_PASSWORD, DB_NAME;
|
|
178
|
+
var envVars, DB_PASSWORD, DB_USER, DB_NAME;
|
|
178
179
|
return __generator(this, function (_a) {
|
|
179
180
|
switch (_a.label) {
|
|
180
181
|
case 0:
|
|
@@ -186,11 +187,13 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
|
|
|
186
187
|
case 1:
|
|
187
188
|
envVars = _a.sent();
|
|
188
189
|
DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
|
|
190
|
+
DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
|
|
189
191
|
DB_NAME = context.environment.envVars.DB_NAME;
|
|
190
192
|
return [2 /*return*/, {
|
|
191
193
|
instanceName: context.componentConfig.deploy.cloudSql.instanceConnectionName,
|
|
192
194
|
DB_PASSWORD: DB_PASSWORD,
|
|
193
|
-
DB_NAME: DB_NAME
|
|
195
|
+
DB_NAME: DB_NAME,
|
|
196
|
+
DB_USER: DB_USER
|
|
194
197
|
}];
|
|
195
198
|
}
|
|
196
199
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,+DAA8C;AAC9C,qCAAqC;AACrC,2CAAuC;AAEvC,wEAK6C;AAC7C,2DAA2D;
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
|