@catladder/cli 1.90.0 → 1.91.1
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 +17 -61
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/setupContext.js +3 -10
- package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +12 -42
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -5
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts +0 -3
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js +0 -56
- package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map +0 -1
- package/src/apps/cli/commands/project/setup/setupCloudSQL.ts +0 -22
|
@@ -35,20 +35,10 @@ 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");
|
|
40
|
+
var pipeline_2 = require("@catladder/pipeline");
|
|
49
41
|
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
42
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
53
43
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
54
44
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -64,8 +54,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
64
54
|
.action(function (_a) {
|
|
65
55
|
var envComponent = _a.envComponent;
|
|
66
56
|
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;
|
|
57
|
+
var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
|
|
69
58
|
return __generator(this, function (_c) {
|
|
70
59
|
switch (_c.label) {
|
|
71
60
|
case 0:
|
|
@@ -76,13 +65,13 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
76
65
|
if (env === "review") {
|
|
77
66
|
vorpal.log("⚠️ connection string does not include mr information on review environments");
|
|
78
67
|
}
|
|
79
|
-
if (!(0,
|
|
68
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
|
|
80
69
|
return [4 /*yield*/, getProxyInfoForKubernetes(context)];
|
|
81
70
|
case 2:
|
|
82
71
|
proxyInfo = _c.sent();
|
|
83
72
|
return [3 /*break*/, 6];
|
|
84
73
|
case 3:
|
|
85
|
-
if (!(0,
|
|
74
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
|
|
86
75
|
return [4 /*yield*/, getProxyInfoForCloudRun(context)];
|
|
87
76
|
case 4:
|
|
88
77
|
proxyInfo = _c.sent();
|
|
@@ -103,37 +92,11 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
103
92
|
this.log("");
|
|
104
93
|
this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
|
|
105
94
|
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
|
-
});
|
|
95
|
+
return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
|
|
96
|
+
stdio: "inherit",
|
|
97
|
+
shell: true
|
|
135
98
|
})];
|
|
136
|
-
case
|
|
99
|
+
case 8:
|
|
137
100
|
_c.sent();
|
|
138
101
|
return [2 /*return*/];
|
|
139
102
|
}
|
|
@@ -144,27 +107,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
144
107
|
});
|
|
145
108
|
}); });
|
|
146
109
|
var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
147
|
-
var envVars, DB_PASSWORD, DB_NAME,
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
switch (_e.label) {
|
|
110
|
+
var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
|
|
111
|
+
return __generator(this, function (_a) {
|
|
112
|
+
switch (_a.label) {
|
|
151
113
|
case 0:
|
|
152
|
-
if (!(0,
|
|
114
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
153
115
|
throw new Error("unsupported");
|
|
154
116
|
}
|
|
155
117
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
|
|
156
118
|
case 1:
|
|
157
|
-
envVars =
|
|
119
|
+
envVars = _a.sent();
|
|
120
|
+
cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
|
|
158
121
|
DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
|
|
159
|
-
DB_NAME =
|
|
160
|
-
|
|
161
|
-
projectId = ((_a = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _a === void 0 ? void 0 : _a.projectId) ||
|
|
162
|
-
((_b = context.componentConfig.deploy.cluster) === null || _b === void 0 ? void 0 : _b.projectId);
|
|
163
|
-
defaultInstanceId = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "-").concat(context.environment.shortName);
|
|
164
|
-
instanceId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.instanceId) || defaultInstanceId;
|
|
165
|
-
defaultRegion = "europe-west6";
|
|
166
|
-
region = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.region) || defaultRegion;
|
|
167
|
-
instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId);
|
|
122
|
+
DB_NAME = cloudSqlValues.cloudsql.fullDbName;
|
|
123
|
+
instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
|
|
168
124
|
return [2 /*return*/, {
|
|
169
125
|
instanceName: instanceName,
|
|
170
126
|
DB_PASSWORD: DB_PASSWORD,
|
|
@@ -179,7 +135,7 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
|
|
|
179
135
|
return __generator(this, function (_a) {
|
|
180
136
|
switch (_a.label) {
|
|
181
137
|
case 0:
|
|
182
|
-
if (!(0,
|
|
138
|
+
if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
|
|
183
139
|
!context.componentConfig.deploy.cloudSql) {
|
|
184
140
|
throw new Error("unsupported");
|
|
185
141
|
}
|
|
@@ -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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"}
|
|
@@ -39,7 +39,6 @@ exports.__esModule = true;
|
|
|
39
39
|
exports.setupContext = void 0;
|
|
40
40
|
var pipeline_1 = require("@catladder/pipeline");
|
|
41
41
|
var setupCloudRun_1 = require("./setupCloudRun");
|
|
42
|
-
var setupCloudSQL_1 = require("./setupCloudSQL");
|
|
43
42
|
var setupKubernetes_1 = require("./setupKubernetes");
|
|
44
43
|
var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
44
|
var deployConfig;
|
|
@@ -60,19 +59,13 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
|
|
|
60
59
|
_a.sent();
|
|
61
60
|
_a.label = 2;
|
|
62
61
|
case 2:
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
deployConfig = context.componentConfig.deploy;
|
|
63
|
+
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
|
|
64
|
+
return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
|
|
65
65
|
case 3:
|
|
66
66
|
_a.sent();
|
|
67
67
|
_a.label = 4;
|
|
68
68
|
case 4:
|
|
69
|
-
deployConfig = context.componentConfig.deploy;
|
|
70
|
-
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
|
|
71
|
-
return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
|
|
72
|
-
case 5:
|
|
73
|
-
_a.sent();
|
|
74
|
-
_a.label = 6;
|
|
75
|
-
case 6:
|
|
76
69
|
instance.log("");
|
|
77
70
|
instance.log("✅ " +
|
|
78
71
|
context.environment.shortName +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
|