@catladder/cli 0.0.0-main-1e915e24 → 0.0.0-main-675caed2

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.
@@ -37,25 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  };
38
38
  exports.__esModule = true;
39
39
  var child_process_promise_1 = require("child-process-promise");
40
- var createProxy = function (instance, port) { return __awaiter(void 0, void 0, void 0, function () {
41
- var proxy, stop;
42
- return __generator(this, function (_a) {
43
- switch (_a.label) {
44
- case 0:
45
- proxy = (0, child_process_promise_1.spawn)("cloud_sql_proxy -instances ".concat(instance, "=tcp:").concat(port), [], { shell: "bash" });
46
- // wait until it starts
47
- return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n until echo > /dev/tcp/localhost/".concat(port, "; do\n sleep 0.2\n echo -n \".\"\n done 2>/dev/null"), [], { shell: "bash" })];
48
- case 1:
49
- // wait until it starts
50
- _a.sent();
51
- stop = function () { return proxy.childProcess.kill(); };
52
- process.on("beforeExit", stop);
53
- return [2 /*return*/, {
54
- stop: stop
55
- }];
56
- }
57
- });
58
- }); };
40
+ var startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
59
41
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
60
42
  return __generator(this, function (_a) {
61
43
  return [2 /*return*/, vorpal
@@ -85,7 +67,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
85
67
  return [3 /*break*/, 5];
86
68
  case 3:
87
69
  sourcePort = 54399;
88
- return [4 /*yield*/, createProxy(sourceInstance, sourcePort)];
70
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
71
+ instanceName: sourceInstance,
72
+ localPort: sourcePort
73
+ })];
89
74
  case 4:
90
75
  sourceProxy = _a.sent();
91
76
  _a.label = 5;
@@ -114,7 +99,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
114
99
  return [4 /*yield*/, this.prompt({
115
100
  type: "input",
116
101
  name: "targetInstance",
117
- message: "Targe INSTANCE (connection string or 'local')? 🤔 "
102
+ message: "Target INSTANCE (connection string or 'local')? 🤔 "
118
103
  })];
119
104
  case 9:
120
105
  targetInstance = (_a.sent()).targetInstance;
@@ -131,7 +116,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
131
116
  return [3 /*break*/, 13];
132
117
  case 11:
133
118
  targetPort = 54499;
134
- return [4 /*yield*/, createProxy(targetInstance, targetPort)];
119
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
120
+ instanceName: targetInstance,
121
+ localPort: targetPort
122
+ })];
135
123
  case 12:
136
124
  targetProxy = _a.sent();
137
125
  _a.label = 13;
@@ -1 +1 @@
1
- {"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandRestoreDb.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/cloudSQL/commandRestoreDb.ts"],"names":[],"mappings":"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"}
@@ -37,9 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  };
38
38
  exports.__esModule = true;
39
39
  var pipeline_1 = require("@catladder/pipeline");
40
- var child_process_promise_1 = require("child-process-promise");
41
40
  var getProjectConfig_1 = require("../../../../config/getProjectConfig");
42
41
  var autocompletions_1 = require("./utils/autocompletions");
42
+ var startProxy_1 = require("../../../../gcloud/cloudSql/startProxy");
43
43
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
44
44
  var _a, _b;
45
45
  return __generator(this, function (_c) {
@@ -99,9 +99,9 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
99
99
  this.log("");
100
100
  this.log("DATABASE_JDBC_URL=jdbc:postgresql://localhost:".concat(localPort, "/").concat(DB_NAME, "?schema=public&user=").concat(DB_USER, "&password=").concat(DB_PASSWORD));
101
101
  this.log("");
102
- return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
103
- stdio: "inherit",
104
- shell: true
102
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
103
+ instanceName: instanceName,
104
+ localPort: localPort
105
105
  })];
106
106
  case 8:
107
107
  _c.sent();
@@ -1 +1 @@
1
- {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
@@ -40717,7 +40717,7 @@ exports.readConfigSync = readConfigSync;
40717
40717
 
40718
40718
  exports.__esModule = true;
40719
40719
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40720
- exports.PIPELINE_IMAGE_TAG = "main-1e915e24" || 0;
40720
+ exports.PIPELINE_IMAGE_TAG = "main-675caed2" || 0;
40721
40721
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40722
40722
 
40723
40723
  /***/ }),
@@ -134,25 +134,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
134
134
  };
135
135
  exports.__esModule = true;
136
136
  var child_process_promise_1 = __nccwpck_require__(75763);
137
- var createProxy = function (instance, port) { return __awaiter(void 0, void 0, void 0, function () {
138
- var proxy, stop;
139
- return __generator(this, function (_a) {
140
- switch (_a.label) {
141
- case 0:
142
- proxy = (0, child_process_promise_1.spawn)("cloud_sql_proxy -instances ".concat(instance, "=tcp:").concat(port), [], { shell: "bash" });
143
- // wait until it starts
144
- return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n until echo > /dev/tcp/localhost/".concat(port, "; do\n sleep 0.2\n echo -n \".\"\n done 2>/dev/null"), [], { shell: "bash" })];
145
- case 1:
146
- // wait until it starts
147
- _a.sent();
148
- stop = function () { return proxy.childProcess.kill(); };
149
- process.on("beforeExit", stop);
150
- return [2 /*return*/, {
151
- stop: stop
152
- }];
153
- }
154
- });
155
- }); };
137
+ var startProxy_1 = __nccwpck_require__(63069);
156
138
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
157
139
  return __generator(this, function (_a) {
158
140
  return [2 /*return*/, vorpal
@@ -182,7 +164,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
182
164
  return [3 /*break*/, 5];
183
165
  case 3:
184
166
  sourcePort = 54399;
185
- return [4 /*yield*/, createProxy(sourceInstance, sourcePort)];
167
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
168
+ instanceName: sourceInstance,
169
+ localPort: sourcePort
170
+ })];
186
171
  case 4:
187
172
  sourceProxy = _a.sent();
188
173
  _a.label = 5;
@@ -211,7 +196,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
211
196
  return [4 /*yield*/, this.prompt({
212
197
  type: "input",
213
198
  name: "targetInstance",
214
- message: "Targe INSTANCE (connection string or 'local')? 🤔 "
199
+ message: "Target INSTANCE (connection string or 'local')? 🤔 "
215
200
  })];
216
201
  case 9:
217
202
  targetInstance = (_a.sent()).targetInstance;
@@ -228,7 +213,10 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
228
213
  return [3 /*break*/, 13];
229
214
  case 11:
230
215
  targetPort = 54499;
231
- return [4 /*yield*/, createProxy(targetInstance, targetPort)];
216
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInBackground)({
217
+ instanceName: targetInstance,
218
+ localPort: targetPort
219
+ })];
232
220
  case 12:
233
221
  targetProxy = _a.sent();
234
222
  _a.label = 13;
@@ -1455,9 +1443,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
1455
1443
  };
1456
1444
  exports.__esModule = true;
1457
1445
  var pipeline_1 = __nccwpck_require__(25355);
1458
- var child_process_promise_1 = __nccwpck_require__(75763);
1459
1446
  var getProjectConfig_1 = __nccwpck_require__(24146);
1460
1447
  var autocompletions_1 = __nccwpck_require__(41373);
1448
+ var startProxy_1 = __nccwpck_require__(63069);
1461
1449
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
1462
1450
  var _a, _b;
1463
1451
  return __generator(this, function (_c) {
@@ -1517,9 +1505,9 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
1517
1505
  this.log("");
1518
1506
  this.log("DATABASE_JDBC_URL=jdbc:postgresql://localhost:".concat(localPort, "/").concat(DB_NAME, "?schema=public&user=").concat(DB_USER, "&password=").concat(DB_PASSWORD));
1519
1507
  this.log("");
1520
- return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
1521
- stdio: "inherit",
1522
- shell: true
1508
+ return [4 /*yield*/, (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
1509
+ instanceName: instanceName,
1510
+ localPort: localPort
1523
1511
  })];
1524
1512
  case 8:
1525
1513
  _c.sent();
@@ -6684,6 +6672,134 @@ exports.openGoogleCloudRunDashboard = openGoogleCloudRunDashboard;
6684
6672
 
6685
6673
  /***/ }),
6686
6674
 
6675
+ /***/ 63069:
6676
+ /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
6677
+
6678
+ "use strict";
6679
+
6680
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
6681
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
6682
+ return new (P || (P = Promise))(function (resolve, reject) {
6683
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6684
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6685
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
6686
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
6687
+ });
6688
+ };
6689
+ var __generator = (this && this.__generator) || function (thisArg, body) {
6690
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
6691
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
6692
+ function verb(n) { return function (v) { return step([n, v]); }; }
6693
+ function step(op) {
6694
+ if (f) throw new TypeError("Generator is already executing.");
6695
+ while (_) try {
6696
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
6697
+ if (y = 0, t) op = [op[0] & 2, t.value];
6698
+ switch (op[0]) {
6699
+ case 0: case 1: t = op; break;
6700
+ case 4: _.label++; return { value: op[1], done: false };
6701
+ case 5: _.label++; y = op[1]; op = [0]; continue;
6702
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
6703
+ default:
6704
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
6705
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
6706
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
6707
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
6708
+ if (t[2]) _.ops.pop();
6709
+ _.trys.pop(); continue;
6710
+ }
6711
+ op = body.call(thisArg, _);
6712
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
6713
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
6714
+ }
6715
+ };
6716
+ var __importDefault = (this && this.__importDefault) || function (mod) {
6717
+ return (mod && mod.__esModule) ? mod : { "default": mod };
6718
+ };
6719
+ exports.__esModule = true;
6720
+ exports.startCloudSqlProxyInBackground = exports.startCloudSqlProxyInCurrentShell = exports.ERROR_NOT_INSTALLED = void 0;
6721
+ var child_process_promise_1 = __nccwpck_require__(75763);
6722
+ var command_exists_promise_1 = __importDefault(__nccwpck_require__(80133));
6723
+ exports.ERROR_NOT_INSTALLED = "cloud-sql-proxy not installed";
6724
+ var getProxyCommandSpawnArgs = function (_a) {
6725
+ var localPort = _a.localPort, instanceName = _a.instanceName;
6726
+ return __awaiter(void 0, void 0, void 0, function () {
6727
+ var commandString, _b, _c, cmd, args;
6728
+ return __generator(this, function (_d) {
6729
+ switch (_d.label) {
6730
+ case 0: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud-sql-proxy")];
6731
+ case 1:
6732
+ if (!(_d.sent())) return [3 /*break*/, 2];
6733
+ _b = "cloud-sql-proxy --port ".concat(localPort, " ").concat(instanceName);
6734
+ return [3 /*break*/, 4];
6735
+ case 2: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud_sql_proxy" // v1
6736
+ )];
6737
+ case 3:
6738
+ _b = (_d.sent())
6739
+ ? "cloud_sql_proxy -instances ".concat(instanceName, "=tcp:").concat(localPort)
6740
+ : null;
6741
+ _d.label = 4;
6742
+ case 4:
6743
+ commandString = _b;
6744
+ if (!commandString) {
6745
+ throw new Error(exports.ERROR_NOT_INSTALLED);
6746
+ }
6747
+ _c = commandString.split(" "), cmd = _c[0], args = _c.slice(1);
6748
+ return [2 /*return*/, { cmd: cmd, args: args }];
6749
+ }
6750
+ });
6751
+ });
6752
+ };
6753
+ var startCloudSqlProxyInCurrentShell = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
6754
+ var _a, cmd, args;
6755
+ return __generator(this, function (_b) {
6756
+ switch (_b.label) {
6757
+ case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
6758
+ case 1:
6759
+ _a = _b.sent(), cmd = _a.cmd, args = _a.args;
6760
+ return [4 /*yield*/, (0, child_process_promise_1.spawn)(cmd, args, {
6761
+ stdio: "inherit",
6762
+ shell: true
6763
+ })];
6764
+ case 2:
6765
+ _b.sent();
6766
+ return [2 /*return*/];
6767
+ }
6768
+ });
6769
+ }); };
6770
+ exports.startCloudSqlProxyInCurrentShell = startCloudSqlProxyInCurrentShell;
6771
+ var startCloudSqlProxyInBackground = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
6772
+ var _a, cmd, args, proxyPromise, stop;
6773
+ return __generator(this, function (_b) {
6774
+ switch (_b.label) {
6775
+ case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
6776
+ case 1:
6777
+ _a = _b.sent(), cmd = _a.cmd, args = _a.args;
6778
+ proxyPromise = (0, child_process_promise_1.spawn)(cmd, args, { shell: "bash" });
6779
+ // wait until it starts
6780
+ return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n until echo > /dev/tcp/localhost/".concat(opts.localPort, "; do\n sleep 0.2\n echo -n \".\"\n done 2>/dev/null"), [], { shell: "bash" })];
6781
+ case 2:
6782
+ // wait until it starts
6783
+ _b.sent();
6784
+ stop = function () {
6785
+ proxyPromise["catch"](function () {
6786
+ // ignore
6787
+ });
6788
+ proxyPromise.childProcess.kill();
6789
+ };
6790
+ // stop if catladder i stopped
6791
+ process.on("beforeExit", stop);
6792
+ return [2 /*return*/, {
6793
+ stop: stop
6794
+ }];
6795
+ }
6796
+ });
6797
+ }); };
6798
+ exports.startCloudSqlProxyInBackground = startCloudSqlProxyInBackground;
6799
+ //# sourceMappingURL=startProxy.js.map
6800
+
6801
+ /***/ }),
6802
+
6687
6803
  /***/ 4895:
6688
6804
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
6689
6805
 
@@ -351669,7 +351785,7 @@ exports.readConfigSync = readConfigSync;
351669
351785
 
351670
351786
  exports.__esModule = true;
351671
351787
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351672
- exports.PIPELINE_IMAGE_TAG = "main-1e915e24" || 0;
351788
+ exports.PIPELINE_IMAGE_TAG = "main-675caed2" || 0;
351673
351789
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351674
351790
 
351675
351791
  /***/ }),
@@ -0,0 +1,10 @@
1
+ export declare const ERROR_NOT_INSTALLED = "cloud-sql-proxy not installed";
2
+ export declare type CloudSqlBackgroundProxy = {
3
+ stop: () => void;
4
+ };
5
+ export declare type CloudSqlProxyOptions = {
6
+ instanceName: string;
7
+ localPort: number;
8
+ };
9
+ export declare const startCloudSqlProxyInCurrentShell: (opts: CloudSqlProxyOptions) => Promise<void>;
10
+ export declare const startCloudSqlProxyInBackground: (opts: CloudSqlProxyOptions) => Promise<CloudSqlBackgroundProxy>;
@@ -0,0 +1,121 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (_) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
38
+ var __importDefault = (this && this.__importDefault) || function (mod) {
39
+ return (mod && mod.__esModule) ? mod : { "default": mod };
40
+ };
41
+ exports.__esModule = true;
42
+ exports.startCloudSqlProxyInBackground = exports.startCloudSqlProxyInCurrentShell = exports.ERROR_NOT_INSTALLED = void 0;
43
+ var child_process_promise_1 = require("child-process-promise");
44
+ var command_exists_promise_1 = __importDefault(require("command-exists-promise"));
45
+ exports.ERROR_NOT_INSTALLED = "cloud-sql-proxy not installed";
46
+ var getProxyCommandSpawnArgs = function (_a) {
47
+ var localPort = _a.localPort, instanceName = _a.instanceName;
48
+ return __awaiter(void 0, void 0, void 0, function () {
49
+ var commandString, _b, _c, cmd, args;
50
+ return __generator(this, function (_d) {
51
+ switch (_d.label) {
52
+ case 0: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud-sql-proxy")];
53
+ case 1:
54
+ if (!(_d.sent())) return [3 /*break*/, 2];
55
+ _b = "cloud-sql-proxy --port ".concat(localPort, " ").concat(instanceName);
56
+ return [3 /*break*/, 4];
57
+ case 2: return [4 /*yield*/, (0, command_exists_promise_1["default"])("cloud_sql_proxy" // v1
58
+ )];
59
+ case 3:
60
+ _b = (_d.sent())
61
+ ? "cloud_sql_proxy -instances ".concat(instanceName, "=tcp:").concat(localPort)
62
+ : null;
63
+ _d.label = 4;
64
+ case 4:
65
+ commandString = _b;
66
+ if (!commandString) {
67
+ throw new Error(exports.ERROR_NOT_INSTALLED);
68
+ }
69
+ _c = commandString.split(" "), cmd = _c[0], args = _c.slice(1);
70
+ return [2 /*return*/, { cmd: cmd, args: args }];
71
+ }
72
+ });
73
+ });
74
+ };
75
+ var startCloudSqlProxyInCurrentShell = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
76
+ var _a, cmd, args;
77
+ return __generator(this, function (_b) {
78
+ switch (_b.label) {
79
+ case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
80
+ case 1:
81
+ _a = _b.sent(), cmd = _a.cmd, args = _a.args;
82
+ return [4 /*yield*/, (0, child_process_promise_1.spawn)(cmd, args, {
83
+ stdio: "inherit",
84
+ shell: true
85
+ })];
86
+ case 2:
87
+ _b.sent();
88
+ return [2 /*return*/];
89
+ }
90
+ });
91
+ }); };
92
+ exports.startCloudSqlProxyInCurrentShell = startCloudSqlProxyInCurrentShell;
93
+ var startCloudSqlProxyInBackground = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
94
+ var _a, cmd, args, proxyPromise, stop;
95
+ return __generator(this, function (_b) {
96
+ switch (_b.label) {
97
+ case 0: return [4 /*yield*/, getProxyCommandSpawnArgs(opts)];
98
+ case 1:
99
+ _a = _b.sent(), cmd = _a.cmd, args = _a.args;
100
+ proxyPromise = (0, child_process_promise_1.spawn)(cmd, args, { shell: "bash" });
101
+ // wait until it starts
102
+ return [4 /*yield*/, (0, child_process_promise_1.spawn)("echo -n \"Waiting for proxy\"\n until echo > /dev/tcp/localhost/".concat(opts.localPort, "; do\n sleep 0.2\n echo -n \".\"\n done 2>/dev/null"), [], { shell: "bash" })];
103
+ case 2:
104
+ // wait until it starts
105
+ _b.sent();
106
+ stop = function () {
107
+ proxyPromise["catch"](function () {
108
+ // ignore
109
+ });
110
+ proxyPromise.childProcess.kill();
111
+ };
112
+ // stop if catladder i stopped
113
+ process.on("beforeExit", stop);
114
+ return [2 /*return*/, {
115
+ stop: stop
116
+ }];
117
+ }
118
+ });
119
+ }); };
120
+ exports.startCloudSqlProxyInBackground = startCloudSqlProxyInBackground;
121
+ //# sourceMappingURL=startProxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"startProxy.js","sourceRoot":"","sources":["../../../src/gcloud/cloudSql/startProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA8C;AAC9C,kFAAmD;AAEtC,QAAA,mBAAmB,GAAG,+BAA+B,CAAC;AAWnE,IAAM,wBAAwB,GAAG,UAAO,EAGjB;QAFrB,SAAS,eAAA,EACT,YAAY,kBAAA;;;;;wBAEW,qBAAM,IAAA,mCAAa,EAAC,iBAAiB,CAAC,EAAA;;yBAAvC,CAAC,SAAsC,CAAC,EAAxC,wBAAwC;oBAC1D,KAAA,iCAA0B,SAAS,cAAI,YAAY,CAAE,CAAA;;wBACpD,qBAAM,IAAA,mCAAa,EAClB,iBAAiB,CAAC,KAAK;qBACxB,EAAA;;oBAFD,KAAA,CAAC,SAEA,CAAC;wBACJ,CAAC,CAAC,qCAA8B,YAAY,kBAAQ,SAAS,CAAE;wBAC/D,CAAC,CAAC,IAAI,CAAA;;;oBANF,aAAa,KAMX;oBACR,IAAI,CAAC,aAAa,EAAE;wBAClB,MAAM,IAAI,KAAK,CAAC,2BAAmB,CAAC,CAAC;qBACtC;oBAEK,KAAiB,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAAxC,GAAG,QAAA,EAAK,IAAI,cAAA,CAA6B;oBAChD,sBAAO,EAAE,GAAG,KAAA,EAAE,IAAI,MAAA,EAAE,EAAC;;;;CACtB,CAAC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,IAA0B;;;;oBAEJ,qBAAM,wBAAwB,CAAC,IAAI,CAAC,EAAA;;gBAApD,KAAgB,SAAoC,EAAlD,GAAG,SAAA,EAAE,IAAI,UAAA;gBAEjB,qBAAM,IAAA,6BAAK,EAAC,GAAG,EAAE,IAAI,EAAE;wBACrB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAHF,SAGE,CAAC;;;;KACJ,CAAC;AATW,QAAA,gCAAgC,oCAS3C;AAEK,IAAM,8BAA8B,GAAG,UAC5C,IAA0B;;;;oBAEJ,qBAAM,wBAAwB,CAAC,IAAI,CAAC,EAAA;;gBAApD,KAAgB,SAAoC,EAAlD,GAAG,SAAA,EAAE,IAAI,UAAA;gBAEX,YAAY,GAAG,IAAA,6BAAK,EAAC,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEzD,uBAAuB;gBACvB,qBAAM,IAAA,6BAAK,EACT,+EACoC,IAAI,CAAC,SAAS,2EAG/B,EACnB,EAAE,EACF,EAAE,KAAK,EAAE,MAAM,EAAE,CAClB,EAAA;;gBATD,uBAAuB;gBACvB,SAQC,CAAC;gBACI,IAAI,GAAG;oBACX,YAAY,CAAC,OAAK,CAAA,CAAC;wBACjB,SAAS;oBACX,CAAC,CAAC,CAAC;oBACH,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;gBACnC,CAAC,CAAC;gBACF,8BAA8B;gBAC9B,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAE/B,sBAAO;wBACL,IAAI,MAAA;qBACL,EAAC;;;KACH,CAAC;AA7BW,QAAA,8BAA8B,kCA6BzC"}