@catladder/cli 0.0.0-fix-error-sql-db-delete-a719775a → 0.0.0-fix-error-sql-db-delete-b3878c2e
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/project/commandCloudSqlProxy.js +5 -43
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +6 -44
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +7 -28
|
@@ -35,20 +35,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
-
if (ar || !(i in from)) {
|
|
41
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
-
ar[i] = from[i];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
46
|
-
};
|
|
47
38
|
exports.__esModule = true;
|
|
48
39
|
var pipeline_1 = require("@catladder/pipeline");
|
|
49
40
|
var child_process_promise_1 = require("child-process-promise");
|
|
50
|
-
var fs_extra_1 = require("fs-extra");
|
|
51
|
-
var tmp_promise_1 = require("tmp-promise");
|
|
52
41
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
53
42
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
54
43
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -64,8 +53,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
64
53
|
.action(function (_a) {
|
|
65
54
|
var envComponent = _a.envComponent;
|
|
66
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort
|
|
68
|
-
var _this = this;
|
|
56
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
|
|
69
57
|
return __generator(this, function (_c) {
|
|
70
58
|
switch (_c.label) {
|
|
71
59
|
case 0:
|
|
@@ -103,37 +91,11 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
103
91
|
this.log("");
|
|
104
92
|
this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
105
93
|
this.log("");
|
|
106
|
-
return [4 /*yield*/, (0,
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
|
|
110
|
-
var tmpFilePath = _a.path;
|
|
111
|
-
return __awaiter(_this, void 0, void 0, function () {
|
|
112
|
-
return __generator(this, function (_b) {
|
|
113
|
-
switch (_b.label) {
|
|
114
|
-
case 0:
|
|
115
|
-
if (!cloudsqlProxyCredentials) return [3 /*break*/, 2];
|
|
116
|
-
return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
|
|
117
|
-
case 1:
|
|
118
|
-
_b.sent();
|
|
119
|
-
_b.label = 2;
|
|
120
|
-
case 2: return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", __spreadArray([
|
|
121
|
-
"-instances",
|
|
122
|
-
"".concat(instanceName, "=tcp:").concat(localPort)
|
|
123
|
-
], (cloudsqlProxyCredentials
|
|
124
|
-
? ["-credential_file", tmpFilePath]
|
|
125
|
-
: []), true), {
|
|
126
|
-
stdio: "inherit",
|
|
127
|
-
shell: true
|
|
128
|
-
})];
|
|
129
|
-
case 3:
|
|
130
|
-
_b.sent();
|
|
131
|
-
return [2 /*return*/];
|
|
132
|
-
}
|
|
133
|
-
});
|
|
134
|
-
});
|
|
94
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
|
|
95
|
+
stdio: "inherit",
|
|
96
|
+
shell: true
|
|
135
97
|
})];
|
|
136
|
-
case
|
|
98
|
+
case 8:
|
|
137
99
|
_c.sent();
|
|
138
100
|
return [2 /*return*/];
|
|
139
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -40107,7 +40107,7 @@ exports.readConfigSync = readConfigSync;
|
|
|
40107
40107
|
|
|
40108
40108
|
exports.__esModule = true;
|
|
40109
40109
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
40110
|
-
exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-
|
|
40110
|
+
exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-b3878c2e" || 0;
|
|
40111
40111
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
40112
40112
|
|
|
40113
40113
|
/***/ }),
|
|
@@ -1453,20 +1453,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
1453
1453
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
1454
1454
|
}
|
|
1455
1455
|
};
|
|
1456
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
1457
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
1458
|
-
if (ar || !(i in from)) {
|
|
1459
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
1460
|
-
ar[i] = from[i];
|
|
1461
|
-
}
|
|
1462
|
-
}
|
|
1463
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
1464
|
-
};
|
|
1465
1456
|
exports.__esModule = true;
|
|
1466
1457
|
var pipeline_1 = __nccwpck_require__(25355);
|
|
1467
1458
|
var child_process_promise_1 = __nccwpck_require__(75763);
|
|
1468
|
-
var fs_extra_1 = __nccwpck_require__(85501);
|
|
1469
|
-
var tmp_promise_1 = __nccwpck_require__(68841);
|
|
1470
1459
|
var getProjectConfig_1 = __nccwpck_require__(24146);
|
|
1471
1460
|
var autocompletions_1 = __nccwpck_require__(41373);
|
|
1472
1461
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -1482,8 +1471,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
1482
1471
|
.action(function (_a) {
|
|
1483
1472
|
var envComponent = _a.envComponent;
|
|
1484
1473
|
return __awaiter(this, void 0, void 0, function () {
|
|
1485
|
-
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort
|
|
1486
|
-
var _this = this;
|
|
1474
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
|
|
1487
1475
|
return __generator(this, function (_c) {
|
|
1488
1476
|
switch (_c.label) {
|
|
1489
1477
|
case 0:
|
|
@@ -1521,37 +1509,11 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
1521
1509
|
this.log("");
|
|
1522
1510
|
this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
1523
1511
|
this.log("");
|
|
1524
|
-
return [4 /*yield*/, (0,
|
|
1525
|
-
|
|
1526
|
-
|
|
1527
|
-
return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
|
|
1528
|
-
var tmpFilePath = _a.path;
|
|
1529
|
-
return __awaiter(_this, void 0, void 0, function () {
|
|
1530
|
-
return __generator(this, function (_b) {
|
|
1531
|
-
switch (_b.label) {
|
|
1532
|
-
case 0:
|
|
1533
|
-
if (!cloudsqlProxyCredentials) return [3 /*break*/, 2];
|
|
1534
|
-
return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
|
|
1535
|
-
case 1:
|
|
1536
|
-
_b.sent();
|
|
1537
|
-
_b.label = 2;
|
|
1538
|
-
case 2: return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", __spreadArray([
|
|
1539
|
-
"-instances",
|
|
1540
|
-
"".concat(instanceName, "=tcp:").concat(localPort)
|
|
1541
|
-
], (cloudsqlProxyCredentials
|
|
1542
|
-
? ["-credential_file", tmpFilePath]
|
|
1543
|
-
: []), true), {
|
|
1544
|
-
stdio: "inherit",
|
|
1545
|
-
shell: true
|
|
1546
|
-
})];
|
|
1547
|
-
case 3:
|
|
1548
|
-
_b.sent();
|
|
1549
|
-
return [2 /*return*/];
|
|
1550
|
-
}
|
|
1551
|
-
});
|
|
1552
|
-
});
|
|
1512
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
|
|
1513
|
+
stdio: "inherit",
|
|
1514
|
+
shell: true
|
|
1553
1515
|
})];
|
|
1554
|
-
case
|
|
1516
|
+
case 8:
|
|
1555
1517
|
_c.sent();
|
|
1556
1518
|
return [2 /*return*/];
|
|
1557
1519
|
}
|
|
@@ -351506,7 +351468,7 @@ exports.readConfigSync = readConfigSync;
|
|
|
351506
351468
|
|
|
351507
351469
|
exports.__esModule = true;
|
|
351508
351470
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
351509
|
-
exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-
|
|
351471
|
+
exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-b3878c2e" || 0;
|
|
351510
351472
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
351511
351473
|
|
|
351512
351474
|
/***/ }),
|