@catladder/cli 0.0.0-main-239cb0b8 → 0.0.0-main-47dcb7bc
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/commandConfigSecrets.js +35 -16
- package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/apps/cli/verify/migration/oldGitlabCi.js +2 -2
- package/dist/apps/cli/verify/migration/oldGitlabCi.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/gitlab.js +0 -1
- package/dist/utils/gitlab.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/cli/commands/project/commandConfigSecrets.ts +25 -0
- package/src/apps/cli/verify/migration/oldGitlabCi.ts +2 -2
- package/src/utils/gitlab.ts +0 -2
|
@@ -43,9 +43,11 @@ exports.__esModule = true;
|
|
|
43
43
|
/* eslint-disable no-constant-condition */
|
|
44
44
|
var common_tags_1 = require("common-tags");
|
|
45
45
|
var lodash_1 = require("lodash");
|
|
46
|
+
var constants_1 = require("../../../../config/constants");
|
|
46
47
|
var getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
47
48
|
var editAsFile_1 = require("../../../../utils/editAsFile");
|
|
48
49
|
var gitlab_1 = require("../../../../utils/gitlab");
|
|
50
|
+
var passwordstore_1 = require("../../../../utils/passwordstore");
|
|
49
51
|
var promise_1 = require("../../../../utils/promise");
|
|
50
52
|
var autocompletions_1 = require("./utils/autocompletions");
|
|
51
53
|
/* for convenience, parse json objects. that makes it easier to edit secrets that are object */
|
|
@@ -81,9 +83,11 @@ var getEnvVarsToEdit = function (env, componentName) { return __awaiter(void 0,
|
|
|
81
83
|
});
|
|
82
84
|
}); };
|
|
83
85
|
var doItFor = function (instance, env, components) { return __awaiter(void 0, void 0, void 0, function () {
|
|
84
|
-
var valuesToEdit, _a, _b, hasErrors, _i, components_1, componentName, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _c, components_2, componentName;
|
|
85
|
-
|
|
86
|
-
|
|
86
|
+
var valuesToEdit, _a, _b, hasErrors, _i, components_1, componentName, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _c, components_2, componentName, context, _d, _e;
|
|
87
|
+
var _f;
|
|
88
|
+
var _g, _h;
|
|
89
|
+
return __generator(this, function (_j) {
|
|
90
|
+
switch (_j.label) {
|
|
87
91
|
case 0:
|
|
88
92
|
_b = (_a = Object).fromEntries;
|
|
89
93
|
return [4 /*yield*/, Promise.all(components.map(function (componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -100,18 +104,18 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
100
104
|
});
|
|
101
105
|
}); }))];
|
|
102
106
|
case 1:
|
|
103
|
-
valuesToEdit = _b.apply(_a, [
|
|
107
|
+
valuesToEdit = _b.apply(_a, [_j.sent()]);
|
|
104
108
|
hasErrors = true;
|
|
105
|
-
|
|
109
|
+
_j.label = 2;
|
|
106
110
|
case 2:
|
|
107
111
|
if (!hasErrors) return [3 /*break*/, 10];
|
|
108
112
|
return [4 /*yield*/, (0, editAsFile_1.editAsFile)(resolveJson(valuesToEdit), (0, common_tags_1.stripIndents)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n Please fill in all secrets for: ", "\n\n "], ["\n Please fill in all secrets for: ", "\n\n "])), components.join(", ")))];
|
|
109
113
|
case 3:
|
|
110
|
-
valuesToEdit =
|
|
114
|
+
valuesToEdit = _j.sent();
|
|
111
115
|
// check for errors
|
|
112
116
|
hasErrors = false;
|
|
113
117
|
_i = 0, components_1 = components;
|
|
114
|
-
|
|
118
|
+
_j.label = 4;
|
|
115
119
|
case 4:
|
|
116
120
|
if (!(_i < components_1.length)) return [3 /*break*/, 9];
|
|
117
121
|
componentName = components_1[_i];
|
|
@@ -120,7 +124,7 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
120
124
|
: [];
|
|
121
125
|
return [4 /*yield*/, (0, getProjectConfig_1.getEnvironment)(env, componentName)];
|
|
122
126
|
case 5:
|
|
123
|
-
secretEnvVarKeys = (
|
|
127
|
+
secretEnvVarKeys = (_j.sent()).secretEnvVarKeys;
|
|
124
128
|
extranous = (0, lodash_1.difference)(usedKeys, secretEnvVarKeys);
|
|
125
129
|
missing = (0, lodash_1.difference)(secretEnvVarKeys, usedKeys);
|
|
126
130
|
if (!(extranous.length > 0 || missing.length > 0)) return [3 /*break*/, 8];
|
|
@@ -139,7 +143,7 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
139
143
|
}
|
|
140
144
|
return [4 /*yield*/, (0, promise_1.delay)(1000)];
|
|
141
145
|
case 6:
|
|
142
|
-
|
|
146
|
+
_j.sent();
|
|
143
147
|
return [4 /*yield*/, instance.prompt({
|
|
144
148
|
"default": true,
|
|
145
149
|
message: "Try again? 🤔",
|
|
@@ -147,30 +151,45 @@ var doItFor = function (instance, env, components) { return __awaiter(void 0, vo
|
|
|
147
151
|
type: "confirm"
|
|
148
152
|
})];
|
|
149
153
|
case 7:
|
|
150
|
-
shouldContinue = (
|
|
154
|
+
shouldContinue = (_j.sent()).shouldContinue;
|
|
151
155
|
if (!shouldContinue) {
|
|
152
156
|
throw new Error("abort");
|
|
153
157
|
}
|
|
154
158
|
hasErrors = true;
|
|
155
|
-
|
|
159
|
+
_j.label = 8;
|
|
156
160
|
case 8:
|
|
157
161
|
_i++;
|
|
158
162
|
return [3 /*break*/, 4];
|
|
159
163
|
case 9: return [3 /*break*/, 2];
|
|
160
164
|
case 10:
|
|
161
165
|
_c = 0, components_2 = components;
|
|
162
|
-
|
|
166
|
+
_j.label = 11;
|
|
163
167
|
case 11:
|
|
164
|
-
if (!(_c < components_2.length)) return [3 /*break*/,
|
|
168
|
+
if (!(_c < components_2.length)) return [3 /*break*/, 17];
|
|
165
169
|
componentName = components_2[_c];
|
|
166
170
|
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(this, valuesToEdit[componentName], env, componentName)];
|
|
167
171
|
case 12:
|
|
168
|
-
|
|
169
|
-
|
|
172
|
+
_j.sent();
|
|
173
|
+
if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 16];
|
|
174
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
|
|
170
175
|
case 13:
|
|
176
|
+
context = _j.sent();
|
|
177
|
+
if (!(context.componentConfig.deploy &&
|
|
178
|
+
((_h = (_g = context.componentConfig.deploy.values) === null || _g === void 0 ? void 0 : _g.cloudsql) === null || _h === void 0 ? void 0 : _h.enabled))) return [3 /*break*/, 16];
|
|
179
|
+
_d = gitlab_1.upsertAllVariables;
|
|
180
|
+
_e = [this];
|
|
181
|
+
_f = {};
|
|
182
|
+
return [4 /*yield*/, (0, passwordstore_1.readPass)(constants_1.GOOGLE_CLOUD_SQL_PASS_PATH)];
|
|
183
|
+
case 14: return [4 /*yield*/, _d.apply(void 0, _e.concat([(_f.cloudsqlProxyCredentials = _j.sent(),
|
|
184
|
+
_f), env,
|
|
185
|
+
componentName]))];
|
|
186
|
+
case 15:
|
|
187
|
+
_j.sent();
|
|
188
|
+
_j.label = 16;
|
|
189
|
+
case 16:
|
|
171
190
|
_c++;
|
|
172
191
|
return [3 /*break*/, 11];
|
|
173
|
-
case
|
|
192
|
+
case 17: return [2 /*return*/];
|
|
174
193
|
}
|
|
175
194
|
});
|
|
176
195
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,2CAA2C;AAC3C,iCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ var detectBuildConfig = function (gitlabCi) {
|
|
|
16
16
|
return "node-static";
|
|
17
17
|
}
|
|
18
18
|
if (firstInclude.file === "meteor-kubernetes.yml") {
|
|
19
|
-
|
|
19
|
+
return "meteor";
|
|
20
20
|
}
|
|
21
21
|
if (firstInclude.file === "rails-kubernetes.yml") {
|
|
22
|
-
throw new Error("
|
|
22
|
+
throw new Error("rails is not yet implemented");
|
|
23
23
|
}
|
|
24
24
|
};
|
|
25
25
|
exports.detectBuildConfig = detectBuildConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oldGitlabCi.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/oldGitlabCi.ts"],"names":[],"mappings":";;;AAkBO,IAAM,iBAAiB,GAAG,UAC/B,QAAyB;;IAEzB,IAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,YAAY,IAAI,CAAA,MAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,MAAK,qBAAqB,EAAE;QAC3E,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,UAAU,CAAC;IAE5D,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAqB,EAAE;QAC/C,OAAO,MAAM,CAAC;KACf;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,0BAA0B,EAAE;QACpD,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;QACjD,
|
|
1
|
+
{"version":3,"file":"oldGitlabCi.js","sourceRoot":"","sources":["../../../../../src/apps/cli/verify/migration/oldGitlabCi.ts"],"names":[],"mappings":";;;AAkBO,IAAM,iBAAiB,GAAG,UAC/B,QAAyB;;IAEzB,IAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,YAAY,IAAI,CAAA,MAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,MAAK,qBAAqB,EAAE;QAC3E,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,UAAU,CAAC;IAE5D,IAAI,YAAY,CAAC,IAAI,KAAK,qBAAqB,EAAE;QAC/C,OAAO,MAAM,CAAC;KACf;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,0BAA0B,EAAE;QACpD,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;QACjD,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,sBAAsB,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;AACH,CAAC,CAAC;AAxBW,QAAA,iBAAiB,qBAwB5B"}
|