@catladder/pipeline 1.144.1 → 1.146.0

package/dist/context/getReviewSlug.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReviewSlug = void 0;
+var BashExpression_1 = require("../bash/BashExpression");
+var bashExpressionPerPipelineType_1 = require("../bash/bashExpressionPerPipelineType");
+var getEnvType_1 = require("./getEnvType");
+var REVIEW_SLUG = {
+  default: "unknown-review-slug",
+  gitlab: new BashExpression_1.BashExpression("$([ -n \"$CI_MERGE_REQUEST_IID\" ] && echo \"mr$CI_MERGE_REQUEST_IID\" || { [ -n \"$CI_COMMIT_REF_SLUG\" ] && echo \"$CI_COMMIT_REF_SLUG\" || echo \"unknown\"; })")
+};
+var getReviewSlug = function (envConfig, env, pipelineType) {
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
+  if (envType === "review") {
+    return (0, bashExpressionPerPipelineType_1.getBashExpressionPerPipelineType)(REVIEW_SLUG, pipelineType);
+  }
+  return null; // not a review app;
+};
+
+exports.getReviewSlug = getReviewSlug;

package/dist/context/index.d.ts

@@ -1,5 +1,14 @@
-import type { Config } from "../types/config";
-import type { CommitInfo, Context } from "../types/context";
+import type { PipelineType } from "../types";
+import type { Config, PipelineTrigger } from "../types/config";
+import type { Context, PackageManagerInfo } from "../types/context";
 export * from "./getEnvironment";
 export * from "./getEnvironmentVariables";
-export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, packageManagerInfo?: import("../types/context").YarnPackageManagerInfo | undefined) => Promise<Context>;
+export type CreateContextContext = {
+  config: Config;
+  componentName: string;
+  env: string;
+  pipelineType?: PipelineType;
+  trigger?: PipelineTrigger;
+  packageManagerInfo?: PackageManagerInfo;
+};
+export declare const createContext: (ctx: CreateContextContext) => Promise<Context>;

package/dist/context/index.js

@@ -2,12 +2,16 @@
 
 var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function () {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
 } : function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   o[k2] = m[k];
@@ -70,7 +74,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    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]) {
@@ -130,7 +134,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createContext = void 0;
 var build_1 = require("../build");
 var deploy_1 = require("../deploy");
@@ -139,17 +145,17 @@ var getEnvironment_1 = require("./getEnvironment");
 var getEnvironmentContext_1 = require("./getEnvironmentContext");
 __exportStar(require("./getEnvironment"), exports);
 __exportStar(require("./getEnvironmentVariables"), exports);
-var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
+var createContext = function (ctx) {
   return __awaiter(void 0, void 0, void 0, function () {
     var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
     var _a;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
-          if (!/^[a-z0-9-]+$/.test(componentName)) {
+          if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
             throw new Error("componentName may only contain lower case letters, numbers and -");
           }
-          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
           componentConfigWithoutDefaults = envContext.envConfigRaw;
           defaults = componentConfigWithoutDefaults.deploy ? {
             build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(envContext),
@@ -160,13 +166,13 @@ var createContext = function (config, componentName, env, commitInfo, packageMan
           };
           componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
           _a = {
-            fullConfig: config,
+            fullConfig: ctx.config,
             componentConfig: componentConfig,
-            componentName: componentName
+            componentName: ctx.componentName
           };
-          return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(config, componentName, env, commitInfo)];
+          return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(ctx)];
         case 1:
-          return [2 /*return*/, (_a.environment = _b.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
+          return [2 /*return*/, (_a.environment = _b.sent(), _a.packageManagerInfo = ctx.packageManagerInfo, _a.pipelineType = ctx.pipelineType, _a.trigger = ctx.trigger, _a)];
       }
     });
   });

package/dist/context/resolveReferences.d.ts

@@ -1,4 +1,6 @@
-export declare const resolveReferences: (vars: Record<string, string>, getOtherVariables?: ((componentName: string, alreadyVisited: Record<string, Record<string, boolean>>) => Promise<Record<string, string | null>>) | undefined, alreadyVisitedBase?: Record<string, Record<string, boolean>>) => Promise<Record<string, string>>;
+import type { BashExpression } from "../bash/BashExpression";
+import type { UnspecifiedEnvVars } from "..";
+export declare const resolveReferences: (vars: Record<string, string | BashExpression | undefined | null>, getOtherVariables?: (componentName: string, alreadyVisited: Record<string, Record<string, boolean>>) => Promise<UnspecifiedEnvVars>, alreadyVisitedBase?: Record<string, Record<string, boolean>>) => Promise<Record<string, BashExpression>>;
 export declare const translateLegacyFromComponents: (fromComponents: Record<string, Record<string, string>>) => {
   [k: string]: string;
 };

package/dist/context/resolveReferences.js

@@ -55,7 +55,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    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]) {
@@ -137,35 +137,56 @@ var __read = this && this.__read || function (o, n) {
   }
   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
   };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.translateLegacyFromComponents = exports.resolveReferences = void 0;
 var lodash_1 = require("lodash");
-var string_replace_async_1 = __importDefault(require("string-replace-async"));
+var 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, getOtherVariables, alreadyVisitedBase) {
-  if (alreadyVisitedBase === void 0) {
-    alreadyVisitedBase = {};
+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, void 0, void 0, function () {
+  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, alreadyVisited) {
-            if (alreadyVisited === void 0) {
-              alreadyVisited = alreadyVisitedBase;
+          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, void 0, void 0, function () {
+            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)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, string_replace_async_1["default"])(value, REGEX, function (match, _, componentName, variableName) {
+                    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;
@@ -206,6 +227,7 @@ var resolveReferences = function (vars, getOtherVariables, alreadyVisitedBase) {
                       });
                     })];
                   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];
@@ -215,18 +237,28 @@ var resolveReferences = function (vars, getOtherVariables, alreadyVisitedBase) {
           };
           _b = (_a = Object).fromEntries;
           return [4 /*yield*/, Promise.all(Object.entries(vars).map(function (_a) {
-            var _b = __read(_a, 2),
-              key = _b[0],
-              value = _b[1];
-            return __awaiter(void 0, void 0, void 0, function () {
-              var _c;
-              return __generator(this, function (_d) {
-                switch (_d.label) {
+            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:
-                    return [2 /*return*/, _c.concat([_d.sent()])];
+                    _d = _f.sent();
+                    return [3 /*break*/, 3];
+                  case 2:
+                    _d = null;
+                    _f.label = 3;
+                  case 3:
+                    return [2 /*return*/, _c.concat([_d])];
                 }
               });
             });

package/dist/context/transformJobOnlyVars.d.ts

@@ -1,4 +1,4 @@
-import type { EnvironmentEnvVars } from "..";
+import type { SecretEnvVar, UnspecifiedEnvVars } from "..";
 import type { EnvVars } from "../types/config";
 /**
  * transform EnvVars for environment.
@@ -7,4 +7,7 @@ import type { EnvVars } from "../types/config";
  * @param vars
  * @returns
  */
-export declare const transformJobOnlyVars: (env: string, componentName: string, vars: EnvVars | null) => Promise<EnvironmentEnvVars>;
+export declare const transformJobOnlyVars: (env: string, componentName: string, vars: EnvVars | null) => Promise<{
+  envVars: UnspecifiedEnvVars;
+  secretEnvVarKeys: SecretEnvVar[];
+}>;

package/dist/context/transformJobOnlyVars.js

@@ -65,7 +65,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    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]) {
@@ -125,7 +125,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.transformJobOnlyVars = void 0;
 var envVars_1 = require("./utils/envVars");
 /**

package/dist/context/utils/envVars.d.ts

@@ -4,5 +4,5 @@ export declare const stringifyValues: (obj: Record<string, unknown>) => {
 };
 export declare const stringListToSecreteEnvVarList: (keys: string[]) => SecretEnvVar[];
 export declare const makeSecretEnvVarMapping: (env: string, componentName: string, secretEnvVars: SecretEnvVar[]) => {
-  [k: string]: string;
+  [k: string]: import("../../bash/BashExpression").BashExpression;
 };

package/dist/context/utils/envVars.js

@@ -22,10 +22,13 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+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),
@@ -46,7 +49,7 @@ exports.stringListToSecreteEnvVarList = stringListToSecreteEnvVarList;
 var makeSecretEnvVarMapping = function (env, componentName, secretEnvVars) {
   return Object.fromEntries(secretEnvVars.map(function (_a) {
     var key = _a.key;
-    return [key, "$".concat((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key))];
+    return [key, (0, BashExpression_1.getBashVariable)((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key))];
   }));
 };
 exports.makeSecretEnvVarMapping = makeSecretEnvVarMapping;

package/dist/defaults/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.BASE_RETRY = void 0;
 exports.BASE_RETRY = {
   max: 2,

package/dist/deploy/base/deploy.d.ts

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

package/dist/deploy/base/deploy.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+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");
@@ -51,7 +53,7 @@ var stop_1 = require("./stop");
 var variables_1 = require("./variables");
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 var createDeployJob = function (context, jobDefinition) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
   var autoStop = context.environment.envType === "review" ? "1 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
@@ -70,6 +72,7 @@ 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
@@ -83,23 +86,21 @@ var createDeployJob = function (context, jobDefinition) {
     // we don't want to deploy when there is a broken test
     needsStages: [{
       stage: "build",
-      artifacts: hasDocker ? false : true
+      artifacts: hasDocker ? false : true // we asume that no-docker deployments need build artifacts,
     }, {
       stage: "test",
       artifacts: false
     }],
-    rules: [whenDeploy === "auto" ? {
-      when: "on_success"
-    } : {
-      when: "manual"
-    }],
+    // 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(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}), jobDefinition.variables),
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
+    variables: __assign(__assign(__assign(__assign(__assign({}, context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), (_e = jobDefinition.runnerVariables) !== null && _e !== void 0 ? _e : {}), context.componentConfig.deploy ? (_f = context.componentConfig.deploy.runnerVariables) !== null && _f !== void 0 ? _f : {} : {}),
+    environment: isStoppable ? {
       on_stop: stop_1.STOP_JOB_NAME,
       auto_stop_in: autoStop
-    } : {}),
+    } : undefined,
     jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
   };
 };

package/dist/deploy/base/index.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createDeployementJobs = void 0;
 var deploy_1 = require("./deploy");
 var rollback_1 = require("./rollback");

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

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

package/dist/deploy/base/rollback.js

@@ -10,27 +10,31 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
 var createRollbackJob = function (context, jobDefinition) {
+  var _a;
   return {
     name: exports.ROLLBACK_JOB_NAME,
     image: jobDefinition.image,
     envMode: "stagePerEnv",
+    // makes it easier to run manual tasks er env
     needs: [],
-    rules: [{
-      when: "manual",
-      allow_failure: true
-    }],
-    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    // 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"
-    }), jobDefinition.variables),
+    }), (_a = jobDefinition.runnerVariables) !== null && _a !== void 0 ? _a : {}),
     stage: "rollback",
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
+    environment: {
       action: "access"
-    }),
+    },
     script: jobDefinition.script
   };
 };

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

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

package/dist/deploy/base/stop.js

@@ -10,7 +10,9 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createStopJob = exports.STOP_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
@@ -19,22 +21,25 @@ var createStopJob = function (context, jobDefinition) {
     name: exports.STOP_JOB_NAME,
     image: jobDefinition.image,
     envMode: "stagePerEnv",
+    // makes it easier to run manual tasks er env
     needs: [],
+    // can be executed even if the deploy job failed
+    allow_failure: true,
+    when: "manual",
+    // stop is always manual
     rules: [{
-      "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
-      when: "on_success",
-      allow_failure: true
-    }, {
-      when: "manual",
-      allow_failure: true
+      if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
+      // automatic on hotfix branches
+      when: "on_success"
     }],
-    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), {
       GIT_STRATEGY: "none"
-    }), jobDefinition.variables),
+    }), jobDefinition.runnerVariables),
     stage: "stop",
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
+    environment: {
       action: "stop"
-    }),
+    },
     script: jobDefinition.script
   };
 };

package/dist/deploy/base/types.d.ts

@@ -1,2 +1,2 @@
 import type { CatladderJob } from "../../types/jobs";
-export declare type JobWithoutScript = Omit<CatladderJob, "script">;
+export type JobWithoutScript = Omit<CatladderJob, "script">;

package/dist/deploy/base/types.js

@@ -1,3 +1,5 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/deploy/base/variables.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.DEPLOY_RUNNER_VARIABLES = void 0;
 exports.DEPLOY_RUNNER_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",

package/dist/deploy/cloudRun/artifactsRegistry.d.ts

@@ -1,3 +1,4 @@
+import type { StringOrBashExpression } from "../../bash/BashExpression";
 import type { Context } from "../../types/context";
 export declare const getArtifactsRegistryHost: ({
   componentConfig: {
@@ -9,7 +10,7 @@ export declare const getArtifactsRegistryDockerUrl: (context: Context) => string
  *
  * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
  */
-export declare const getArtifactsRegistryImageName: (context: Context, lecacyReviewImageName?: boolean) => string;
+export declare const getArtifactsRegistryImageName: (context: Context, lecacyReviewImageName?: boolean) => StringOrBashExpression;
 export declare const getArtifactsRegistryBuildCacheImage: (context: Context) => string;
 export declare const getArtifactsRegistryImage: (context: Context) => string;
 /**

package/dist/deploy/cloudRun/artifactsRegistry.js

@@ -31,8 +31,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryBuildCacheImage = exports.getArtifactsRegistryImageName = exports.getArtifactsRegistryDockerUrl = exports.getArtifactsRegistryHost = void 0;
+var BashExpression_1 = require("../../bash/BashExpression");
 var gitlab_1 = require("../../utils/gitlab");
 var types_1 = require("../types");
 var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
@@ -60,7 +63,6 @@ exports.getArtifactsRegistryDockerUrl = getArtifactsRegistryDockerUrl;
  * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
  */
 var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
-  var _a;
   if (lecacyReviewImageName === void 0) {
     lecacyReviewImageName = false;
   }
@@ -68,8 +70,8 @@ var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
     throw new Error("lecacyReviewImageName is only allowed for review app");
   }
   var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
-  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" && !lecacyReviewImageName ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
-  return gcloudImagePath.join("/");
+  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.reviewSlug && !lecacyReviewImageName ? [context.environment.reviewSlug] : []), false);
+  return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
 };
 exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
 var getArtifactsRegistryBuildCacheImage = function (context) {

package/dist/deploy/cloudRun/cleanup.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getRemoveOldRevisionsAndImagesCommand = void 0;
 var artifactsRegistry_1 = require("./artifactsRegistry");
 var cloudRunRevisions_1 = require("./cloudRunRevisions");

package/dist/deploy/cloudRun/cloudRunRevisions.js

@@ -10,7 +10,9 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDeleteUnusedRevisionsCommands = void 0;
 var types_1 = require("../types");
 var createArgsString_1 = require("./utils/createArgsString");