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

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.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition } from "../../types";
+import { type ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services" | "runnerVariables">;
 export declare const createDeployJob: (context: ComponentContext, jobDefinition: DeployJobDefinition) => CatladderJob;

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

@@ -1,101 +1,105 @@
 "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 sbom_2 = require("../sbom");
-var utils_1 = require("../utils");
-var stop_1 = require("./stop");
-var variables_1 = require("./variables");
+const createJobCache_1 = require("../../build/cache/createJobCache");
+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,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         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: [
-            {
-                stage: "build",
-                artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
-            },
+            ...((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,
+                        },
+                    ]
+                : [
+                    {
+                        stage: "build",
+                        artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
+                    },
+                ]),
             {
                 stage: "test",
                 artifacts: false,
+                // use test from workspace build
+                workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context)
+                    ? context.build.workspaceName
+                    : undefined,
             },
-        ], // workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/220758
+        ],
         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,

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

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

package/dist/pipeline/src/deploy/base/index.d.ts

@@ -1,8 +1,6 @@
 import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition, RollbackJobDefinition, StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { type DeployJobDefinition } from "./deploy";
-import { type RollbackJobDefinition } from "./rollback";
-import { type StopJobDefinition } from "./stop";
 export declare const createDeployementJobs: (context: ComponentContext, definitions: {
     deploy: DeployJobDefinition;
     stop?: StopJobDefinition;

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

@@ -1,40 +1,17 @@
 "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;
-};
-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.createDeployementJobs = void 0;
-var deploy_1 = require("./deploy");
-var rollback_1 = require("./rollback");
-var stop_1 = require("./stop");
-var createDeployementJobs = function (context, definitions) {
-    return __spreadArray(__spreadArray([
-        (0, deploy_1.createDeployJob)(context, definitions.deploy)
-    ], __read((definitions.stop ? [(0, stop_1.createStopJob)(context, definitions.stop)] : [])), false), __read((definitions.rollback
-        ? [(0, rollback_1.createRollbackJob)(context, definitions.rollback)]
-        : [])), false);
+const deploy_1 = require("./deploy");
+const rollback_1 = require("./rollback");
+const stop_1 = require("./stop");
+const createDeployementJobs = (context, definitions) => {
+    return [
+        (0, deploy_1.createDeployJob)(context, definitions.deploy),
+        ...(definitions.stop ? [(0, stop_1.createStopJob)(context, definitions.stop)] : []),
+        ...(definitions.rollback
+            ? [(0, rollback_1.createRollbackJob)(context, definitions.rollback)]
+            : []),
+    ];
 };
 exports.createDeployementJobs = createDeployementJobs;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mCAAqE;AACrE,uCAA2E;AAC3E,+BAA+D;AAExD,IAAM,qBAAqB,GAAG,UACnC,OAAyB,EACzB,WAIC;IAED;QACE,IAAA,wBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;cACzC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAa,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACpE,CAAC,WAAW,CAAC,QAAQ;QACtB,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/index.ts"],"names":[],"mappings":";;;AAOA,qCAA2C;AAC3C,yCAA+C;AAC/C,iCAAuC;AAEhC,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACzB,WAIC,EACe,EAAE;IAClB,OAAO;QACL,IAAA,wBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;QAC5C,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAa,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,WAAW,CAAC,QAAQ;YACtB,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}

package/dist/pipeline/src/deploy/base/rollback.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { RollbackJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "runnerVariables" | "image">;
 export declare const createRollbackJob: (context: ComponentContext, jobDefinition: RollbackJobDefinition) => CatladderJob;

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

@@ -1,20 +1,9 @@
 "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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
-var variables_1 = require("./variables");
+const variables_1 = require("./variables");
 exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
-var createRollbackJob = function (context, jobDefinition) {
+const createRollbackJob = (context, jobDefinition) => {
     var _a;
     return {
         name: exports.ROLLBACK_JOB_NAME,
@@ -23,8 +12,15 @@ var createRollbackJob = function (context, jobDefinition) {
         needs: [], // can be executed even if the deploy job failed
         allow_failure: true,
         when: "manual",
-        variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
-        runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), { GIT_STRATEGY: "none" }), ((_a = jobDefinition.runnerVariables) !== null && _a !== void 0 ? _a : {})),
+        variables: {
+            ...context.environment.jobOnlyVars.deploy.envVars,
+            ...jobDefinition.variables,
+        },
+        runnerVariables: {
+            ...variables_1.DEPLOY_RUNNER_VARIABLES,
+            GIT_STRATEGY: "none",
+            ...((_a = jobDefinition.runnerVariables) !== null && _a !== void 0 ? _a : {}),
+        },
         stage: "rollback",
         environment: {
             action: "access",

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

@@ -1 +1 @@
-{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/rollback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,yCAAsD;AAEzC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AAM3C,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,aAAoC;;IAEpC,OAAO;QACL,IAAI,EAAE,yBAAiB;QACvB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ;QACd,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,GAC9C,aAAa,CAAC,SAAS,CAC3B;QACD,eAAe,iCACV,mCAAuB,KAC1B,YAAY,EAAE,MAAM,KACjB,CAAC,MAAA,aAAa,CAAC,eAAe,mCAAI,EAAE,CAAC,CACzC;QACD,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QAED,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}
+{"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/rollback.ts"],"names":[],"mappings":";;;AAGA,2CAAsD;AAEzC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AAE3C,MAAM,iBAAiB,GAAG,CAC/B,OAAyB,EACzB,aAAoC,EACtB,EAAE;;IAChB,OAAO;QACL,IAAI,EAAE,yBAAiB;QACvB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,CAAC,MAAA,aAAa,CAAC,eAAe,mCAAI,EAAE,CAAC;SACzC;QACD,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QAED,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}

package/dist/pipeline/src/deploy/base/stop.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "runnerVariables">;
 export declare const createStopJob: (context: ComponentContext, jobDefinition: StopJobDefinition) => CatladderJob;

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

@@ -1,20 +1,9 @@
 "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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStopJob = exports.STOP_JOB_NAME = void 0;
-var variables_1 = require("./variables");
+const variables_1 = require("./variables");
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
-var createStopJob = function (context, jobDefinition) {
+const createStopJob = (context, jobDefinition) => {
     return {
         name: exports.STOP_JOB_NAME,
         image: jobDefinition.image,
@@ -28,8 +17,15 @@ var createStopJob = function (context, jobDefinition) {
                 when: "on_success",
             },
         ],
-        variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
-        runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), { GIT_STRATEGY: "none" }), jobDefinition.runnerVariables),
+        variables: {
+            ...context.environment.jobOnlyVars.deploy.envVars,
+            ...jobDefinition.variables,
+        },
+        runnerVariables: {
+            ...variables_1.DEPLOY_RUNNER_VARIABLES,
+            GIT_STRATEGY: "none",
+            ...jobDefinition.runnerVariables,
+        },
         stage: "stop",
         environment: {
             action: "stop",

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

@@ -1 +1 @@
-{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,yCAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;AAMnC,IAAM,aAAa,GAAG,UAC3B,OAAyB,EACzB,aAAgC;IAEhC,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,KAAK,EAAE;YACL;gBACE,EAAE,EAAE,kDAAkD,EAAE,+BAA+B;gBACvF,IAAI,EAAE,YAAY;aACnB;SACF;QACD,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,GAC9C,aAAa,CAAC,SAAS,CAC3B;QACD,eAAe,iCACV,mCAAuB,KAC1B,YAAY,EAAE,MAAM,KACjB,aAAa,CAAC,eAAe,CACjC;QACD,KAAK,EAAE,MAAM;QACb,WAAW,EAAE;YACX,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,aAAa,iBAgCxB"}
+{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;AAIA,2CAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,aAAa,GAAG,CAC3B,OAAyB,EACzB,aAAgC,EAClB,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,KAAK,EAAE;YACL;gBACE,EAAE,EAAE,kDAAkD,EAAE,+BAA+B;gBACvF,IAAI,EAAE,YAAY;aACnB;SACF;QACD,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,aAAa,CAAC,eAAe;SACjC;QACD,KAAK,EAAE,MAAM;QACb,WAAW,EAAE;YACX,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,aAAa,iBAgCxB"}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEPLOY_RUNNER_VARIABLES = void 0;
 exports.DEPLOY_RUNNER_VARIABLES = {
-    KUBERNETES_CPU_REQUEST: "0.5",
+    KUBERNETES_CPU_REQUEST: "0.22",
     KUBERNETES_MEMORY_REQUEST: "200Mi",
     KUBERNETES_MEMORY_LIMIT: "400Mi",
 };

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

@@ -1 +1 @@
-{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/variables.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG;IACrC,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,OAAO;IAClC,uBAAuB,EAAE,OAAO;CACjC,CAAC"}
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/variables.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG;IACrC,sBAAsB,EAAE,MAAM;IAC9B,yBAAyB,EAAE,OAAO;IAClC,uBAAuB,EAAE,OAAO;CACjC,CAAC"}