@catladder/cli 0.0.0-refactor-docker-45f6e733 → 0.0.0-refactor-cache-b38c122b

package/dist/cli/src/apps/cli/verify/index.js

@@ -1,67 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verify = void 0;
-var gitlab_1 = require("../../../utils/gitlab");
-var verify = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, gitlab_1.hasGitlabToken)()];
-            case 1:
-                // check if has all settings
-                if (!(_a.sent())) {
-                    vorpal.command("setup-gitlab-token").action(function () {
-                        return __awaiter(this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, (0, gitlab_1.setupGitlabToken)(this)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        });
-                    });
-                    vorpal.exec("setup-gitlab-token");
-                }
-                return [2 /*return*/];
-        }
-    });
-}); };
+const gitlab_1 = require("../../../utils/gitlab");
+const verify = async (vorpal) => {
+    // check if has all settings
+    if (!(await (0, gitlab_1.hasGitlabToken)())) {
+        vorpal.command("setup-gitlab-token").action(async function () {
+            await (0, gitlab_1.setupGitlabToken)(this);
+        });
+        vorpal.exec("setup-gitlab-token");
+    }
+};
 exports.verify = verify;
 //# sourceMappingURL=index.js.map

package/dist/cli/src/apps/cli/verify/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/verify/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gDAAyE;AAElE,IAAM,MAAM,GAAG,UAAO,MAAc;;;oBAGnC,qBAAM,IAAA,uBAAc,GAAE,EAAA;;gBAF5B,4BAA4B;gBAE5B,IAAI,CAAC,CAAC,SAAsB,CAAC,EAAE,CAAC;oBAC9B,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC;;;;4CAC1C,qBAAM,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAA;;wCAA5B,SAA4B,CAAC;;;;;qBAC9B,CAAC,CAAC;oBACH,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBACpC,CAAC;;;;KACF,CAAC;AATW,QAAA,MAAM,UASjB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/verify/index.ts"],"names":[],"mappings":";;;AAEA,kDAAyE;AAElE,MAAM,MAAM,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IAC7C,4BAA4B;IAE5B,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAc,GAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,KAAK;YAC/C,MAAM,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC;AACH,CAAC,CAAC;AATW,QAAA,MAAM,UASjB"}

package/dist/cli/src/catci.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var catci_1 = require("./apps/catci/catci");
+const catci_1 = require("./apps/catci/catci");
 (0, catci_1.runCatCi)();
 //# sourceMappingURL=catci.js.map

package/dist/cli/src/catci.js.map

@@ -1 +1 @@
-{"version":3,"file":"catci.js","sourceRoot":"","sources":["../../../src/catci.ts"],"names":[],"mappings":";;AAAA,4CAA8C;AAE9C,IAAA,gBAAQ,GAAE,CAAC"}
+{"version":3,"file":"catci.js","sourceRoot":"","sources":["../../../src/catci.ts"],"names":[],"mappings":";;AAAA,8CAA8C;AAE9C,IAAA,gBAAQ,GAAE,CAAC"}

package/dist/cli/src/catenv.js

@@ -3,10 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
-var parseChoice_1 = require("./config/parseChoice");
-var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
-(0, catenv_1.default)(choice).then(function () {
+const catenv_1 = __importDefault(require("./apps/catenv/catenv"));
+const parseChoice_1 = require("./config/parseChoice");
+const args = process.argv.slice(2);
+const helpFlags = ["--help", "-h", "help"];
+if (args.some((arg) => helpFlags.includes(arg))) {
+    const docLink = "https://git.panter.ch/catladder/catladder/-/blob/main/docs/1_VARS.md";
+    console.log(`\nUsage: catenv [env|env:component]\n\nEnv variable and catenv documentation:\n${docLink}`);
+    process.exit(0);
+}
+(0, catenv_1.default)(args[0] ? (0, parseChoice_1.parseChoice)(args[0]) : null).then(() => {
     // we have to exit manually, because we have some file watches
     process.exit();
 });

package/dist/cli/src/catenv.js.map

@@ -1 +1 @@
-{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,kEAA0C;AAE1C,sDAAmD;AAEnD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChD,MAAM,OAAO,GACX,sEAAsE,CAAC;IACzE,OAAO,CAAC,GAAG,CACT,kFAAkF,OAAO,EAAE,CAC5F,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,IAAA,gBAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACtD,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}

package/dist/cli/src/cli.js

@@ -3,6 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var cli_1 = __importDefault(require("./apps/cli/cli"));
+const cli_1 = __importDefault(require("./apps/cli/cli"));
 (0, cli_1.default)();
 //# sourceMappingURL=cli.js.map

package/dist/cli/src/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli.ts"],"names":[],"mappings":";;;;;AAAA,uDAAiC;AAEjC,IAAA,aAAG,GAAE,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli.ts"],"names":[],"mappings":";;;;;AAAA,yDAAiC;AAEjC,IAAA,aAAG,GAAE,CAAC"}

package/dist/cli/src/config/getProjectConfig.js

@@ -1,315 +1,141 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJobOnlyEnvVarsResolved = exports.getEnvVarsResolved = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.getProjectComponents = exports.getProjectConfig = exports.parseChoice = void 0;
-var pipeline_1 = require("../../../pipeline/src/index.js");
-var gitlab_1 = require("../utils/gitlab");
-var projects_1 = require("../utils/projects");
-var fs_1 = require("fs");
+const pipeline_1 = require("../../../pipeline/src/index.js");
+const gitlab_1 = require("../utils/gitlab");
+const projects_1 = require("../utils/projects");
+const fs_1 = require("fs");
 var parseChoice_1 = require("./parseChoice");
 Object.defineProperty(exports, "parseChoice", { enumerable: true, get: function () { return parseChoice_1.parseChoice; } });
-var currentConfig = null;
+let currentConfig = null;
 // reload the config on change
-var reloadConfigAndObserve = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var gitRoot, result, config, path, watcher;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, projects_1.getGitRoot)()];
-            case 1:
-                gitRoot = _a.sent();
-                result = (0, pipeline_1.readConfigSync)(gitRoot);
-                if (!result) {
-                    // can't do anything, there is no config
-                    return [2 /*return*/];
-                }
-                config = result.config, path = result.path;
-                watcher = (0, fs_1.watch)(path, function () {
-                    watcher.close();
-                    reloadConfigAndObserve();
-                });
-                currentConfig = config;
-                return [2 /*return*/];
-        }
-    });
-}); };
-var getProjectConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (!!currentConfig) return [3 /*break*/, 2];
-                // initially
-                return [4 /*yield*/, reloadConfigAndObserve()];
-            case 1:
-                // initially
-                _a.sent();
-                _a.label = 2;
-            case 2: return [2 /*return*/, currentConfig];
-        }
+const reloadConfigAndObserve = async () => {
+    const gitRoot = await (0, projects_1.getGitRoot)();
+    if (!gitRoot) {
+        return;
+    }
+    const result = await (0, pipeline_1.readConfig)(gitRoot);
+    if (!result) {
+        // can't do anything, there is no config
+        return;
+    }
+    const { config, path } = result;
+    const watcher = (0, fs_1.watch)(path, () => {
+        watcher.close();
+        reloadConfigAndObserve();
     });
-}); };
+    currentConfig = config;
+};
+const getProjectConfig = async () => {
+    if (!currentConfig) {
+        // initially
+        await reloadConfigAndObserve();
+    }
+    return currentConfig;
+};
 exports.getProjectConfig = getProjectConfig;
-var getProjectComponents = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectConfig)()];
-            case 1:
-                config = _a.sent();
-                if (!config)
-                    return [2 /*return*/, []];
-                return [2 /*return*/, Object.keys(config.components)];
-        }
-    });
-}); };
+const getProjectComponents = async () => {
+    const config = await (0, exports.getProjectConfig)();
+    if (!config)
+        return [];
+    return Object.keys(config.components);
+};
 exports.getProjectComponents = getProjectComponents;
-var getPipelineContextByChoice = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectConfig)()];
-            case 1:
-                config = _a.sent();
-                return [4 /*yield*/, (0, pipeline_1.createComponentContext)({
-                        config: config,
-                        componentName: componentName,
-                        env: env,
-                    })];
-            case 2: return [2 /*return*/, _a.sent()];
-        }
+const getPipelineContextByChoice = async (env, componentName) => {
+    const config = await (0, exports.getProjectConfig)();
+    return await (0, pipeline_1.createComponentContext)({
+        config,
+        componentName,
+        env,
     });
-}); };
+};
 exports.getPipelineContextByChoice = getPipelineContextByChoice;
-var getAllComponentsWithAllEnvsFlat = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectConfig)()];
-            case 1:
-                config = _a.sent();
-                if (!config) {
-                    return [2 /*return*/, []];
-                }
-                return [2 /*return*/, Object.keys(config.components).flatMap(function (componentName) {
-                        return (0, pipeline_1.getAllEnvs)(config, componentName).map(function (env) { return ({ env: env, componentName: componentName }); });
-                    })];
-        }
-    });
-}); };
+const getAllComponentsWithAllEnvsFlat = async () => {
+    const config = await (0, exports.getProjectConfig)();
+    if (!config) {
+        return [];
+    }
+    return Object.keys(config.components).flatMap((componentName) => (0, pipeline_1.getAllEnvs)(config, componentName).map((env) => ({ env, componentName })));
+};
 exports.getAllComponentsWithAllEnvsFlat = getAllComponentsWithAllEnvsFlat;
-var getAllComponentsWithAllEnvsHierarchical = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectConfig)()];
-            case 1:
-                config = _a.sent();
-                if (!config) {
-                    return [2 /*return*/, {}];
-                }
-                return [2 /*return*/, Object.fromEntries(Object.keys(config.components).map(function (componentName) { return [
-                        componentName,
-                        (0, pipeline_1.getAllEnvs)(config, componentName),
-                    ]; }))];
-        }
-    });
-}); };
+const getAllComponentsWithAllEnvsHierarchical = async () => {
+    const config = await (0, exports.getProjectConfig)();
+    if (!config) {
+        return {};
+    }
+    return Object.fromEntries(Object.keys(config.components).map((componentName) => [
+        componentName,
+        (0, pipeline_1.getAllEnvs)(config, componentName),
+    ]));
+};
 exports.getAllComponentsWithAllEnvsHierarchical = getAllComponentsWithAllEnvsHierarchical;
-var getAllPipelineContexts = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                _b = (_a = Promise).all;
-                return [4 /*yield*/, (0, exports.getAllComponentsWithAllEnvsFlat)()];
-            case 1: return [2 /*return*/, _b.apply(_a, [(_c.sent())
-                        .filter(function (c) { return c.env !== "local"; })
-                        .map(function (_a) {
-                        var env = _a.env, componentName = _a.componentName;
-                        return (0, exports.getPipelineContextByChoice)(env, componentName);
-                    })])];
-        }
-    });
-}); };
+const getAllPipelineContexts = async () => {
+    return Promise.all((await (0, exports.getAllComponentsWithAllEnvsFlat)())
+        .filter((c) => c.env !== "local")
+        .map(({ env, componentName }) => (0, exports.getPipelineContextByChoice)(env, componentName)));
+};
 exports.getAllPipelineContexts = getAllPipelineContexts;
-var getEnvironment = function (env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectConfig)()];
-            case 1:
-                config = _a.sent();
-                return [2 /*return*/, (0, pipeline_1.getEnvironment)({ config: config, componentName: componentName, env: env })];
-        }
-    });
-}); };
+const getEnvironment = async (env, componentName) => {
+    const config = await (0, exports.getProjectConfig)();
+    return (0, pipeline_1.getEnvironment)({ config, componentName, env });
+};
 exports.getEnvironment = getEnvironment;
-var getGitlabVar = function (vorpal, env, componentName, variableName) { return __awaiter(void 0, void 0, void 0, function () {
-    var rawVariableName;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                rawVariableName = (0, pipeline_1.getSecretVarName)(env, componentName, variableName);
-                return [4 /*yield*/, (0, gitlab_1.getVariableValueByRawName)(vorpal, rawVariableName)];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
-    });
-}); };
+const getGitlabVar = async (vorpal, env, componentName, variableName) => {
+    const rawVariableName = (0, pipeline_1.getSecretVarName)(env, componentName, variableName);
+    return await (0, gitlab_1.getVariableValueByRawName)(vorpal, rawVariableName);
+};
 exports.getGitlabVar = getGitlabVar;
-var resolveSecrets = function (vorpal, varSets) { return __awaiter(void 0, void 0, void 0, function () {
-    var allVariablesInGitlab;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, gitlab_1.getAllVariables)(vorpal)];
-            case 1:
-                allVariablesInGitlab = _a.sent();
-                return [2 /*return*/, Object.fromEntries(varSets.flatMap(function (set) {
-                        return Object.entries(set.envVars)
-                            .map(function (_a) {
-                            var e_1, _b;
-                            var _c = __read(_a, 2), key = _c[0], value = _c[1];
-                            var secretKey = set.secretEnvVarKeys.find(function (k) { return k.key === key; });
-                            if ((secretKey === null || secretKey === void 0 ? void 0 : secretKey.hidden) || value === undefined) {
-                                return null;
-                            }
-                            try {
-                                for (var allVariablesInGitlab_1 = __values(allVariablesInGitlab), allVariablesInGitlab_1_1 = allVariablesInGitlab_1.next(); !allVariablesInGitlab_1_1.done; allVariablesInGitlab_1_1 = allVariablesInGitlab_1.next()) {
-                                    var variable = allVariablesInGitlab_1_1.value;
-                                    value = value
-                                        .toString()
-                                        .replace(new RegExp("\\$" + variable.key, "g"), variable.value);
-                                }
-                            }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (allVariablesInGitlab_1_1 && !allVariablesInGitlab_1_1.done && (_b = allVariablesInGitlab_1.return)) _b.call(allVariablesInGitlab_1);
-                                }
-                                finally { if (e_1) throw e_1.error; }
-                            }
-                            return [key, value];
-                        })
-                            .filter(Boolean);
-                    }))];
-        }
-    });
-}); };
-var getEnvVarsResolved = function (vorpal, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var envionment, e_2;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (!componentName) {
-                    return [2 /*return*/, {}];
-                }
-                _a.label = 1;
-            case 1:
-                _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, (0, exports.getEnvironment)(env, componentName)];
-            case 2:
-                envionment = _a.sent();
-                // in the pipeline the secrets alreadyy exists  and bash will expand them
-                // but here we need to manually load them
-                return [2 /*return*/, resolveSecrets(vorpal, [
-                        {
-                            envVars: envionment.envVars,
-                            secretEnvVarKeys: envionment.secretEnvVarKeys,
-                        },
-                    ])];
-            case 3:
-                e_2 = _a.sent();
-                // env is disabled
-                return [2 /*return*/, {}];
-            case 4: return [2 /*return*/];
-        }
-    });
-}); };
+const resolveSecrets = async (vorpal, varSets) => {
+    const allVariablesInGitlab = await (0, gitlab_1.getAllVariables)(vorpal);
+    return Object.fromEntries(varSets.flatMap(({ envVars, secretEnvVarKeys }) => Object.entries(envVars)
+        .filter(([key, value]) => {
+        var _a;
+        return value !== undefined &&
+            value !== null &&
+            !((_a = secretEnvVarKeys.find((k) => k.key === key)) === null || _a === void 0 ? void 0 : _a.hidden);
+    })
+        .map(([key, value]) => [
+        key,
+        allVariablesInGitlab.reduce((acc, curr) => acc.replace(new RegExp("\\$" + curr.key, "g"), curr.value), `${value}`),
+    ])));
+};
+const getEnvVarsResolved = async (vorpal, env, componentName) => {
+    if (!componentName) {
+        return {};
+    }
+    try {
+        const envionment = await (0, exports.getEnvironment)(env, componentName);
+        // in the pipeline the secrets alreadyy exists  and bash will expand them
+        // but here we need to manually load them
+        return resolveSecrets(vorpal, [
+            {
+                envVars: envionment.envVars,
+                secretEnvVarKeys: envionment.secretEnvVarKeys,
+            },
+        ]);
+    }
+    catch (e) {
+        // env is disabled
+        return {};
+    }
+};
 exports.getEnvVarsResolved = getEnvVarsResolved;
 /**
  *
  * is used to get job only vars that should also be editable locally with catladder.
  */
-var getJobOnlyEnvVarsResolved = function (vorpal, env, componentName) { return __awaiter(void 0, void 0, void 0, function () {
-    var envionment, e_3;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, (0, exports.getEnvironment)(env, componentName)];
-            case 1:
-                envionment = _a.sent();
-                return [2 /*return*/, resolveSecrets(vorpal, [
-                        envionment.jobOnlyVars.build,
-                        envionment.jobOnlyVars.deploy,
-                    ])];
-            case 2:
-                e_3 = _a.sent();
-                // env is disabled
-                return [2 /*return*/, {}];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
+const getJobOnlyEnvVarsResolved = async (vorpal, env, componentName) => {
+    try {
+        const envionment = await (0, exports.getEnvironment)(env, componentName);
+        return resolveSecrets(vorpal, [
+            envionment.jobOnlyVars.build,
+            envionment.jobOnlyVars.deploy,
+        ]);
+    }
+    catch (e) {
+        // env is disabled
+        return {};
+    }
+};
 exports.getJobOnlyEnvVarsResolved = getJobOnlyEnvVarsResolved;
 //# sourceMappingURL=getProjectConfig.js.map

package/dist/cli/src/config/getProjectConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":";;;AACA,kDAM6B;AAG7B,4CAA6E;AAE7E,gDAA+C;AAE/C,2BAA2B;AAE3B,6CAA4C;AAAnC,0GAAA,WAAW,OAAA;AAEpB,IAAI,aAAa,GAAkB,IAAI,CAAC;AAExC,8BAA8B;AAC9B,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IACxC,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,wCAAwC;QACxC,OAAO;IACT,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,OAAO,GAAG,IAAA,UAAK,EAAC,IAAI,EAAE,GAAG,EAAE;QAC/B,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,sBAAsB,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,aAAa,GAAG,MAAM,CAAC;AACzB,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACzC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,YAAY;QACZ,MAAM,sBAAsB,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,aAAuB,CAAC;AACjC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,MAAM,0BAA0B,GAAG,KAAK,EAC7C,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,OAAO,MAAM,IAAA,iCAAsB,EAAC;QAClC,MAAM;QACN,aAAa;QACb,GAAG;KACJ,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,0BAA0B,8BAUrC;AACK,MAAM,+BAA+B,GAAG,KAAK,IAElD,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,CAC9D,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CACzE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAEK,MAAM,uCAAuC,GAAG,KAAK,IAEzD,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC;QACpD,aAAa;QACb,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC;KAClC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,uCAAuC,2CAclD;AAEK,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC/C,OAAO,OAAO,CAAC,GAAG,CAChB,CAAC,MAAM,IAAA,uCAA+B,GAAE,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC;SAChC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAC9B,IAAA,kCAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,CAC/C,CACJ,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,sBAAsB,0BAQjC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,GAAW,EAAE,aAAqB,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IAExC,OAAO,IAAA,yBAAe,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAuB,EACvB,GAAW,EACX,aAAqB,EACrB,YAAoB,EACpB,EAAE;IACF,MAAM,eAAe,GAAG,IAAA,2BAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IAC3E,OAAO,MAAM,IAAA,kCAAyB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAClE,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,MAA8B,EAC9B,OAA6B,EACI,EAAE;IACnC,MAAM,oBAAoB,GAAG,MAAM,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC;IAE3D,OAAO,MAAM,CAAC,WAAW,CACvB,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAChD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACpB,MAAM,CACL,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;QACf,OAAA,KAAK,KAAK,SAAS;YACnB,KAAK,KAAK,IAAI;YACd,CAAC,CAAA,MAAA,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,0CAAE,MAAM,CAAA,CAAA;KAAA,CACvD;SACA,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACrB,GAAG;QACH,oBAAoB,CAAC,MAAM,CACzB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACZ,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAC5D,GAAG,KAAK,EAAE,CACX;KACF,CAAC,CACL,CACF,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAA8B,EAC9B,GAAW,EACX,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAE5D,yEAAyE;QACzE,yCAAyC;QACzC,OAAO,cAAc,CAAC,MAAM,EAAE;YAC5B;gBACE,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;aAC9C;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,kBAAkB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B;AAEF;;;GAGG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC5C,MAAuB,EACvB,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC5D,OAAO,cAAc,CAAC,MAAM,EAAE;YAC5B,UAAU,CAAC,WAAW,CAAC,KAAK;YAC5B,UAAU,CAAC,WAAW,CAAC,MAAM;SAC9B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,kBAAkB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,yBAAyB,6BAepC"}