@catladder/cli 0.0.0-main-5bc1bdb9 → 0.0.0-main-a4e913e3

package/dist/bundles/cli/index.js

@@ -350753,17 +350753,312 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-5bc1bdb9" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-a4e913e3" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
 
+/***/ 25706:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getEnvConfig = void 0;
+
+var utils_1 = __nccwpck_require__(37461);
+
+var getEnvConfig = function (config, componentName, env) {
+  var _a, _b;
+
+  var defaultConfig = config.components[componentName];
+
+  if (!defaultConfig) {
+    throw new Error("unknown component " + componentName);
+  }
+
+  var envCustomizations = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
+
+  if (envCustomizations === false) {
+    throw new Error("env is disabled: " + env);
+  }
+
+  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+};
+
+exports.getEnvConfig = getEnvConfig;
+
+/***/ }),
+
+/***/ 94811:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getEnvType = void 0;
+
+var types_1 = __nccwpck_require__(71753);
+
+var getEnvType = function (env, envConfig) {
+  if (envConfig.type) return envConfig.type;
+
+  if ((0, types_1.isKnowEnvType)(env)) {
+    return env;
+  }
+
+  throw new Error("unknown env type: " + env);
+};
+
+exports.getEnvType = getEnvType;
+
+/***/ }),
+
 /***/ 60740:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "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 (_) 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
+    };
+  }
+};
+
+exports.__esModule = true;
+exports.getEnvironment = void 0;
+
+var getEnvironmentContext_1 = __nccwpck_require__(95141);
+
+var getEnvironmentVariables_1 = __nccwpck_require__(76602);
+
+var getEnvironment = function (config, componentName, env, commitInfo) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var _a, envVars, secretEnvVarKeys, host, url, envContext, envType;
+
+    return __generator(this, function (_b) {
+      switch (_b.label) {
+        case 0:
+          return [4
+          /*yield*/
+          , (0, getEnvironmentVariables_1.getEnvironmentVariables)(config, componentName, env, commitInfo)];
+
+        case 1:
+          _a = _b.sent(), envVars = _a.envVars, secretEnvVarKeys = _a.secretEnvVarKeys, host = _a.host, url = _a.url;
+          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          envType = envContext.envType;
+          return [2
+          /*return*/
+          , {
+            envType: envType,
+            host: host,
+            url: url,
+            gitlabEnvironment: {
+              name: envContext.gitlabEnvironmentName,
+              url: url
+            },
+            fullName: envContext.fullName,
+            slug: envContext.environmentSlug,
+            shortName: env,
+            envVars: envVars,
+            secretEnvVarKeys: secretEnvVarKeys
+          }];
+      }
+    });
+  });
+};
+
+exports.getEnvironment = getEnvironment;
+
+/***/ }),
+
+/***/ 95141:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getEnvironmentContext = void 0;
+
+var getEnvConfig_1 = __nccwpck_require__(25706);
+
+var getEnvType_1 = __nccwpck_require__(94811);
+
+var getEnvironmentSlug = function (envConfig, env, componentName, commitInfo) {
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
+  return envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
+};
+
+var getEnvironmentContext = function (config, env, componentName, commitInfo) {
+  var envConfigRaw = (0, getEnvConfig_1.getEnvConfig)(config, componentName, env);
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfigRaw);
+  var environmentSlug = getEnvironmentSlug(envConfigRaw, env, componentName, commitInfo);
+  var gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
+  var fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
+  return {
+    envConfigRaw: envConfigRaw,
+    deployConfigRaw: envConfigRaw.deploy,
+    buildConfigRaw: envConfigRaw.build,
+    environmentSlug: environmentSlug,
+    gitlabEnvironmentName: gitlabEnvironmentName,
+    fullName: fullName,
+    envType: envType,
+    commitInfo: commitInfo,
+    componentName: componentName,
+    env: env,
+    fullConfig: config
+  };
+};
+
+exports.getEnvironmentContext = getEnvironmentContext;
+
+/***/ }),
+
+/***/ 76602:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
 var __assign = this && this.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -350955,60 +351250,41 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironment = void 0;
+exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironmentVariables = void 0;
 
 var lodash_1 = __nccwpck_require__(23255);
 
 var deploy_1 = __nccwpck_require__(90223);
 
-var config_1 = __nccwpck_require__(19997);
-
-var utils_1 = __nccwpck_require__(37461);
+var getEnvironmentContext_1 = __nccwpck_require__(95141);
 
 var resolveReferences_1 = __nccwpck_require__(80928);
 
-var getEnvironment = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
+var getEnvironmentVariables = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
 ) {
   if (alreadyVisited === void 0) {
     alreadyVisited = {};
   }
 
   return __awaiter(void 0, void 0, void 0, function () {
-    var envConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, envVarContext, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var environmentContext, envConfigRaw, deployConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
 
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 
-    return __generator(this, function (_l) {
-      switch (_l.label) {
+    return __generator(this, function (_k) {
+      switch (_k.label) {
         case 0:
-          envConfig = getEnvConfig(config, componentName, env);
-          envType = (_a = envConfig === null || envConfig === void 0 ? void 0 : envConfig.type) !== null && _a !== void 0 ? _a : (0, config_1.isKnowEnvType)(env) ? env : null;
-
-          if (!envType) {
-            throw new Error("Missing type in environment " + env + " in component " + componentName);
-          }
-
+          environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          envConfigRaw = environmentContext.envConfigRaw, deployConfigRaw = environmentContext.deployConfigRaw, envType = environmentContext.envType;
           basePredefinedVariables = {
             ENV_SHORT: env,
-            APP_DIR: envConfig.dir,
+            APP_DIR: envConfigRaw.dir,
             ENV_TYPE: envType
           };
-          gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
-          environmentSlug = envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
-          fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
-          envVarContext = {
-            deployConfig: envConfig.deploy,
-            fullName: fullName,
-            envType: envType,
-            commitInfo: commitInfo,
-            componentName: componentName,
-            env: env,
-            fullConfig: config
-          };
 
           if (envType === "local") {
-            devLocalConfig = envConfig;
-            port = (_b = devLocalConfig.port) !== null && _b !== void 0 ? _b : 3000;
+            devLocalConfig = envConfigRaw;
+            port = (_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000;
             host = "localhost:" + port;
             url = "http://" + host;
             predefinedVariables = {
@@ -351017,8 +351293,8 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
               PORT: port.toString()
             };
           } else {
-            additionalEnvVars = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].getAdditionalEnvVars(envVarContext) : {};
-            host = (_d = (_c = envConfig === null || envConfig === void 0 ? void 0 : envConfig.host) !== null && _c !== void 0 ? _c : additionalEnvVars.HOST_CANONICAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
+            additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
+            host = (_c = (_b = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _b !== void 0 ? _b : additionalEnvVars.HOST_CANONICAL) !== null && _c !== void 0 ? _c : "unknown-host.example.com";
             url = "https://".concat(host);
             predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
               HOST: host,
@@ -351026,13 +351302,13 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
             }), additionalEnvVars);
           }
 
-          publicEnvVarsRaw = (_f = (_e = envConfig.vars) === null || _e === void 0 ? void 0 : _e.public) !== null && _f !== void 0 ? _f : {};
-          additionalSecretKeys = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].additionalSecretKeys(envVarContext) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_h = (_g = envConfig.vars) === null || _g === void 0 ? void 0 : _g.secret) !== null && _h !== void 0 ? _h : []), false), __read(additionalSecretKeys), false);
+          publicEnvVarsRaw = (_e = (_d = envConfigRaw.vars) === null || _d === void 0 ? void 0 : _d.public) !== null && _e !== void 0 ? _e : {};
+          additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
+          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []), false), __read(additionalSecretKeys), false);
           secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
             return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
           }));
-          legacyFromComponents = (_k = (_j = envConfig.vars) === null || _j === void 0 ? void 0 : _j.fromComponents) !== null && _k !== void 0 ? _k : {};
+          legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
           publicEnvVarsRawWithLegasyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
           publicEnvVarsRawSanitized = Object.fromEntries(Object.entries(publicEnvVarsRawWithLegasyFromComponents).map(function (_a) {
             var _b = __read(_a, 2),
@@ -351044,50 +351320,42 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
           envVarsRaw = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized));
           return [4
           /*yield*/
-          , (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (componentName, variableName, alreadyVisited) {
+          , (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (otherComponentName, variableName, alreadyVisited) {
             return __awaiter(void 0, void 0, void 0, function () {
-              var envVars;
+              var otherEnvVars;
               return __generator(this, function (_a) {
                 switch (_a.label) {
                   case 0:
                     return [4
                     /*yield*/
-                    , (0, exports.getEnvironment)(config, componentName, env, commitInfo, alreadyVisited)];
+                    , (0, exports.getEnvironmentVariables)(config, otherComponentName, env, commitInfo, alreadyVisited)];
 
                   case 1:
-                    envVars = _a.sent().envVars;
+                    otherEnvVars = _a.sent().envVars;
                     return [2
                     /*return*/
-                    , envVars[variableName]];
+                    , otherEnvVars[variableName]];
                 }
               });
             });
           }, alreadyVisited)];
 
         case 1:
-          envVars = _l.sent();
+          envVars = _k.sent();
           return [2
           /*return*/
           , {
-            envType: envType,
-            host: host,
-            url: url,
-            gitlabEnvironment: {
-              name: gitlabEnvironmentName,
-              url: url
-            },
-            fullName: fullName,
-            slug: environmentSlug,
-            shortName: env,
             envVars: envVars,
-            secretEnvVarKeys: secretEnvVarKeys
+            secretEnvVarKeys: secretEnvVarKeys,
+            host: host,
+            url: url
           }];
       }
     });
   });
 };
 
-exports.getEnvironment = getEnvironment;
+exports.getEnvironmentVariables = getEnvironmentVariables;
 
 var sanitizeForEnVar = function (s) {
   return s.replace(/-/g, "_");
@@ -351112,24 +351380,6 @@ var getSecretVarNameForContext = function (context, key) {
 
 exports.getSecretVarNameForContext = getSecretVarNameForContext;
 
-var getEnvConfig = function (config, componentName, env) {
-  var _a, _b;
-
-  var defaultConfig = config.components[componentName];
-
-  if (!defaultConfig) {
-    throw new Error("unknown component " + componentName);
-  }
-
-  var envCustomizations = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-
-  if (envCustomizations === false) {
-    throw new Error("env is disabled: " + env);
-  }
-
-  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
-};
-
 /***/ }),
 
 /***/ 30486:
@@ -351363,34 +351613,30 @@ var utils_1 = __nccwpck_require__(37461);
 
 var getEnvironment_1 = __nccwpck_require__(60740);
 
+var getEnvironmentContext_1 = __nccwpck_require__(95141);
+
 __exportStar(__nccwpck_require__(60740), exports);
 
+__exportStar(__nccwpck_require__(76602), exports);
+
 var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var rawConfig, envConfig, componentConfigWithoutDefaults, defaults, componentConfig;
+    var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
 
     var _a;
 
-    var _b, _c;
-
-    return __generator(this, function (_d) {
-      switch (_d.label) {
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
           if (!/^[a-z0-9-]+$/.test(componentName)) {
             throw new Error("componentName may only contain lower case letters, numbers and -");
           }
 
-          rawConfig = config.components[componentName];
-
-          if (!rawConfig) {
-            throw new Error("unknown component " + componentName);
-          }
-
-          envConfig = (_c = (_b = rawConfig.env) === null || _b === void 0 ? void 0 : _b[env]) !== null && _c !== void 0 ? _c : {};
-          componentConfigWithoutDefaults = (0, utils_1.mergeWithMergingArrays)(rawConfig, envConfig);
+          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          componentConfigWithoutDefaults = envContext.envConfigRaw;
           defaults = componentConfigWithoutDefaults.deploy ? {
-            build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(),
-            deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults()
+            build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(envContext),
+            deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext)
           } : {
             build: {},
             deploy: {}
@@ -351408,7 +351654,7 @@ var createContext = function (config, componentName, env, commitInfo, packageMan
         case 1:
           return [2
           /*return*/
-          , (_a.environment = _d.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
+          , (_a.environment = _b.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
       }
     });
   });
@@ -351979,13 +352225,15 @@ var types_1 = __nccwpck_require__(63109);
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
 
 var createGoogleCloudRunDeployJobs = function (context) {
+  var _a, _b;
+
   var deployConfig = context.componentConfig.deploy;
 
   if (deployConfig === false) {
     return [];
   }
 
-  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun", "google-cloudrun-job")) {
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
@@ -352006,44 +352254,76 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return "".concat(key, "=").concat(value);
   }).join(",");
   var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
+  var commonDeployArgs = "--image ".concat(gcloudImageName, " ").concat(commonArgs, " --labels ").concat(labelsString);
+  var serviceName = context.environment.fullName.toLowerCase();
 
-  var getDeployCommand = function () {
+  var getServiceDeployScript = function (service) {
     var _a;
 
-    var name = context.environment.fullName.toLowerCase();
-    var command = (_a = deployConfig.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand;
+    var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
-    var commonDeployArgs = "".concat(commandArg, " --image ").concat(gcloudImageName, " ").concat(commonArgs, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString);
+    return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
+  };
 
-    if (deployConfig.type === "google-cloudrun") {
-      return "gcloud run deploy ".concat(name, " ").concat(commonDeployArgs, " --allow-unauthenticated");
-    }
+  var getJobDeployScripts = function (jobName, job) {
+    // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
+    // lucky, update on the other hand accepts it... so let's just imediatly update it
+    // also we cannot upsert a job, so we have to create it and catch the error and then update
+    var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs);
+    return ["set +e", "gcloud beta run jobs create ".concat(args), "set -e", "gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")];
+  };
 
-    if (deployConfig.type === "google-cloudrun-job") {
-      return "gcloud beta run jobs create ".concat(name, " ").concat(commonDeployArgs);
-    }
+  var getJobRunScript = function (jobName) {
+    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
   };
 
-  var getStopCommand = function () {
-    var name = context.environment.fullName.toLowerCase();
-    var commonStopArgs = "".concat(commonArgs, " --quiet");
+  var getFullJobName = function (name) {
+    return context.environment.fullName.toLowerCase() + "-" + name;
+  };
 
-    if (deployConfig.type === "google-cloudrun") {
-      return "gcloud run services delete ".concat(name, " ").concat(commonStopArgs);
-    }
+  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
 
-    if (deployConfig.type === "google-cloudrun-job") {
-      return "gcloud beta run jobs delete ".concat(name, " ").concat(commonStopArgs);
-    }
-  };
+    return [getFullJobName(name), job];
+  });
+
+  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobDeployScripts(name, job);
+  }).flat()), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return job.when === "postDeploy";
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobRunScript(name);
+  })), false), ["docker image rm ".concat(gcloudImageName)], false);
+
+  var cloudRunStopScripts = __spreadArray(__spreadArray([], __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName)] : []), false), __read(Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+        jobName = _b[0],
+        job = _b[1];
+
+    return "gcloud beta run jobs delete ".concat(jobName);
+  })), false);
 
-  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", getDeployCommand(), "docker image rm ".concat(gcloudImageName)];
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
       paths: ["____envvars.yaml"]
     },
     variables: {
+      CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
       ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
         lineWidth: -1,
         quotingType: "'",
@@ -352051,10 +352331,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
       })
     },
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeploy), false)
+    script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeployScripts), false)
   }), (0, lodash_1.merge)({}, baseStopJob, {
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [getStopCommand()], false)
+    variables: {
+      CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+    },
+    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(cloudRunStopScripts), false)
   })];
 };
 
@@ -352063,13 +352346,52 @@ exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
 /***/ }),
 
 /***/ 81344:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "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;
+};
+
 exports.__esModule = true;
-exports.GCLOUD_RUN_DEPLOY_TYPES = exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
 
 var context_1 = __nccwpck_require__(22041);
 
@@ -352088,40 +352410,21 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
   getAdditionalEnvVars: function (_a) {
     var fullName = _a.fullName,
         env = _a.env,
-        componentName = _a.componentName;
+        componentName = _a.componentName,
+        deployConfigRaw = _a.deployConfigRaw;
     var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
-    return {
-      HOST_CANONICAL: HOST_CANONICAL
-    };
-  }
-};
-exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = {
-  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
-  defaults: function () {
-    return {};
-  },
-  additionalSecretKeys: function () {
-    return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
-  },
-  getAdditionalEnvVars: function (_a) {
-    var deployConfig = _a.deployConfig,
-        fullName = _a.fullName;
-
-    if (!deployConfig) {
-      return {};
-    }
+    var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
+      var _b = __read(_a, 2),
+          name = _b[0],
+          job = _b[1];
 
-    var jobName = fullName.toLowerCase();
-    var CLOUD_RUN_JOB_TRIGGER_URL = "https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run");
-    return {
-      CLOUD_RUN_JOB_TRIGGER_URL: CLOUD_RUN_JOB_TRIGGER_URL
-    };
+      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + name, "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat(name, ":run")];
+    })) : {};
+    return __assign({
+      HOST_CANONICAL: HOST_CANONICAL
+    }, jobTriggers);
   }
 };
-exports.GCLOUD_RUN_DEPLOY_TYPES = {
-  "google-cloudrun": exports.GCLOUD_RUN_DEPLOY_TYPE,
-  "google-cloudrun-job": exports.GCLOUD_RUN_JOB_DEPLOY_TYPE
-};
 
 /***/ }),
 
@@ -352356,20 +352659,6 @@ exports.DOCKER_TAG_DEPLOY_TYPE = {
 "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 __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   Object.defineProperty(o, k2, {
@@ -352398,21 +352687,22 @@ var dockerTag_1 = __nccwpck_require__(18990);
 
 var kubernetes_1 = __nccwpck_require__(95682);
 
+__exportStar(__nccwpck_require__(81344), exports);
+
+__exportStar(__nccwpck_require__(13539), exports);
+
 __exportStar(__nccwpck_require__(95682), exports);
 
 __exportStar(__nccwpck_require__(63109), exports);
 
 __exportStar(__nccwpck_require__(92757), exports);
 
-__exportStar(__nccwpck_require__(13539), exports);
-
-__exportStar(__nccwpck_require__(81344), exports);
-
-exports.DEPLOY_TYPES = __assign({
+exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
-}, cloudRun_1.GCLOUD_RUN_DEPLOY_TYPES);
+  dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE,
+  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE
+};
 
 /***/ }),
 
@@ -352428,23 +352718,23 @@ exports.additionalKubernetesSecretKeys = void 0;
 var additionalKubernetesSecretKeys = function (_a) {
   var _b, _c, _d, _e;
 
-  var deployConfig = _a.deployConfig;
+  var deployConfigRaw = _a.deployConfigRaw;
 
-  if (!deployConfig) {
+  if (!deployConfigRaw) {
     return [];
   }
 
   var keys = [];
 
-  if ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
+  if ((_c = (_b = deployConfigRaw.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
     keys.push("MONGODB_ROOT_PASSWORD");
 
-    if (deployConfig.values.mongodb.architecture === "replicaset") {
+    if (deployConfigRaw.values.mongodb.architecture === "replicaset") {
       keys.push("MONGODB_REPLICASET_KEY");
     }
   }
 
-  if ((_e = (_d = deployConfig.values) === null || _d === void 0 ? void 0 : _d.cloudsql) === null || _e === void 0 ? void 0 : _e.enabled) {
+  if ((_e = (_d = deployConfigRaw.values) === null || _d === void 0 ? void 0 : _d.cloudsql) === null || _e === void 0 ? void 0 : _e.enabled) {
     keys.push("POSTGRESQL_PASSWORD");
     keys.push("cloudsqlProxyCredentials");
   }
@@ -352647,7 +352937,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
 
     var componentName = _a.componentName,
         fullConfig = _a.fullConfig,
-        deployConfig = _a.deployConfig,
+        deployConfigRaw = _a.deployConfigRaw,
         env = _a.env,
         envType = _a.envType,
         commitInfo = _a.commitInfo;
@@ -352656,7 +352946,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     var KUBE_NAMESPACE = (0, __1.getKubernetesNamespace)(fullConfig, env);
     var componentSlug = (0, slugify_1["default"])(componentName);
     var envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
-    var domainCanonical = deployConfig && ((_b = deployConfig.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
+    var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
     fullConfig.domainCanonical || "panter.cloud";
     var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest