@catladder/cli 1.161.0 → 1.162.0
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/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/cli/src/config/getProjectConfig.js +21 -40
- package/dist/cli/src/config/getProjectConfig.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config/getProjectConfig.ts +16 -17
|
@@ -51,17 +51,6 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
51
51
|
}
|
|
52
52
|
return ar;
|
|
53
53
|
};
|
|
54
|
-
var __values = (this && this.__values) || function(o) {
|
|
55
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
56
|
-
if (m) return m.call(o);
|
|
57
|
-
if (o && typeof o.length === "number") return {
|
|
58
|
-
next: function () {
|
|
59
|
-
if (o && i >= o.length) o = void 0;
|
|
60
|
-
return { value: o && o[i++], done: !o };
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
64
|
-
};
|
|
65
54
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
55
|
exports.getJobOnlyEnvVarsResolved = exports.getEnvVarsResolved = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.getProjectComponents = exports.getProjectConfig = exports.parseChoice = void 0;
|
|
67
56
|
var pipeline_1 = require("../../../pipeline/src/index.js");
|
|
@@ -229,39 +218,31 @@ var resolveSecrets = function (vorpal, varSets) { return __awaiter(void 0, void
|
|
|
229
218
|
case 0: return [4 /*yield*/, (0, gitlab_1.getAllVariables)(vorpal)];
|
|
230
219
|
case 1:
|
|
231
220
|
allVariablesInGitlab = _a.sent();
|
|
232
|
-
return [2 /*return*/, Object.fromEntries(varSets.flatMap(function (
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
221
|
+
return [2 /*return*/, Object.fromEntries(varSets.flatMap(function (_a) {
|
|
222
|
+
var envVars = _a.envVars, secretEnvVarKeys = _a.secretEnvVarKeys;
|
|
223
|
+
return Object.entries(envVars)
|
|
224
|
+
.filter(function (_a) {
|
|
225
|
+
var _b;
|
|
236
226
|
var _c = __read(_a, 2), key = _c[0], value = _c[1];
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
return null;
|
|
240
|
-
}
|
|
241
|
-
try {
|
|
242
|
-
for (var allVariablesInGitlab_1 = __values(allVariablesInGitlab), allVariablesInGitlab_1_1 = allVariablesInGitlab_1.next(); !allVariablesInGitlab_1_1.done; allVariablesInGitlab_1_1 = allVariablesInGitlab_1.next()) {
|
|
243
|
-
var variable = allVariablesInGitlab_1_1.value;
|
|
244
|
-
value = value
|
|
245
|
-
.toString()
|
|
246
|
-
.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
250
|
-
finally {
|
|
251
|
-
try {
|
|
252
|
-
if (allVariablesInGitlab_1_1 && !allVariablesInGitlab_1_1.done && (_b = allVariablesInGitlab_1.return)) _b.call(allVariablesInGitlab_1);
|
|
253
|
-
}
|
|
254
|
-
finally { if (e_1) throw e_1.error; }
|
|
255
|
-
}
|
|
256
|
-
return [key, value];
|
|
227
|
+
return value !== undefined &&
|
|
228
|
+
value !== null &&
|
|
229
|
+
!((_b = secretEnvVarKeys.find(function (k) { return k.key === key; })) === null || _b === void 0 ? void 0 : _b.hidden);
|
|
257
230
|
})
|
|
258
|
-
.
|
|
231
|
+
.map(function (_a) {
|
|
232
|
+
var _b = __read(_a, 2), key = _b[0], value = _b[1];
|
|
233
|
+
return [
|
|
234
|
+
key,
|
|
235
|
+
allVariablesInGitlab.reduce(function (acc, curr) {
|
|
236
|
+
return acc.replace(new RegExp("\\$" + curr.key, "g"), curr.value);
|
|
237
|
+
}, "".concat(value)),
|
|
238
|
+
];
|
|
239
|
+
});
|
|
259
240
|
}))];
|
|
260
241
|
}
|
|
261
242
|
});
|
|
262
243
|
}); };
|
|
263
244
|
var getEnvVarsResolved = function (vorpal, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
264
|
-
var envionment,
|
|
245
|
+
var envionment, e_1;
|
|
265
246
|
return __generator(this, function (_a) {
|
|
266
247
|
switch (_a.label) {
|
|
267
248
|
case 0:
|
|
@@ -283,7 +264,7 @@ var getEnvVarsResolved = function (vorpal, env, componentName) { return __awaite
|
|
|
283
264
|
},
|
|
284
265
|
])];
|
|
285
266
|
case 3:
|
|
286
|
-
|
|
267
|
+
e_1 = _a.sent();
|
|
287
268
|
// env is disabled
|
|
288
269
|
return [2 /*return*/, {}];
|
|
289
270
|
case 4: return [2 /*return*/];
|
|
@@ -296,7 +277,7 @@ exports.getEnvVarsResolved = getEnvVarsResolved;
|
|
|
296
277
|
* is used to get job only vars that should also be editable locally with catladder.
|
|
297
278
|
*/
|
|
298
279
|
var getJobOnlyEnvVarsResolved = function (vorpal, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
|
|
299
|
-
var envionment,
|
|
280
|
+
var envionment, e_2;
|
|
300
281
|
return __generator(this, function (_a) {
|
|
301
282
|
switch (_a.label) {
|
|
302
283
|
case 0:
|
|
@@ -309,7 +290,7 @@ var getJobOnlyEnvVarsResolved = function (vorpal, env, componentName) { return _
|
|
|
309
290
|
envionment.jobOnlyVars.deploy,
|
|
310
291
|
])];
|
|
311
292
|
case 2:
|
|
312
|
-
|
|
293
|
+
e_2 = _a.sent();
|
|
313
294
|
// env is disabled
|
|
314
295
|
return [2 /*return*/, {}];
|
|
315
296
|
case 3: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
|