@catladder/cli 0.0.0-fix-migrate-string-cmd-508a469f → 0.0.0-fix-values-as-files-73f39da5
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/README.md +2 -1
- package/dist/apps/cli/commands/general/index.js +17 -9
- package/dist/apps/cli/commands/general/index.js.map +1 -1
- package/dist/apps/cli/commands/general/portForward.js +5 -6
- package/dist/apps/cli/commands/general/portForward.js.map +1 -1
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js +27 -19
- package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/apps/cli/commands/project/commandConfigSecrets.d.ts +2 -1
- package/dist/apps/cli/commands/project/commandConfigSecrets.js +175 -110
- package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/apps/cli/commands/project/commandDeletePods.js +4 -3
- package/dist/apps/cli/commands/project/commandDeletePods.js.map +1 -1
- package/dist/apps/cli/commands/project/{commandInitGitlab.d.ts → commandInitProject.old.d.ts} +0 -0
- package/dist/apps/cli/commands/project/{commandInitProject.js → commandInitProject.old.js} +1 -1
- package/dist/apps/cli/commands/project/commandInitProject.old.js.map +1 -0
- package/dist/apps/cli/commands/project/{commandInitProject.d.ts → commandSetup.d.ts} +0 -0
- package/dist/apps/cli/commands/project/{commandReloadConfig.js → commandSetup.js} +4 -8
- package/dist/apps/cli/commands/project/commandSetup.js.map +1 -0
- package/dist/apps/cli/commands/project/commandTriggerCronjob.js +2 -2
- package/dist/apps/cli/commands/project/commandTriggerCronjob.js.map +1 -1
- package/dist/apps/cli/commands/project/index.js +3 -6
- package/dist/apps/cli/commands/project/index.js.map +1 -1
- package/dist/apps/cli/commands/project/setup/index.d.ts +2 -0
- package/dist/apps/cli/commands/project/setup/index.js +103 -0
- package/dist/apps/cli/commands/project/setup/index.js.map +1 -0
- package/dist/apps/cli/commands/project/setup/setupAccessTokens.d.ts +2 -0
- package/dist/apps/cli/commands/project/setup/setupAccessTokens.js +115 -0
- package/dist/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -0
- package/dist/apps/cli/commands/project/setup/setupContext.d.ts +3 -0
- package/dist/apps/cli/commands/project/setup/setupContext.js +74 -0
- package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -0
- package/dist/apps/cli/commands/project/setup/setupKubernetes.d.ts +3 -0
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js +132 -0
- package/dist/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -0
- package/dist/apps/cli/commands/project/utils/autocompletions.js +1 -1
- package/dist/apps/cli/commands/project/utils/autocompletions.js.map +1 -1
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js +6 -8
- package/dist/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/apps/cli/config/writeConfig.js +1 -1
- package/dist/apps/cli/config/writeConfig.js.map +1 -1
- package/dist/apps/cli/verify/migration/fromv2.js +8 -6
- package/dist/apps/cli/verify/migration/fromv2.js.map +1 -1
- package/dist/config/getProjectConfig.d.ts +8 -5
- package/dist/config/getProjectConfig.js +81 -36
- package/dist/config/getProjectConfig.js.map +1 -1
- package/dist/k8sApi/index.d.ts +7 -5
- package/dist/k8sApi/index.js +23 -9
- package/dist/k8sApi/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/cluster.js +0 -2
- package/dist/utils/cluster.js.map +1 -1
- package/dist/utils/gitlab.d.ts +1 -0
- package/dist/utils/gitlab.js +17 -1
- package/dist/utils/gitlab.js.map +1 -1
- package/dist/utils/projects/index.js +7 -8
- package/dist/utils/projects/index.js.map +1 -1
- package/package.json +3 -3
- package/src/apps/cli/commands/general/index.ts +6 -7
- package/src/apps/cli/commands/general/portForward.ts +2 -1
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +24 -6
- package/src/apps/cli/commands/project/commandConfigSecrets.ts +139 -128
- package/src/apps/cli/commands/project/commandDeletePods.ts +2 -1
- package/src/apps/cli/commands/project/{commandInitProject.ts → commandInitProject.old.ts} +0 -0
- package/src/apps/cli/commands/project/commandSetup.ts +12 -0
- package/src/apps/cli/commands/project/commandTriggerCronjob.ts +3 -3
- package/src/apps/cli/commands/project/index.ts +4 -6
- package/src/apps/cli/commands/project/setup/index.ts +42 -0
- package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +72 -0
- package/src/apps/cli/commands/project/setup/setupContext.ts +37 -0
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +112 -0
- package/src/apps/cli/commands/project/utils/autocompletions.ts +2 -2
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +2 -1
- package/src/apps/cli/config/writeConfig.ts +1 -1
- package/src/apps/cli/verify/migration/fromv2.ts +4 -2
- package/src/config/getProjectConfig.ts +74 -34
- package/src/k8sApi/index.ts +20 -8
- package/src/utils/cluster.ts +0 -2
- package/src/utils/gitlab.ts +11 -0
- package/src/utils/projects/index.ts +3 -1
- package/dist/apps/cli/commands/project/commandInitGitlab.js +0 -136
- package/dist/apps/cli/commands/project/commandInitGitlab.js.map +0 -1
- package/dist/apps/cli/commands/project/commandInitProject.js.map +0 -1
- package/dist/apps/cli/commands/project/commandReloadConfig.d.ts +0 -3
- package/dist/apps/cli/commands/project/commandReloadConfig.js.map +0 -1
- package/dist/utils/formatEnvVars.d.ts +0 -2
- package/dist/utils/formatEnvVars.js +0 -10
- package/dist/utils/formatEnvVars.js.map +0 -1
- package/src/apps/cli/commands/project/commandInitGitlab.ts +0 -248
- package/src/apps/cli/commands/project/commandReloadConfig.ts +0 -12
- package/src/utils/formatEnvVars.ts +0 -7
package/README.md
CHANGED
|
@@ -13,11 +13,12 @@ or npm users
|
|
|
13
13
|
_Note: if you have `@panter/catladder` installed upgrade it to >=4.0.0 before installing `@catladder/cli`_
|
|
14
14
|
|
|
15
15
|
## Getting started
|
|
16
|
+
|
|
16
17
|
You'll need
|
|
18
|
+
|
|
17
19
|
- Google Cloud SDK ([see installation instructions](https://cloud.google.com/sdk/docs/install))
|
|
18
20
|
- Kubectl ([see installation instructions](https://kubernetes.io/docs/tasks/tools/))
|
|
19
21
|
- Cloud SQL Auth proxy ([see installation instructions](https://cloud.google.com/sql/docs/postgres/sql-proxy#install))
|
|
20
|
-
- Bitwarden CLI ([see installation instructions](https://bitwarden.com/help/article/cli/))
|
|
21
22
|
|
|
22
23
|
Afterwards you need to connect to your cluster, e.g. `gcloud container clusters get-credentials clustername --zone google-zone --project google-project-id`
|
|
23
24
|
In most cases you'll find the details on the Google Cloud [cluster overview ](https://console.cloud.google.com/kubernetes/list?project=skynet-164509)
|
|
@@ -41,7 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
exports.__esModule = true;
|
|
42
42
|
exports.getAllNamespacesNames = void 0;
|
|
43
43
|
var memoizee_1 = __importDefault(require("memoizee"));
|
|
44
|
-
var k8sApi_1 =
|
|
44
|
+
var k8sApi_1 = require("../../../../k8sApi");
|
|
45
45
|
var cluster_1 = require("../../../../utils/cluster");
|
|
46
46
|
var log_1 = require("../../../../utils/log");
|
|
47
47
|
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
@@ -50,10 +50,12 @@ var shell_1 = require("../../../../utils/shell");
|
|
|
50
50
|
var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
|
|
51
51
|
var portForward_2 = __importDefault(require("./portForward"));
|
|
52
52
|
var getAllNamespaces = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
53
|
-
var res;
|
|
53
|
+
var k8sApi, res;
|
|
54
54
|
return __generator(this, function (_a) {
|
|
55
55
|
switch (_a.label) {
|
|
56
|
-
case 0:
|
|
56
|
+
case 0:
|
|
57
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
58
|
+
return [4 /*yield*/, k8sApi.listNamespace()];
|
|
57
59
|
case 1:
|
|
58
60
|
res = _a.sent();
|
|
59
61
|
return [2 /*return*/, res.body.items];
|
|
@@ -111,10 +113,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
111
113
|
.action(function (_a) {
|
|
112
114
|
var namespace = _a.namespace;
|
|
113
115
|
return __awaiter(this, void 0, void 0, function () {
|
|
114
|
-
var res;
|
|
116
|
+
var k8sApi, res;
|
|
115
117
|
return __generator(this, function (_b) {
|
|
116
118
|
switch (_b.label) {
|
|
117
|
-
case 0:
|
|
119
|
+
case 0:
|
|
120
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
121
|
+
return [4 /*yield*/, k8sApi.listNamespacedSecret(namespace)];
|
|
118
122
|
case 1:
|
|
119
123
|
res = _b.sent();
|
|
120
124
|
this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
|
|
@@ -142,10 +146,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
142
146
|
.action(function (_a) {
|
|
143
147
|
var namespace = _a.namespace;
|
|
144
148
|
return __awaiter(this, void 0, void 0, function () {
|
|
145
|
-
var res;
|
|
149
|
+
var k8sApi, res;
|
|
146
150
|
return __generator(this, function (_b) {
|
|
147
151
|
switch (_b.label) {
|
|
148
|
-
case 0:
|
|
152
|
+
case 0:
|
|
153
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
154
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
149
155
|
case 1:
|
|
150
156
|
res = _b.sent();
|
|
151
157
|
this.log(res.body.items.map(function (n) { return n.metadata.name; }).join("\n"));
|
|
@@ -174,10 +180,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
174
180
|
.action(function (_a) {
|
|
175
181
|
var namespace = _a.namespace;
|
|
176
182
|
return __awaiter(this, void 0, void 0, function () {
|
|
177
|
-
var res, podNames, podName;
|
|
183
|
+
var k8sApi, res, podNames, podName;
|
|
178
184
|
return __generator(this, function (_b) {
|
|
179
185
|
switch (_b.label) {
|
|
180
|
-
case 0:
|
|
186
|
+
case 0:
|
|
187
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
188
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
181
189
|
case 1:
|
|
182
190
|
res = _b.sent();
|
|
183
191
|
if (res.body.items.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAgC;AAEhC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,13 +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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
-
};
|
|
41
38
|
exports.__esModule = true;
|
|
42
39
|
var log_1 = require("../../../../utils/log");
|
|
43
40
|
var portForward_1 = require("../../../../utils/portForward");
|
|
44
|
-
var k8sApi_1 =
|
|
41
|
+
var k8sApi_1 = require("../../../../k8sApi");
|
|
45
42
|
var namespaceAutoCompletion_1 = require("./namespaceAutoCompletion");
|
|
46
43
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
44
|
return __generator(this, function (_a) {
|
|
@@ -51,10 +48,12 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
51
48
|
.action(function (_a) {
|
|
52
49
|
var namespace = _a.namespace;
|
|
53
50
|
return __awaiter(this, void 0, void 0, function () {
|
|
54
|
-
var res, podNames, podName, localPort, remotePort;
|
|
51
|
+
var k8sApi, res, podNames, podName, localPort, remotePort;
|
|
55
52
|
return __generator(this, function (_b) {
|
|
56
53
|
switch (_b.label) {
|
|
57
|
-
case 0:
|
|
54
|
+
case 0:
|
|
55
|
+
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
56
|
+
return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
|
|
58
57
|
case 1:
|
|
59
58
|
res = _b.sent();
|
|
60
59
|
if (res.body.items.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"portForward.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/general/portForward.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAAiD;AAEjD,6DAAiE;AAEjE,6CAA+C;AAC/C,qEAAoE;AAEpE,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CAAC,0BAA0B,EAAE,uBAAuB,CAAC;iBAC5D,YAAY,CAAC,iDAAuB,CAAC;iBACrC,MAAM,CAAC,UAAgB,EAAa;oBAAX,SAAS,eAAA;;;;;;gCAC3B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gCACf,qBAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gCAA/C,GAAG,GAAG,SAAyC;gCACrD,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oCAC/B,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACK,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,CAAC;gCAE5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oCACzB,IAAA,cAAQ,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;oCACvC,sBAAO;iCACR;gCACmB,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACpC,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,SAAS;wCACf,OAAO,EAAE,QAAQ;wCACjB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,OAAO,GAAK,CAAA,SAKlB,CAAA,QALa;gCAOO,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACtC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,WAAW;wCAEjB,OAAO,EAAE,cAAc;qCACxB,CAAC,EAAA;;gCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;gCAOM,qBAAM,IAAI,CAAC,MAAM,CAAC;wCACvC,IAAI,EAAE,QAAQ;wCACd,IAAI,EAAE,YAAY;wCAElB,OAAO,EAAE,eAAe;qCACzB,CAAC,EAAA;;gCALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gCAOlB,sBAAO,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,EAAC;;;;aACpE,CAAC,EAAA;;KAAA,EAAC"}
|
|
@@ -40,9 +40,7 @@ var pipeline_1 = require("@catladder/pipeline");
|
|
|
40
40
|
var child_process_promise_1 = require("child-process-promise");
|
|
41
41
|
var fs_extra_1 = require("fs-extra");
|
|
42
42
|
var tmp_promise_1 = require("tmp-promise");
|
|
43
|
-
var constants_1 = require("../../../../config/constants");
|
|
44
43
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
45
|
-
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
46
44
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
47
45
|
exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
|
|
48
46
|
var _a, _b;
|
|
@@ -55,18 +53,18 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
55
53
|
return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
|
|
56
54
|
case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
|
|
57
55
|
.action(function (_a) {
|
|
58
|
-
var _b, _c, _d, _e
|
|
56
|
+
var _b, _c, _d, _e;
|
|
59
57
|
var envComponent = _a.envComponent;
|
|
60
58
|
return __awaiter(this, void 0, void 0, function () {
|
|
61
|
-
var
|
|
59
|
+
var _f, env, componentName, config, localPort, envVars, POSTGRESQL_PASSWORD, context, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName, cloudsqlProxyCredentials;
|
|
62
60
|
var _this = this;
|
|
63
|
-
return __generator(this, function (
|
|
64
|
-
switch (
|
|
61
|
+
return __generator(this, function (_g) {
|
|
62
|
+
switch (_g.label) {
|
|
65
63
|
case 0:
|
|
66
|
-
|
|
64
|
+
_f = (0, getProjectConfig_1.parseChoice)(envComponent), env = _f.env, componentName = _f.componentName;
|
|
67
65
|
return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
|
|
68
66
|
case 1:
|
|
69
|
-
config =
|
|
67
|
+
config = _g.sent();
|
|
70
68
|
return [4 /*yield*/, this.prompt({
|
|
71
69
|
type: "number",
|
|
72
70
|
name: "localPort",
|
|
@@ -74,35 +72,45 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
74
72
|
message: "Local port: "
|
|
75
73
|
})];
|
|
76
74
|
case 2:
|
|
77
|
-
localPort = (
|
|
75
|
+
localPort = (_g.sent()).localPort;
|
|
78
76
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, env, componentName)];
|
|
79
77
|
case 3:
|
|
80
|
-
|
|
78
|
+
envVars = _g.sent();
|
|
79
|
+
POSTGRESQL_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD;
|
|
81
80
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
82
81
|
case 4:
|
|
83
|
-
context =
|
|
82
|
+
context = _g.sent();
|
|
84
83
|
if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
|
|
85
84
|
throw new Error("currently only supported for kubernetes deployment");
|
|
86
85
|
}
|
|
86
|
+
this.log("");
|
|
87
87
|
this.log("postgres-PW: ".concat(POSTGRESQL_PASSWORD));
|
|
88
88
|
this.log("");
|
|
89
|
+
this.log("POSTGRESQL_URL=postgresql://postgres:".concat(POSTGRESQL_PASSWORD, "@localhost:").concat(localPort, "/").concat(context.environment.envVars.KUBE_APP_NAME, "?schema=public"));
|
|
90
|
+
this.log("");
|
|
89
91
|
values = context.componentConfig.deploy.values;
|
|
90
|
-
projectId = ((
|
|
91
|
-
((
|
|
92
|
+
projectId = ((_b = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _b === void 0 ? void 0 : _b.projectId) ||
|
|
93
|
+
((_c = context.componentConfig.deploy.cluster) === null || _c === void 0 ? void 0 : _c.projectId);
|
|
92
94
|
defaultInstanceId = "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
|
|
93
|
-
instanceId = ((
|
|
95
|
+
instanceId = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.instanceId) || defaultInstanceId;
|
|
94
96
|
defaultRegion = "europe-west6";
|
|
95
|
-
region = ((
|
|
97
|
+
region = ((_e = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _e === void 0 ? void 0 : _e.region) || defaultRegion;
|
|
96
98
|
instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId, "=tcp:").concat(localPort);
|
|
97
|
-
return [4 /*yield*/, (0,
|
|
99
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
|
|
98
100
|
case 5:
|
|
99
|
-
|
|
101
|
+
cloudsqlProxyCredentials = _g.sent();
|
|
102
|
+
if (!cloudsqlProxyCredentials) {
|
|
103
|
+
// we store cloudsqlProxyCredentials on gitlab, but its currently get pushed via bitwarden due to legacy reasons
|
|
104
|
+
// this will be fixed with when https://git.panter.ch/catladder/catladder/-/merge_requests/32/ is merged
|
|
105
|
+
this.log("cloudsqlProxyCredentials env var missing in gitlab. Please contact gilde-ci-cd about that.");
|
|
106
|
+
throw new Error("cloudsqlProxyCredentials missing in secrets");
|
|
107
|
+
}
|
|
100
108
|
return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
|
|
101
109
|
var tmpFilePath = _a.path;
|
|
102
110
|
return __awaiter(_this, void 0, void 0, function () {
|
|
103
111
|
return __generator(this, function (_b) {
|
|
104
112
|
switch (_b.label) {
|
|
105
|
-
case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath,
|
|
113
|
+
case 0: return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
|
|
106
114
|
case 1:
|
|
107
115
|
_b.sent();
|
|
108
116
|
return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", instanceName, "-credential_file", tmpFilePath], {
|
|
@@ -117,7 +125,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
|
|
|
117
125
|
});
|
|
118
126
|
})];
|
|
119
127
|
case 6:
|
|
120
|
-
|
|
128
|
+
_g.sent();
|
|
121
129
|
return [2 /*return*/];
|
|
122
130
|
}
|
|
123
131
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AACrD,+DAA8C;AAC9C,qCAAqC;AACrC,2CAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import Vorpal from "vorpal";
|
|
1
|
+
import Vorpal, { CommandInstance } from "vorpal";
|
|
2
|
+
export declare const projectConfigSecrets: (vorpal: CommandInstance, envComponent?: string) => Promise<void>;
|
|
2
3
|
declare const _default: (vorpal: Vorpal) => Promise<void>;
|
|
3
4
|
export default _default;
|