@catladder/cli 1.164.0 → 1.165.1

package/dist/pipeline/src/context/resolveReferences.js

@@ -1,185 +1,64 @@
 "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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translateLegacyFromComponents = exports.resolveReferences = void 0;
-var lodash_1 = require("lodash");
-var replaceAsync_1 = __importDefault(require("../bash/replaceAsync"));
+const lodash_1 = require("lodash");
+const replaceAsync_1 = __importDefault(require("../bash/replaceAsync"));
 // regex to resolve references in catladder variables
 // those expressions have the pattern ${componentName:variableName}
-var REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
-var resolveReferences = function (vars_1, getOtherVariables_1) {
-    var args_1 = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        args_1[_i - 2] = arguments[_i];
-    }
-    return __awaiter(void 0, __spreadArray([vars_1, getOtherVariables_1], __read(args_1), false), void 0, function (vars, getOtherVariables, alreadyVisitedBase) {
-        var replaceSingleValue, _a, _b;
-        if (alreadyVisitedBase === void 0) { alreadyVisitedBase = {}; }
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    replaceSingleValue = function (value_1) {
-                        var args_1 = [];
-                        for (var _i = 1; _i < arguments.length; _i++) {
-                            args_1[_i - 1] = arguments[_i];
-                        }
-                        return __awaiter(void 0, __spreadArray([value_1], __read(args_1), false), void 0, function (value, alreadyVisited) {
-                            if (alreadyVisited === void 0) { alreadyVisited = alreadyVisitedBase; }
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        if (!REGEX.test(value.toString())) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, (0, replaceAsync_1.default)(value, REGEX, function (match, _, componentName, variableName) { return __awaiter(void 0, void 0, void 0, function () {
-                                                var newAlreadyVisited, result, _a, replaced, _b;
-                                                var _c, _d;
-                                                var _e, _f;
-                                                return __generator(this, function (_g) {
-                                                    switch (_g.label) {
-                                                        case 0:
-                                                            if ((_e = alreadyVisited[componentName]) === null || _e === void 0 ? void 0 : _e[variableName]) {
-                                                                return [2 /*return*/, match]; // prevent endless loop
-                                                            }
-                                                            newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, (_c = {},
-                                                                _c[componentName] = (_d = {},
-                                                                    _d[variableName] = true,
-                                                                    _d),
-                                                                _c));
-                                                            if (!componentName) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, (getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, newAlreadyVisited).then(function (r) { return r === null || r === void 0 ? void 0 : r[variableName]; }))];
-                                                        case 1:
-                                                            _a = (_f = (_g.sent())) !== null && _f !== void 0 ? _f : null;
-                                                            return [3 /*break*/, 3];
-                                                        case 2:
-                                                            _a = vars[variableName];
-                                                            _g.label = 3;
-                                                        case 3:
-                                                            result = _a;
-                                                            if (!(result !== null && result !== undefined)) return [3 /*break*/, 5];
-                                                            return [4 /*yield*/, replaceSingleValue(result, newAlreadyVisited)];
-                                                        case 4:
-                                                            _b = _g.sent();
-                                                            return [3 /*break*/, 6];
-                                                        case 5:
-                                                            _b = match;
-                                                            _g.label = 6;
-                                                        case 6:
-                                                            replaced = _b;
-                                                            return [2 /*return*/, replaced];
-                                                    }
-                                                });
-                                            }); })];
-                                    case 1: 
-                                    // we consider variables that got references in it  BashExpressions, because the replacement may be one
-                                    return [2 /*return*/, _a.sent()];
-                                    case 2: return [2 /*return*/, value];
-                                }
-                            });
-                        });
-                    };
-                    _b = (_a = Object).fromEntries;
-                    return [4 /*yield*/, Promise.all(Object.entries(vars).map(function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-                            var _c, _d;
-                            var _e = __read(_b, 2), key = _e[0], value = _e[1];
-                            return __generator(this, function (_f) {
-                                switch (_f.label) {
-                                    case 0:
-                                        if (value === null || value === undefined) {
-                                            return [2 /*return*/, [key, null]];
-                                        }
-                                        _c = [key];
-                                        if (!(value !== null && value !== undefined)) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, replaceSingleValue(value)];
-                                    case 1:
-                                        _d = _f.sent();
-                                        return [3 /*break*/, 3];
-                                    case 2:
-                                        _d = null;
-                                        _f.label = 3;
-                                    case 3: return [2 /*return*/, _c.concat([
-                                            _d
-                                        ])];
-                                }
-                            });
-                        }); }))];
-                case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
-            }
-        });
-    });
+const REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
+const resolveReferences = async (vars, getOtherVariables, alreadyVisitedBase = {}) => {
+    /**
+     *
+     * replace referenced variables with their values in a value string
+     */
+    const replaceSingleValue = async (value, alreadyVisited = alreadyVisitedBase) => {
+        if (REGEX.test(value.toString())) {
+            // we consider variables that got references in it  BashExpressions, because the replacement may be one
+            return await (0, replaceAsync_1.default)(value, REGEX, async (match, _, componentName, variableName) => {
+                var _a, _b;
+                if ((_a = alreadyVisited[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) {
+                    return match; // prevent endless loop
+                }
+                const newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, {
+                    [componentName]: {
+                        [variableName]: true,
+                    },
+                });
+                const result = componentName
+                    ? (_b = (await (getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, newAlreadyVisited).then((r) => r === null || r === void 0 ? void 0 : r[variableName])))) !== null && _b !== void 0 ? _b : null
+                    : vars[variableName]; // is self reference
+                const replaced = result !== null && result !== undefined
+                    ? await replaceSingleValue(result, newAlreadyVisited)
+                    : match;
+                return replaced;
+            });
+        }
+        else {
+            return value;
+        }
+    };
+    return Object.fromEntries(await Promise.all(Object.entries(vars).map(async ([key, value]) => {
+        if (value === null || value === undefined) {
+            return [key, null];
+        }
+        return [
+            key,
+            value !== null && value !== undefined
+                ? await replaceSingleValue(value)
+                : null,
+        ];
+    })));
 };
 exports.resolveReferences = resolveReferences;
-var translateLegacyFromComponents = function (fromComponents) {
-    return Object.fromEntries(Object.entries(fromComponents).flatMap(function (_a) {
-        var _b = __read(_a, 2), componentName = _b[0], variables = _b[1];
-        return Object.entries(variables).map(function (_a) {
-            var _b = __read(_a, 2), ourName = _b[0], otherName = _b[1];
-            return [
-                ourName,
-                "${" + componentName + ":" + otherName + "}",
-            ];
-        });
+const translateLegacyFromComponents = (fromComponents) => {
+    return Object.fromEntries(Object.entries(fromComponents).flatMap(([componentName, variables]) => {
+        return Object.entries(variables).map(([ourName, otherName]) => [
+            ourName,
+            "${" + componentName + ":" + otherName + "}",
+        ]);
     }));
 };
 exports.translateLegacyFromComponents = translateLegacyFromComponents;

package/dist/pipeline/src/context/resolveReferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/resolveReferences.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveReferences.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/resolveReferences.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/context/transformJobOnlyVars.js

@@ -1,54 +1,7 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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.transformJobOnlyVars = void 0;
-var envVars_1 = require("./utils/envVars");
+const envVars_1 = require("./utils/envVars");
 /**
  * transform EnvVars for environment.
  *
@@ -56,27 +9,27 @@ var envVars_1 = require("./utils/envVars");
  * @param vars
  * @returns
  */
-var transformJobOnlyVars = function (env, componentName, vars) { return __awaiter(void 0, void 0, void 0, function () {
-    var publicVars, secretEnvVarKeys, deployJobOnlySecretEnvVars, envVars;
+const transformJobOnlyVars = async (env, componentName, vars) => {
     var _a, _b;
-    return __generator(this, function (_c) {
-        if (!vars) {
-            return [2 /*return*/, {
-                    envVars: {},
-                    secretEnvVarKeys: [],
-                }];
-        }
-        publicVars = (0, envVars_1.stringifyValues)((_a = vars === null || vars === void 0 ? void 0 : vars.public) !== null && _a !== void 0 ? _a : {});
-        secretEnvVarKeys = (0, envVars_1.stringListToSecreteEnvVarList)((_b = vars === null || vars === void 0 ? void 0 : vars.secret) !== null && _b !== void 0 ? _b : []);
-        deployJobOnlySecretEnvVars = (vars === null || vars === void 0 ? void 0 : vars.secret)
-            ? (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys)
-            : {};
-        envVars = __assign(__assign({}, deployJobOnlySecretEnvVars), publicVars);
-        return [2 /*return*/, {
-                envVars: envVars,
-                secretEnvVarKeys: secretEnvVarKeys,
-            }];
-    });
-}); };
+    if (!vars) {
+        return {
+            envVars: {},
+            secretEnvVarKeys: [],
+        };
+    }
+    const publicVars = (0, envVars_1.stringifyValues)((_a = vars === null || vars === void 0 ? void 0 : vars.public) !== null && _a !== void 0 ? _a : {});
+    const secretEnvVarKeys = (0, envVars_1.stringListToSecreteEnvVarList)((_b = vars === null || vars === void 0 ? void 0 : vars.secret) !== null && _b !== void 0 ? _b : []);
+    const deployJobOnlySecretEnvVars = (vars === null || vars === void 0 ? void 0 : vars.secret)
+        ? (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys)
+        : {};
+    const envVars = {
+        ...deployJobOnlySecretEnvVars,
+        ...publicVars,
+    };
+    return {
+        envVars,
+        secretEnvVarKeys,
+    };
+};
 exports.transformJobOnlyVars = transformJobOnlyVars;
 //# sourceMappingURL=transformJobOnlyVars.js.map

package/dist/pipeline/src/context/transformJobOnlyVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformJobOnlyVars.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/transformJobOnlyVars.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,2CAIyB;AAEzB;;;;;;GAMG;AACI,IAAM,oBAAoB,GAAG,UAClC,GAAW,EACX,aAAqB,EACrB,IAAoB;;;;QAKpB,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,sBAAO;oBACL,OAAO,EAAE,EAAE;oBACX,gBAAgB,EAAE,EAAE;iBACrB,EAAC;QACJ,CAAC;QAEK,UAAU,GAAG,IAAA,yBAAe,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;QACjD,gBAAgB,GAAG,IAAA,uCAA6B,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;QACrE,0BAA0B,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;YAC7C,CAAC,CAAC,IAAA,iCAAuB,EAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,CAAC;YAC/D,CAAC,CAAC,EAAE,CAAC;QAED,OAAO,yBACR,0BAA0B,GAC1B,UAAU,CACd,CAAC;QACF,sBAAO;gBACL,OAAO,SAAA;gBACP,gBAAgB,kBAAA;aACjB,EAAC;;KACH,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/B"}
+{"version":3,"file":"transformJobOnlyVars.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/transformJobOnlyVars.ts"],"names":[],"mappings":";;;AAEA,6CAIyB;AAEzB;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,KAAK,EACvC,GAAW,EACX,aAAqB,EACrB,IAAoB,EAInB,EAAE;;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,OAAO,EAAE,EAAE;YACX,gBAAgB,EAAE,EAAE;SACrB,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAA,uCAA6B,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,0BAA0B,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;QAC7C,CAAC,CAAC,IAAA,iCAAuB,EAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,CAAC;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,OAAO,GAAG;QACd,GAAG,0BAA0B;QAC7B,GAAG,UAAU;KACd,CAAC;IACF,OAAO;QACL,OAAO;QACP,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/B"}

package/dist/pipeline/src/context/utils/envVars.js

@@ -1,47 +1,21 @@
 "use strict";
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSecretEnvVarMapping = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
-var lodash_1 = require("lodash");
-var getEnvironmentVariables_1 = require("../getEnvironmentVariables");
-var BashExpression_1 = require("../../bash/BashExpression");
-var stringifyValues = function (obj) {
-    return Object.fromEntries(Object.entries(obj).map(function (_a) {
-        var _b = __read(_a, 2), key = _b[0], value = _b[1];
-        return [
-            key,
-            (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value),
-        ];
-    }));
-};
+const lodash_1 = require("lodash");
+const getEnvironmentVariables_1 = require("../getEnvironmentVariables");
+const BashExpression_1 = require("../../bash/BashExpression");
+const stringifyValues = (obj) => Object.fromEntries(Object.entries(obj).map(([key, value]) => [
+    key,
+    (0, lodash_1.isObject)(value) ? JSON.stringify(value) : `${value}`,
+]));
 exports.stringifyValues = stringifyValues;
-var stringListToSecreteEnvVarList = function (keys) {
-    return keys.map(function (key) { return ({ key: key }); });
-};
+const stringListToSecreteEnvVarList = (keys) => keys.map((key) => ({ key }));
 exports.stringListToSecreteEnvVarList = stringListToSecreteEnvVarList;
-var makeSecretEnvVarMapping = function (env, componentName, secretEnvVars) {
-    return Object.fromEntries(secretEnvVars.map(function (_a) {
-        var key = _a.key;
-        return [
-            key,
-            (0, BashExpression_1.getBashVariable)((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key)),
-        ];
-    }));
+const makeSecretEnvVarMapping = (env, componentName, secretEnvVars) => {
+    return Object.fromEntries(secretEnvVars.map(({ key }) => [
+        key,
+        (0, BashExpression_1.getBashVariable)((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key)),
+    ]));
 };
 exports.makeSecretEnvVarMapping = makeSecretEnvVarMapping;
 //# sourceMappingURL=envVars.js.map

package/dist/pipeline/src/context/utils/envVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAAkC;AAElC,sEAA8D;AAC9D,4DAA4D;AAErD,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA;YACxC,GAAG;YACH,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAG,KAAK,CAAE;SACrD;IAHyC,CAGzC,CAAC,CACH;AALD,CAKC,CAAC;AANS,QAAA,eAAe,mBAMxB;AAEG,IAAM,6BAA6B,GAAG,UAAC,IAAc;IAC1D,OAAA,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC,EAAE,GAAG,KAAA,EAAE,CAAC,EAAT,CAAS,CAAC;AAA5B,CAA4B,CAAC;AADlB,QAAA,6BAA6B,iCACX;AACxB,IAAM,uBAAuB,GAAG,UACrC,GAAW,EACX,aAAqB,EACrB,aAA6B;IAE7B,OAAO,MAAM,CAAC,WAAW,CACvB,aAAa,CAAC,GAAG,CAAC,UAAC,EAAO;YAAL,GAAG,SAAA;QAAO,OAAA;YAC7B,GAAG;YACH,IAAA,gCAAe,EAAC,IAAA,0CAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SAC3D;IAH8B,CAG9B,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}
+{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAElC,wEAA8D;AAC9D,8DAA4D;AAErD,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACxC,GAAG;IACH,IAAA,iBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;CACrD,CAAC,CACH,CAAC;AANS,QAAA,eAAe,mBAMxB;AAEG,MAAM,6BAA6B,GAAG,CAAC,IAAc,EAAkB,EAAE,CAC9E,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AADlB,QAAA,6BAA6B,iCACX;AACxB,MAAM,uBAAuB,GAAG,CACrC,GAAW,EACX,aAAqB,EACrB,aAA6B,EAC7B,EAAE;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAC7B,GAAG;QACH,IAAA,gCAAe,EAAC,IAAA,0CAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KAC3D,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}

package/dist/pipeline/src/deploy/base/deploy.js

@@ -1,69 +1,33 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
-var docker_1 = require("../../build/docker");
-var sbom_1 = require("../../build/sbom");
-var context_1 = require("../../types/context");
-var sbom_2 = require("../sbom");
-var utils_1 = require("../utils");
-var stop_1 = require("./stop");
-var variables_1 = require("./variables");
+const docker_1 = require("../../build/docker");
+const sbom_1 = require("../../build/sbom");
+const context_1 = require("../../types/context");
+const sbom_2 = require("../sbom");
+const utils_1 = require("../utils");
+const stop_1 = require("./stop");
+const variables_1 = require("./variables");
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
-var createDeployJob = function (context, jobDefinition) {
+const createDeployJob = (context, jobDefinition) => {
     var _a, _b, _c, _d, _e, _f, _g;
-    var hasDocker = (0, docker_1.requiresDockerBuild)(context);
-    var isStoppable = (0, utils_1.contextIsStoppable)(context);
-    var autoStop = context.environment.envType === "review"
+    const hasDocker = (0, docker_1.requiresDockerBuild)(context);
+    const isStoppable = (0, utils_1.contextIsStoppable)(context);
+    const autoStop = context.environment.envType === "review"
         ? "1 week"
         : context.environment.envType === "dev"
             ? "4 weeks"
             : undefined;
-    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     // if auto or manual is configured explicitly, use that
-    var whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.when : undefined;
+    const whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.when : undefined;
     // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
-    var whenDeployDefault = context.environment.envType !== "prod"
+    const whenDeployDefault = context.environment.envType !== "prod"
         ? "auto" // is not stage, auto deploy
         : ((_b = context.componentConfig.env) === null || _b === void 0 ? void 0 : _b.stage) === false
             ? "auto" // is prod, but no staging, auto deploy
             : "manual"; // manually deploy
-    var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
+    const whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
     return {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
@@ -72,39 +36,43 @@ var createDeployJob = function (context, jobDefinition) {
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env
-        needs: __spreadArray(__spreadArray([], __read(((0, sbom_2.sbomDeactivated)(context)
-            ? []
-            : [{ job: sbom_1.SBOM_BUILD_JOB_NAME, artifacts: true }])), false), __read((deployConfig
-            ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) { return ({
-                componentName: c,
-                job: exports.DEPLOY_JOB_NAME,
-                artifacts: false,
-            }); })) !== null && _d !== void 0 ? _d : []
-            : [])), false),
+        needs: [
+            ...((0, sbom_2.sbomDeactivated)(context)
+                ? []
+                : [{ job: sbom_1.SBOM_BUILD_JOB_NAME, artifacts: true }]),
+            ...(deployConfig
+                ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map((c) => ({
+                    componentName: c,
+                    job: exports.DEPLOY_JOB_NAME,
+                    artifacts: false,
+                }))) !== null && _d !== void 0 ? _d : []
+                : []),
+        ],
         // we don't want to deploy when there is a broken test
-        needsStages: __spreadArray(__spreadArray([], __read(((0, context_1.componentContextHasWorkspaceBuild)(context)
-            ? hasDocker // docker build is per component,
-                ? [
-                    // we don't need artifacts, but have to wait for the component build
-                    {
-                        stage: "build",
-                        artifacts: false,
-                    },
-                ]
+        needsStages: [
+            ...((0, context_1.componentContextHasWorkspaceBuild)(context)
+                ? hasDocker // docker build is per component,
+                    ? [
+                        // we don't need artifacts, but have to wait for the component build
+                        {
+                            stage: "build",
+                            artifacts: false,
+                        },
+                    ]
+                    : [
+                        {
+                            // pick build artifacts from workspace build
+                            stage: "build",
+                            artifacts: true,
+                            workspaceName: context.build.workspaceName,
+                        },
+                    ]
                 : [
                     {
-                        // pick build artifacts from workspace build
                         stage: "build",
-                        artifacts: true,
-                        workspaceName: context.build.workspaceName,
+                        artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
                     },
-                ]
-            : [
-                {
-                    stage: "build",
-                    artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
-                },
-            ])), false), [
+                ]),
             {
                 stage: "test",
                 artifacts: false,
@@ -113,12 +81,22 @@ var createDeployJob = function (context, jobDefinition) {
                     ? context.build.workspaceName
                     : undefined,
             },
-        ], false),
+        ],
         when: whenDeploy === "auto" ? "on_success" : "manual",
         allow_failure: whenDeploy === "manual" ? true : false,
         stage: "deploy",
-        variables: __assign(__assign(__assign(__assign(__assign({}, context.environment.envVars), (hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {})), context.environment.jobOnlyVars.deploy.envVars), (deployConfig ? (_e = deployConfig.extraVars) !== null && _e !== void 0 ? _e : {} : {})), jobDefinition.variables),
-        runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), ((_f = jobDefinition.runnerVariables) !== null && _f !== void 0 ? _f : {})), (deployConfig ? (_g = deployConfig.runnerVariables) !== null && _g !== void 0 ? _g : {} : {})),
+        variables: {
+            ...context.environment.envVars,
+            ...(hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}),
+            ...context.environment.jobOnlyVars.deploy.envVars,
+            ...(deployConfig ? (_e = deployConfig.extraVars) !== null && _e !== void 0 ? _e : {} : {}),
+            ...jobDefinition.variables,
+        },
+        runnerVariables: {
+            ...variables_1.DEPLOY_RUNNER_VARIABLES,
+            ...((_f = jobDefinition.runnerVariables) !== null && _f !== void 0 ? _f : {}),
+            ...(deployConfig ? (_g = deployConfig.runnerVariables) !== null && _g !== void 0 ? _g : {} : {}),
+        },
         environment: isStoppable
             ? {
                 on_stop: stop_1.STOP_JOB_NAME,