@catladder/cli 0.0.0-main-c6987376 → 0.0.0-main-94f33118
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 +60 -22
- package/dist/bundles/cli/index.js +80 -156
- 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"}
|
|
@@ -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 = "main-
|
|
40110
|
+
exports.PIPELINE_IMAGE_TAG = "main-94f33118" || 0;
|
|
40111
40111
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
40112
40112
|
|
|
40113
40113
|
/***/ }),
|
|
@@ -41545,20 +41545,21 @@ exports.__esModule = true;
|
|
|
41545
41545
|
exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
|
|
41546
41546
|
var context_1 = __nccwpck_require__(2041);
|
|
41547
41547
|
var gitlab_1 = __nccwpck_require__(4997);
|
|
41548
|
+
var utils_1 = __nccwpck_require__(463);
|
|
41548
41549
|
var deployJob_1 = __nccwpck_require__(2256);
|
|
41549
41550
|
var jobName_1 = __nccwpck_require__(7311);
|
|
41550
41551
|
exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
|
|
41551
41552
|
exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
|
|
41552
41553
|
var getCloudSqlVariables = function (_a) {
|
|
41553
|
-
var _b, _c
|
|
41554
|
+
var _b, _c;
|
|
41554
41555
|
var deployConfigRaw = _a.deployConfigRaw,
|
|
41555
41556
|
environmentSlugPrefix = _a.environmentSlugPrefix,
|
|
41556
41557
|
env = _a.env,
|
|
41557
41558
|
componentName = _a.componentName,
|
|
41558
41559
|
fullConfig = _a.fullConfig;
|
|
41559
41560
|
if (deployConfigRaw && deployConfigRaw.cloudSql) {
|
|
41560
|
-
var DB_NAME =
|
|
41561
|
-
var additionalQueryParamsString = Object.entries((
|
|
41561
|
+
var DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
|
|
41562
|
+
var additionalQueryParamsString = Object.entries((_b = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
|
|
41562
41563
|
var _b = __read(_a, 2),
|
|
41563
41564
|
key = _b[0],
|
|
41564
41565
|
value = _b[1];
|
|
@@ -41567,7 +41568,7 @@ var getCloudSqlVariables = function (_a) {
|
|
|
41567
41568
|
return {
|
|
41568
41569
|
CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
|
|
41569
41570
|
DB_NAME: DB_NAME,
|
|
41570
|
-
DB_USER: (
|
|
41571
|
+
DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
|
|
41571
41572
|
DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
|
|
41572
41573
|
DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
|
|
41573
41574
|
DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)
|
|
@@ -41786,6 +41787,22 @@ exports.getCloudRunJobName = getCloudRunJobName;
|
|
|
41786
41787
|
|
|
41787
41788
|
/***/ }),
|
|
41788
41789
|
|
|
41790
|
+
/***/ 463:
|
|
41791
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
41792
|
+
|
|
41793
|
+
"use strict";
|
|
41794
|
+
|
|
41795
|
+
|
|
41796
|
+
exports.__esModule = true;
|
|
41797
|
+
exports.getFullDbName = void 0;
|
|
41798
|
+
var getFullDbName = function (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) {
|
|
41799
|
+
var _a, _b;
|
|
41800
|
+
return [(_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlugPrefix, (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName].filter(Boolean).join("-");
|
|
41801
|
+
};
|
|
41802
|
+
exports.getFullDbName = getFullDbName;
|
|
41803
|
+
|
|
41804
|
+
/***/ }),
|
|
41805
|
+
|
|
41789
41806
|
/***/ 6531:
|
|
41790
41807
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
41791
41808
|
|
|
@@ -42016,8 +42033,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
|
|
|
42016
42033
|
|
|
42017
42034
|
|
|
42018
42035
|
exports.__esModule = true;
|
|
42019
|
-
exports.
|
|
42036
|
+
exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
|
|
42020
42037
|
var context_1 = __nccwpck_require__(2041);
|
|
42038
|
+
var utils_1 = __nccwpck_require__(463);
|
|
42021
42039
|
var types_1 = __nccwpck_require__(3109);
|
|
42022
42040
|
var hasKubernetesCloudSQL = function (context) {
|
|
42023
42041
|
var _a, _b;
|
|
@@ -42027,22 +42045,42 @@ var hasKubernetesCloudSQL = function (context) {
|
|
|
42027
42045
|
return false;
|
|
42028
42046
|
};
|
|
42029
42047
|
exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
|
|
42030
|
-
var
|
|
42031
|
-
var _a;
|
|
42032
|
-
if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
42033
|
-
|
|
42048
|
+
var createKubernetesCloudsqlBaseValues = function (context) {
|
|
42049
|
+
var _a, _b, _c, _d, _e;
|
|
42050
|
+
if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
42051
|
+
throw new Error("cannot get cloud sql config");
|
|
42052
|
+
}
|
|
42053
|
+
var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
|
|
42054
|
+
if (!config) {
|
|
42055
|
+
throw new Error("cannot get cloud sql config");
|
|
42056
|
+
}
|
|
42057
|
+
var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
|
|
42058
|
+
if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
|
|
42059
|
+
var instanceConnectionName = "".concat((_b = config.projectId) !== null && _b !== void 0 ? _b : "skynet-164509", ":").concat((_c = config.region) !== null && _c !== void 0 ? _c : "europe-west6", ":").concat((_d = config.instanceId) !== null && _d !== void 0 ? _d : context.environment.envVars.KUBE_NAMESPACE);
|
|
42060
|
+
return {
|
|
42061
|
+
cloudsql: {
|
|
42062
|
+
enabled: config.enabled,
|
|
42063
|
+
dbUser: "postgres",
|
|
42064
|
+
instanceConnectionName: instanceConnectionName,
|
|
42065
|
+
proxyCredentials: proxyCredentials,
|
|
42066
|
+
fullDbName: context.environment.envVars.KUBE_APP_NAME
|
|
42067
|
+
}
|
|
42068
|
+
};
|
|
42069
|
+
} else if (config.type === "unmanaged") {
|
|
42070
|
+
return {
|
|
42071
|
+
cloudsql: {
|
|
42072
|
+
enabled: config.enabled,
|
|
42073
|
+
dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
|
|
42074
|
+
instanceConnectionName: config.instanceConnectionName,
|
|
42075
|
+
proxyCredentials: proxyCredentials,
|
|
42076
|
+
fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
|
|
42077
|
+
}
|
|
42078
|
+
};
|
|
42079
|
+
} else {
|
|
42080
|
+
throw new Error("unknonw type");
|
|
42034
42081
|
}
|
|
42035
|
-
throw new Error("cannot get cloud sql config");
|
|
42036
|
-
};
|
|
42037
|
-
exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
|
|
42038
|
-
var createCloudsqlBaseConfig = function (context) {
|
|
42039
|
-
return {
|
|
42040
|
-
cloudsql: {
|
|
42041
|
-
proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
|
|
42042
|
-
}
|
|
42043
|
-
};
|
|
42044
42082
|
};
|
|
42045
|
-
exports.
|
|
42083
|
+
exports.createKubernetesCloudsqlBaseValues = createKubernetesCloudsqlBaseValues;
|
|
42046
42084
|
|
|
42047
42085
|
/***/ }),
|
|
42048
42086
|
|
|
@@ -42425,7 +42463,7 @@ var createKubeValues = function (context) {
|
|
|
42425
42463
|
var defaultKubeValues = (0, lodash_1.merge)({
|
|
42426
42464
|
env: env,
|
|
42427
42465
|
application: createAppConfig(context, application)
|
|
42428
|
-
}, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.
|
|
42466
|
+
}, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
|
|
42429
42467
|
var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
|
|
42430
42468
|
jobs: removeFalsy(jobs),
|
|
42431
42469
|
cronjobs: removeFalsy(cronjobs)
|
|
@@ -44582,7 +44620,7 @@ var sanitizeForBashVariable = function (name) {
|
|
|
44582
44620
|
};
|
|
44583
44621
|
exports.sanitizeForBashVariable = sanitizeForBashVariable;
|
|
44584
44622
|
var repeatOnFailure = function (command, options) {
|
|
44585
|
-
return "\n until ".concat(command, "
|
|
44623
|
+
return "\n until ".concat(command, "\n do\n echo \"Trying again.\"\n sleep ").concat(options.pauseInSeconds, "\n done\n ");
|
|
44586
44624
|
};
|
|
44587
44625
|
exports.repeatOnFailure = repeatOnFailure;
|
|
44588
44626
|
|