@catladder/cli 0.0.0-main-7b4a3dd5 → 0.0.0-main-5bc1bdb9

package/dist/bundles/catenv/index.js

@@ -613,7 +613,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.upsertAllVariables = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
+exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
 var pipeline_1 = __nccwpck_require__(5355);
 var child_process_promise_1 = __nccwpck_require__(5763);
 var lodash_1 = __nccwpck_require__(3255);
@@ -687,28 +687,31 @@ var getGitlabToken = function (vorpal) { return __awaiter(void 0, void 0, void 0
     });
 }); };
 exports.getGitlabToken = getGitlabToken;
-var doGitlabRequest = function (vorpal, path, data, update) {
+var doGitlabRequest = function (vorpal, path, data, method) {
     if (data === void 0) { data = undefined; }
+    if (method === void 0) { method = "GET"; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var rootToken, method, result, _a, _b, _c, _d, _e;
+        var rootToken, result, _a, _b, _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0: return [4 /*yield*/, (0, exports.getGitlabToken)(vorpal)];
                 case 1:
                     rootToken = _f.sent();
-                    method = data ? (update ? "PUT" : "POST") : "GET";
                     return [4 /*yield*/, (0, node_fetch_1["default"])("https://git.panter.ch/api/v4/".concat(path), {
                             method: method,
                             headers: {
                                 "Content-Type": "application/json",
                                 "Private-Token": rootToken
                             },
-                            body: JSON.stringify(data)
+                            body: data ? JSON.stringify(data) : undefined
                         })];
                 case 2:
                     result = _f.sent();
                     if (result.status >= 200 && result.status < 400) {
-                        return [2 /*return*/, result.json()];
+                        if (result.headers.get("content-type") === "application/json") {
+                            return [2 /*return*/, result.json()];
+                        }
+                        return [2 /*return*/, null];
                     }
                     if (result.status === 404) {
                         throw new Error("not found");
@@ -790,7 +793,7 @@ var createVariable = function (vorpal, projectId, key, value, masked, environmen
                         value: value,
                         masked: masked && isMaskable(value),
                         environment_scope: environment_scope
-                    })];
+                    }, "POST")];
                 case 1: return [2 /*return*/, _a.sent()];
             }
         });
@@ -804,12 +807,20 @@ var updateVariable = function (vorpal, projectId, key, value, masked) {
                 case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), {
                         value: value,
                         masked: masked && isMaskable(value)
-                    }, true)];
+                    }, "PUT")];
                 case 1: return [2 /*return*/, _a.sent()];
             }
         });
     });
 };
+var deleteVariable = function (vorpal, projectId, key) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, exports.doGitlabRequest)(vorpal, "projects/".concat(projectId, "/variables/").concat(key), undefined, "DELETE")];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
 var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var allVariables;
     return __generator(this, function (_a) {
@@ -839,6 +850,46 @@ var getAllCatladderEnvVarsInGitlab = function (vorpal) { return __awaiter(void 0
         }
     });
 }); };
+var getBackupKey = function (fullKey, timestamp) {
+    return "".concat(fullKey, "_backup_").concat(timestamp);
+};
+var clearBackups = function (vorpal, keep) { return __awaiter(void 0, void 0, void 0, function () {
+    var existingVariables, id, _i, _a, _b, key, backups, backupsSorted, toDelete, _c, toDelete_1, timestamp;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0: return [4 /*yield*/, getAllCatladderEnvVarsInGitlab(vorpal)];
+            case 1:
+                existingVariables = _d.sent();
+                return [4 /*yield*/, (0, exports.getProjectInfo)(vorpal)];
+            case 2:
+                id = (_d.sent()).id;
+                _i = 0, _a = Object.entries(existingVariables);
+                _d.label = 3;
+            case 3:
+                if (!(_i < _a.length)) return [3 /*break*/, 8];
+                _b = _a[_i], key = _b[0], backups = _b[1].backups;
+                backupsSorted = backups.sort(function (a, b) { return b - a; });
+                toDelete = backupsSorted.slice(keep);
+                _c = 0, toDelete_1 = toDelete;
+                _d.label = 4;
+            case 4:
+                if (!(_c < toDelete_1.length)) return [3 /*break*/, 7];
+                timestamp = toDelete_1[_c];
+                return [4 /*yield*/, deleteVariable(vorpal, id, getBackupKey(key, timestamp))];
+            case 5:
+                _d.sent();
+                _d.label = 6;
+            case 6:
+                _c++;
+                return [3 /*break*/, 4];
+            case 7:
+                _i++;
+                return [3 /*break*/, 3];
+            case 8: return [2 /*return*/];
+        }
+    });
+}); };
+exports.clearBackups = clearBackups;
 var upsertAllVariables = function (vorpal, variables, env, componentName, backup, masked // FIXME: would be better to have this per variable
 ) {
     if (backup === void 0) { backup = true; }
@@ -871,7 +922,7 @@ var upsertAllVariables = function (vorpal, variables, env, componentName, backup
                 case 4:
                     _d.sent();
                     if (!backup) return [3 /*break*/, 6];
-                    return [4 /*yield*/, createVariable(vorpal, id, fullKey + "_backup_" + new Date().getTime(), oldValue, masked, "_backup")];
+                    return [4 /*yield*/, createVariable(vorpal, id, getBackupKey(fullKey, new Date().getTime()), oldValue, masked, "_backup")];
                 case 5:
                     _d.sent();
                     _d.label = 6;
@@ -39831,7 +39882,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-7b4a3dd5" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-5bc1bdb9" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -40032,52 +40083,19 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   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;
-exports.getEnvironment = exports.getSecretVarNameForContext = exports.getSecretVarName = void 0;
+exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironment = void 0;
 
 var lodash_1 = __nccwpck_require__(3255);
 
-var slugify_1 = __importDefault(__nccwpck_require__(4035));
-
 var deploy_1 = __nccwpck_require__(223);
 
-var types_1 = __nccwpck_require__(3109);
-
 var config_1 = __nccwpck_require__(9997);
 
 var utils_1 = __nccwpck_require__(7461);
 
 var resolveReferences_1 = __nccwpck_require__(928);
 
-var sanitizeForEnVar = function (s) {
-  return s.replace(/-/g, "_");
-};
-
-var getSecretVarName = function (env, componentName, key) {
-  return "CL_".concat(sanitizeForEnVar(env), "_").concat(sanitizeForEnVar(componentName), "_").concat(key);
-}; // remove dash from component name
-
-
-exports.getSecretVarName = getSecretVarName;
-
-var addIndexVar = function (vars) {
-  return __assign(__assign({}, vars), {
-    _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars))
-  });
-};
-
-var getSecretVarNameForContext = function (context, key) {
-  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
-};
-
-exports.getSecretVarNameForContext = getSecretVarNameForContext;
-
 var getEnvironment = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
 ) {
   if (alreadyVisited === void 0) {
@@ -40085,27 +40103,15 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   }
 
   return __awaiter(void 0, void 0, void 0, function () {
-    var defaultConfig, envConfig, mergedConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, devLocalConfig, port, componentSlug, envInUrl, domainCanonical, HOST_CANONICAL, KUBE_APP_NAME_PREFIX, KUBE_APP_NAME, KUBE_NAMESPACE, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var envConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, envVarContext, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
 
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
 
-    return __generator(this, function (_o) {
-      switch (_o.label) {
+    return __generator(this, function (_l) {
+      switch (_l.label) {
         case 0:
-          defaultConfig = config.components[componentName];
-
-          if (!defaultConfig) {
-            throw new Error("unknown component " + componentName);
-          }
-
-          envConfig = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-
-          if (envConfig === false) {
-            throw new Error("env is disabled: " + env);
-          }
-
-          mergedConfig = (0, utils_1.mergeWithMergingArrays)(defaultConfig, envConfig);
-          envType = (_c = envConfig === null || envConfig === void 0 ? void 0 : envConfig.type) !== null && _c !== void 0 ? _c : (0, config_1.isKnowEnvType)(env) ? env : null;
+          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);
@@ -40113,16 +40119,25 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
 
           basePredefinedVariables = {
             ENV_SHORT: env,
-            APP_DIR: mergedConfig.dir,
+            APP_DIR: envConfig.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 = mergedConfig;
-            port = (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000;
+            devLocalConfig = envConfig;
+            port = (_b = devLocalConfig.port) !== null && _b !== void 0 ? _b : 3000;
             host = "localhost:" + port;
             url = "http://" + host;
             predefinedVariables = {
@@ -40131,34 +40146,22 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
               PORT: port.toString()
             };
           } else {
-            componentSlug = (0, slugify_1["default"])(componentName);
-            envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
-            domainCanonical = (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy) && (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy.type) === "kubernetes" && ((_e = mergedConfig.deploy.cluster) === null || _e === void 0 ? void 0 : _e.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
-            config.domainCanonical || "panter.cloud";
-            HOST_CANONICAL = (0, types_1.isOfDeployType)(mergedConfig.deploy, "google-cloudrun") ? fullName.toLowerCase() + "-" + process.env[(0, exports.getSecretVarName)(env, componentName, deploy_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)] : "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical);
-            host = (_f = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.host) !== null && _f !== void 0 ? _f : HOST_CANONICAL;
+            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";
             url = "https://".concat(host);
-            KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
-            KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
-            KUBE_NAMESPACE = (0, deploy_1.getKubernetesNamespace)(config, env);
-            predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
-              HOST_CANONICAL: HOST_CANONICAL,
+            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
               HOST: host,
-              ROOT_URL: url,
-              KUBE_NAMESPACE: KUBE_NAMESPACE,
-              KUBE_APP_NAME: KUBE_APP_NAME,
-              KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX
-            });
+              ROOT_URL: url
+            }), additionalEnvVars);
           }
 
-          publicEnvVarsRaw = (_h = (_g = mergedConfig.vars) === null || _g === void 0 ? void 0 : _g.public) !== null && _h !== void 0 ? _h : {};
-          additionalSecretKeys = mergedConfig.deploy ? deploy_1.DEPLOY_TYPES[mergedConfig.deploy.type].additionalSecretKeys( // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          mergedConfig.deploy) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_k = (_j = mergedConfig.vars) === null || _j === void 0 ? void 0 : _j.secret) !== null && _k !== void 0 ? _k : []), false), __read(additionalSecretKeys), false);
+          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);
           secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
             return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
           }));
-          legacyFromComponents = (_m = (_l = mergedConfig.vars) === null || _l === void 0 ? void 0 : _l.fromComponents) !== null && _m !== void 0 ? _m : {};
+          legacyFromComponents = (_k = (_j = envConfig.vars) === null || _j === void 0 ? void 0 : _j.fromComponents) !== null && _k !== void 0 ? _k : {};
           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),
@@ -40191,7 +40194,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
           }, alreadyVisited)];
 
         case 1:
-          envVars = _o.sent();
+          envVars = _l.sent();
           return [2
           /*return*/
           , {
@@ -40215,6 +40218,47 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
 
 exports.getEnvironment = getEnvironment;
 
+var sanitizeForEnVar = function (s) {
+  return s.replace(/-/g, "_");
+};
+
+var getSecretVarName = function (env, componentName, key) {
+  return "CL_".concat(sanitizeForEnVar(env), "_").concat(sanitizeForEnVar(componentName), "_").concat(key);
+}; // remove dash from component name
+
+
+exports.getSecretVarName = getSecretVarName;
+
+var addIndexVar = function (vars) {
+  return __assign(__assign({}, vars), {
+    _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars))
+  });
+};
+
+var getSecretVarNameForContext = function (context, key) {
+  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, 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);
+};
+
 /***/ }),
 
 /***/ 486:
@@ -41043,7 +41087,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDeployJob = void 0;
+exports.createGoogleCloudRunDeployJobs = void 0;
 
 var js_yaml_1 = __nccwpck_require__(3618);
 
@@ -41063,16 +41107,16 @@ var types_1 = __nccwpck_require__(3109);
 
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 
-var createDeployJob = function (context) {
+var createGoogleCloudRunDeployJobs = function (context) {
   var deployConfig = context.componentConfig.deploy;
 
   if (deployConfig === false) {
     return [];
   }
 
-  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun", "google-cloudrun-job")) {
     // should not happen
-    throw new Error("deploy config is not custom");
+    throw new Error("deploy config is wrong");
   }
 
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
@@ -41083,7 +41127,6 @@ var createDeployJob = function (context) {
   var pushImageToArtifactsRegistry = __spreadArray(__spreadArray([docker_1.gitlabDockerLogin], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)], false);
 
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var serviceName = context.environment.fullName.toLowerCase();
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
     var _b = __read(_a, 2),
         key = _b[0],
@@ -41091,9 +41134,39 @@ var createDeployJob = function (context) {
 
     return "".concat(key, "=").concat(value);
   }).join(",");
-  var command = context.componentConfig.build.startCommand ? "--command=\"".concat(context.componentConfig.build.startCommand.split(" ").join(","), "\"") : ""; // TODO: split secrets out
+  var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
+
+  var getDeployCommand = function () {
+    var _a;
+
+    var name = context.environment.fullName.toLowerCase();
+    var command = (_a = deployConfig.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand;
+    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);
+
+    if (deployConfig.type === "google-cloudrun") {
+      return "gcloud run deploy ".concat(name, " ").concat(commonDeployArgs, " --allow-unauthenticated");
+    }
+
+    if (deployConfig.type === "google-cloudrun-job") {
+      return "gcloud beta run jobs create ".concat(name, " ").concat(commonDeployArgs);
+    }
+  };
+
+  var getStopCommand = function () {
+    var name = context.environment.fullName.toLowerCase();
+    var commonStopArgs = "".concat(commonArgs, " --quiet");
 
-  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", "gcloud run deploy ".concat(serviceName, " --image ").concat(gcloudImageName, " --region=").concat(deployConfig.region, " --allow-unauthenticated --project ").concat(deployConfig.projectId, " ").concat(command, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString), "docker image rm ".concat(gcloudImageName)];
+    if (deployConfig.type === "google-cloudrun") {
+      return "gcloud run services delete ".concat(name, " ").concat(commonStopArgs);
+    }
+
+    if (deployConfig.type === "google-cloudrun-job") {
+      return "gcloud beta run jobs delete ".concat(name, " ").concat(commonStopArgs);
+    }
+  };
+
+  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: {
@@ -41110,11 +41183,11 @@ var createDeployJob = function (context) {
     script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeploy), false)
   }), (0, lodash_1.merge)({}, baseStopJob, {
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud run services delete ".concat(serviceName, " --project ").concat(deployConfig.projectId, " --region=").concat(deployConfig.region, " --quiet")], false)
+    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [getStopCommand()], false)
   })];
 };
 
-exports.createDeployJob = createDeployJob;
+exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
 
 /***/ }),
 
@@ -41125,21 +41198,59 @@ exports.createDeployJob = createDeployJob;
 
 
 exports.__esModule = true;
-exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+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;
+
+var context_1 = __nccwpck_require__(2041);
 
 var deployJob_1 = __nccwpck_require__(2256);
 
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 exports.GCLOUD_RUN_DEPLOY_TYPE = {
-  jobs: deployJob_1.createDeployJob,
+  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
   defaults: function () {
     return {};
   },
   additionalSecretKeys: function () {
     return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
+  },
+  getAdditionalEnvVars: function (_a) {
+    var fullName = _a.fullName,
+        env = _a.env,
+        componentName = _a.componentName;
+    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 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
+    };
+  }
+};
+exports.GCLOUD_RUN_DEPLOY_TYPES = {
+  "google-cloudrun": exports.GCLOUD_RUN_DEPLOY_TYPE,
+  "google-cloudrun-job": exports.GCLOUD_RUN_JOB_DEPLOY_TYPE
+};
 
 /***/ }),
 
@@ -41294,6 +41405,9 @@ exports.CUSTOM_DEPLOY_TYPE = {
   },
   additionalSecretKeys: function () {
     return [];
+  },
+  getAdditionalEnvVars: function () {
+    return {};
   }
 };
 
@@ -41357,6 +41471,9 @@ exports.DOCKER_TAG_DEPLOY_TYPE = {
   },
   additionalSecretKeys: function () {
     return [];
+  },
+  getAdditionalEnvVars: function () {
+    return {};
   }
 };
 
@@ -41368,6 +41485,20 @@ 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, {
@@ -41406,12 +41537,11 @@ __exportStar(__nccwpck_require__(3539), exports);
 
 __exportStar(__nccwpck_require__(1344), exports);
 
-exports.DEPLOY_TYPES = {
+exports.DEPLOY_TYPES = __assign({
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE,
   dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
-};
+}, cloudRun_1.GCLOUD_RUN_DEPLOY_TYPES);
 
 /***/ }),
 
@@ -41424,20 +41554,26 @@ exports.DEPLOY_TYPES = {
 exports.__esModule = true;
 exports.additionalKubernetesSecretKeys = void 0;
 
-var additionalKubernetesSecretKeys = function (config) {
-  var _a, _b, _c, _d;
+var additionalKubernetesSecretKeys = function (_a) {
+  var _b, _c, _d, _e;
+
+  var deployConfig = _a.deployConfig;
+
+  if (!deployConfig) {
+    return [];
+  }
 
   var keys = [];
 
-  if ((_b = (_a = config.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) {
+  if ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
     keys.push("MONGODB_ROOT_PASSWORD");
 
-    if (config.values.mongodb.architecture === "replicaset") {
+    if (deployConfig.values.mongodb.architecture === "replicaset") {
       keys.push("MONGODB_REPLICASET_KEY");
     }
   }
 
-  if ((_d = (_c = config.values) === null || _c === void 0 ? void 0 : _c.cloudsql) === null || _d === void 0 ? void 0 : _d.enabled) {
+  if ((_e = (_d = deployConfig.values) === null || _d === void 0 ? void 0 : _d.cloudsql) === null || _e === void 0 ? void 0 : _e.enabled) {
     keys.push("POSTGRESQL_PASSWORD");
     keys.push("cloudsqlProxyCredentials");
   }
@@ -41607,14 +41743,24 @@ exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
 /***/ }),
 
 /***/ 5682:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
 
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
 exports.__esModule = true;
 exports.KUBERNETES_DEPLOY_TYPE = void 0;
 
+var slugify_1 = __importDefault(__nccwpck_require__(4035));
+
+var __1 = __nccwpck_require__(223);
+
 var additionalSecretKeys_1 = __nccwpck_require__(5775);
 
 var deployJob_1 = __nccwpck_require__(9792);
@@ -41624,7 +41770,32 @@ exports.KUBERNETES_DEPLOY_TYPE = {
   defaults: function () {
     return {};
   },
-  additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys
+  additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys,
+  getAdditionalEnvVars: function (_a) {
+    var _b;
+
+    var componentName = _a.componentName,
+        fullConfig = _a.fullConfig,
+        deployConfig = _a.deployConfig,
+        env = _a.env,
+        envType = _a.envType,
+        commitInfo = _a.commitInfo;
+    var KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
+    var KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
+    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
+    fullConfig.domainCanonical || "panter.cloud";
+    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+
+    return {
+      KUBE_NAMESPACE: KUBE_NAMESPACE,
+      KUBE_APP_NAME: KUBE_APP_NAME,
+      KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
+      HOST_CANONICAL: HOST_CANONICAL
+    };
+  }
 };
 
 /***/ }),