@catladder/cli 0.0.0-refactor-gcloud-auth-no-file-7a9a76ea → 0.0.0-refactor-cloud-run-825d7e86

package/dist/bundles/cli/index.js

@@ -7985,15 +7985,23 @@ var child_process_promise_1 = __nccwpck_require__(75763);
 var command_exists_promise_1 = __importDefault(__nccwpck_require__(80133));
 var cmd;
 exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                if (!!cmd) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, command_exists_promise_1["default"])("code")];
-            case 1:
-                cmd = (_a.sent()) ? "code --wait" : "vim";
-                _a.label = 2;
-            case 2: return [2 /*return*/, {
+                if (!!cmd) return [3 /*break*/, 4];
+                if (!((_c = (_b = process.env.VISUAL) !== null && _b !== void 0 ? _b : process.env.EDITOR) !== null && _c !== void 0)) return [3 /*break*/, 1];
+                _a = _c;
+                return [3 /*break*/, 3];
+            case 1: return [4 /*yield*/, (0, command_exists_promise_1["default"])("code")];
+            case 2:
+                _a = ((_d.sent()) ? "code --wait" : "vim");
+                _d.label = 3;
+            case 3:
+                cmd = _a;
+                _d.label = 4;
+            case 4: return [2 /*return*/, {
                     open: function (path) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
@@ -355462,7 +355470,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-auth-no-file-7a9a76ea" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-cloud-run-825d7e86" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -357249,7 +357257,7 @@ exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
 
 /***/ }),
 
-/***/ 82256:
+/***/ 66321:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -357297,27 +357305,249 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.createGoogleCloudRunDeployJobs = void 0;
-var js_yaml_1 = __nccwpck_require__(3618);
-var lodash_1 = __nccwpck_require__(23255);
-var _1 = __nccwpck_require__(81344);
-var docker_1 = __nccwpck_require__(33219);
-var getLabels_1 = __nccwpck_require__(30486);
-var runner_1 = __nccwpck_require__(55071);
+exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
 var gitlab_1 = __nccwpck_require__(84997);
-var base_1 = __nccwpck_require__(82866);
-var sbom_1 = __nccwpck_require__(65928);
-var types_1 = __nccwpck_require__(63109);
 var createArgsString_1 = __nccwpck_require__(8686);
-var database_1 = __nccwpck_require__(41384);
-var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
 var jobName_1 = __nccwpck_require__(77311);
-var artifactsRegistry_1 = __nccwpck_require__(28159);
+var common_1 = __nccwpck_require__(75655);
+var getLabels_1 = __nccwpck_require__(30486);
+var getJobRunScriptForJob = function (context, jobName, wait) {
+  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
+};
+var getDeleteSchedulesScripts = function (context) {
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var argsString = (0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    location: deployConfig.region
+  });
+  return jobsWithSchedule.map(function (_a) {
+    var schedulerName = _a.schedulerName;
+    return ["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)];
+  }).flat();
+};
+exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
+var getDeleteJobsScripts = function (context) {
+  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  var jobsWithNames = getCloudRunJobsWithNames(context);
+  return jobsWithNames.flatMap(function (_a) {
+    var jobName = _a.jobName;
+    return [
+    // first delete all job executions. Otherwise delete might fail if one of those is still running
+    "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
+  });
+};
+exports.getDeleteJobsScripts = getDeleteJobsScripts;
+var getJobRunScripts = function (context, when) {
+  var jobsWithNames = getCloudRunJobsWithNames(context);
+  return jobsWithNames.filter(function (_a) {
+    var job = _a.job;
+    return job.when === when;
+  }).map(function (_a) {
+    var jobName = _a.jobName;
+    return getJobRunScriptForJob(context, jobName,
+    // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
+    ["preStop", "postStop"].includes(when));
+  });
+};
+exports.getJobRunScripts = getJobRunScripts;
+var getJobCreateScripts = function (context) {
+  var jobsWithNames = getCloudRunJobsWithNames(context);
+  return jobsWithNames.map(function (_a) {
+    var job = _a.job,
+      jobName = _a.jobName;
+    return getJobCreateScriptsForJob(context, jobName, job);
+  }).flat();
+};
+exports.getJobCreateScripts = getJobCreateScripts;
+var getJobCreateScriptsForJob = function (context, jobName, job) {
+  var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+  // 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 commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
+  var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+    command: '"' + commandArray.join(",") + '"'
+  }, commonDeployArgs), {
+    labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+      "cloud-run-job-name": jobName
+    })),
+    image: job.image || commonDeployArgs.image,
+    memory: job.memory || "512Mi",
+    "task-timeout": job.timeout || "10m"
+  }));
+  var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
+  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(argsString)])), false), ["gcloud beta run jobs update ".concat(argsString, " --env-vars-file=____envvars.yaml")], false);
+};
+var getCreateScheduleScripts = function (context) {
+  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return jobsWithSchedule.map(function (_a) {
+    var _b;
+    var job = _a.job,
+      jobName = _a.jobName,
+      schedulerName = _a.schedulerName;
+    var argsString = (0, createArgsString_1.createArgsString)({
+      project: deployConfig.projectId,
+      location: deployConfig.region,
+      schedule: "\"".concat(job.schedule, "\""),
+      "max-retry-attempts": (_b = job.maxRetryAttempts) !== null && _b !== void 0 ? _b : 0,
+      uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
+      "http-method": "POST",
+      "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"
+    });
+    var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
+    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
+  }).flat();
+};
+exports.getCreateScheduleScripts = getCreateScheduleScripts;
+var getCloudRunJobsWithSchedule = function (context) {
+  var jobsWithNames = getCloudRunJobsWithNames(context);
+  return jobsWithNames.filter(function (entry) {
+    return entry.job.when === "schedule";
+  }).map(function (_a) {
+    var job = _a.job,
+      jobName = _a.jobName;
+    return {
+      job: job,
+      jobName: jobName,
+      schedulerName: jobName + "-scheduler"
+    };
+  });
+};
+var getCloudRunJobsWithNames = function (context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  var getFullJobName = function (name) {
+    return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
+  };
+  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
+  // filter out disabled jobs
+  .filter(function (entry) {
+    return Boolean(entry[1]);
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      job = _b[1];
+    return {
+      jobName: getFullJobName(name),
+      job: job
+    };
+  });
+  return jobsWithNames;
+};
+
+/***/ }),
+
+/***/ 77210:
+/***/ (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);
+};
+exports.__esModule = true;
+exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
+var getLabels_1 = __nccwpck_require__(30486);
+var createArgsString_1 = __nccwpck_require__(8686);
 var getServiceName_1 = __nccwpck_require__(89391);
-var cleanup_1 = __nccwpck_require__(10964);
+var common_1 = __nccwpck_require__(75655);
+var getServiceDeployScript = function (context, service, nameSuffix) {
+  var _a, _b, _c, _d, _e;
+  var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var customConfig = service !== true ? service : undefined;
+  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 commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
+  var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
+  var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+    // command as empty string resets it to default (uses the image's entrypoint)
+    command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
+  }, commonDeployArgs), {
+    labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+      "cloud-run-service-name": fullServiceName
+    })),
+    "env-vars-file": "____envvars.yaml",
+    "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
+    "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
+    "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
+    memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
+    "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
+    ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
+    "cpu-boost": true
+  }));
+  return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
+};
+exports.getServiceDeployScript = getServiceDeployScript;
+var getServiceDeleteScript = function (context, serviceSuffix) {
+  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var fullServiceName = serviceSuffix ? "".concat(serviceName, "-").concat(serviceSuffix) : serviceName;
+  return ["gcloud run services delete ".concat(fullServiceName, " ").concat(commonArgsString)];
+};
+exports.getServiceDeleteScript = getServiceDeleteScript;
+
+/***/ }),
+
+/***/ 75655:
+/***/ (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.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = void 0;
+var types_1 = __nccwpck_require__(63109);
+var artifactsRegistry_1 = __nccwpck_require__(28159);
 var setGoogleProjectNumberScript = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
+exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
 var makeLabelString = function (obj) {
   return Object.entries(obj).map(function (_a) {
     var _b = __read(_a, 2),
@@ -357326,181 +357556,193 @@ var makeLabelString = function (obj) {
     return "".concat(key, "=").concat(value);
   }).join(",");
 };
-var createGoogleCloudRunDeployJobs = function (context) {
-  var _a, _b, _c;
+exports.makeLabelString = makeLabelString;
+var getCloudRunDeployConfig = function (context) {
   var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var commonArgs = {
+  return deployConfig;
+};
+exports.getCloudRunDeployConfig = getCloudRunDeployConfig;
+function getCommonCloudRunArgs(context) {
+  var deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+  return {
     project: deployConfig.projectId,
     region: deployConfig.region
   };
-  var commonDeployArgs = __assign(__assign({
+}
+exports.getCommonCloudRunArgs = getCommonCloudRunArgs;
+function getCommonDeployArgs(context) {
+  var commonArgs = getCommonCloudRunArgs(context);
+  var deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+  return __assign(__assign({
     image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined
   });
-  var serviceName = (0, getServiceName_1.getServiceName)(context);
-  var getFullJobName = function (name) {
-    return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
-  };
-  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
-  // filter out disabled jobs
-  .filter(function (entry) {
-    return Boolean(entry[1]);
-  }).map(function (_a) {
-    var _b = __read(_a, 2),
-      name = _b[0],
-      job = _b[1];
-    return {
-      jobName: getFullJobName(name),
-      job: job
-    };
-  });
-  var jobsWithSchedule = jobsWithNames.filter(function (entry) {
-    return entry.job.when === "schedule";
-  }).map(function (_a) {
-    var job = _a.job,
-      jobName = _a.jobName;
-    return {
-      job: job,
-      jobName: jobName,
-      schedulerName: jobName + "-scheduler"
+}
+exports.getCommonDeployArgs = getCommonDeployArgs;
+
+/***/ }),
+
+/***/ 21944:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
     };
-  });
-  var getServiceDeployScript = function (service, nameSuffix) {
-    var _a, _b, _c, _d, _e;
-    var customConfig = service !== true ? service : undefined;
-    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 commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
-    var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
-    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
-      // command as empty string resets it to default (uses the image's entrypoint)
-      command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
-    }, commonDeployArgs), {
-      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
-        "cloud-run-service-name": fullServiceName
-      })),
-      "env-vars-file": "____envvars.yaml",
-      "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
-      "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
-      "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
-      memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
-      "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
-      ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
-      "cpu-boost": true
-    }));
-    return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
-  };
-  var getJobCreateScriptsForJob = 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 commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
-    var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
-      command: '"' + commandArray.join(",") + '"'
-    }, commonDeployArgs), {
-      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
-        "cloud-run-job-name": jobName
-      })),
-      image: job.image || commonDeployArgs.image,
-      memory: job.memory || "512Mi",
-      "task-timeout": job.timeout || "10m"
-    }));
-    var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
-    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(argsString)])), false), ["gcloud beta run jobs update ".concat(argsString, " --env-vars-file=____envvars.yaml")], false);
-  };
-  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  var getJobCreateScripts = function () {
-    return jobsWithNames.map(function (_a) {
-      var job = _a.job,
-        jobName = _a.jobName;
-      return getJobCreateScriptsForJob(jobName, job);
-    }).flat();
-  };
-  var getJobRunScriptForJob = function (jobName, wait) {
-    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
-  };
-  var getJobRunScripts = function (when) {
-    return jobsWithNames.filter(function (_a) {
-      var job = _a.job;
-      return job.when === when;
-    }).map(function (_a) {
-      var jobName = _a.jobName;
-      return getJobRunScriptForJob(jobName,
-      // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
-      ["preStop", "postStop"].includes(when));
-    });
-  };
-  var getCreateScheduleScripts = function () {
-    return jobsWithSchedule.map(function (_a) {
-      var _b;
-      var job = _a.job,
-        jobName = _a.jobName,
-        schedulerName = _a.schedulerName;
-      var argsString = (0, createArgsString_1.createArgsString)({
-        project: deployConfig.projectId,
-        location: deployConfig.region,
-        schedule: "\"".concat(job.schedule, "\""),
-        "max-retry-attempts": (_b = job.maxRetryAttempts) !== null && _b !== void 0 ? _b : 0,
-        uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
-        "http-method": "POST",
-        "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"
-      });
-      var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
-      return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
-    }).flat();
-  };
-  var getDeleteSchedulesScripts = function () {
-    var argsString = (0, createArgsString_1.createArgsString)({
-      project: deployConfig.projectId,
-      location: deployConfig.region
-    });
-    return jobsWithSchedule.map(function (_a) {
-      var schedulerName = _a.schedulerName;
-      return ["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)];
-    }).flat();
-  };
-  var getDeleteJobsScripts = function () {
-    return jobsWithNames.flatMap(function (_a) {
-      var jobName = _a.jobName;
-      return [
-      // first delete all job executions. Otherwise delete might fail if one of those is still running
-      "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
-    });
-  };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setGoogleProjectNumberScript(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-  : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getCloudRunDeployScripts = void 0;
+var gitlab_1 = __nccwpck_require__(84997);
+var sbom_1 = __nccwpck_require__(65928);
+var cleanup_1 = __nccwpck_require__(10964);
+var database_1 = __nccwpck_require__(41384);
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
+var cloudRunJobs_1 = __nccwpck_require__(66321);
+var cloudRunServices_1 = __nccwpck_require__(77210);
+var common_1 = __nccwpck_require__(75655);
+function getCloudRunDeployScripts(context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  : []), false), __read((0, cloudRunJobs_1.getCreateScheduleScripts)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
-    return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
+    return (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name);
+  })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
   )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(getJobRunScripts("preStop")), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+}
+exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
+
+/***/ }),
+
+/***/ 40910:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getCloudRunStopScripts = void 0;
+var sbom_1 = __nccwpck_require__(65928);
+var cleanup_1 = __nccwpck_require__(10964);
+var database_1 = __nccwpck_require__(41384);
+var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
+var cloudRunJobs_1 = __nccwpck_require__(66321);
+var cloudRunServices_1 = __nccwpck_require__(77210);
+var common_1 = __nccwpck_require__(75655);
+function getCloudRunStopScripts(context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
-    return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
-  })), false), __read(getJobRunScripts("postStop")), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+    return (0, cloudRunServices_1.getServiceDeleteScript)(context, name);
+  })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postStop")), false), __read((0, cloudRunJobs_1.getDeleteSchedulesScripts)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+}
+exports.getCloudRunStopScripts = getCloudRunStopScripts;
+
+/***/ }),
+
+/***/ 26474:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createGoogleCloudRunDeployJobs = void 0;
+var lodash_1 = __nccwpck_require__(23255);
+var docker_1 = __nccwpck_require__(33219);
+var runner_1 = __nccwpck_require__(55071);
+var gitlab_1 = __nccwpck_require__(84997);
+var base_1 = __nccwpck_require__(82866);
+var types_1 = __nccwpck_require__(63109);
+var variables_1 = __nccwpck_require__(20408);
+var getCloudRunDeployScripts_1 = __nccwpck_require__(21944);
+var getCloudRunStopScripts_1 = __nccwpck_require__(40910);
+var createGoogleCloudRunDeployJobs = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
+  var stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
   return (0, base_1.createDeployementJobs)(context, {
     deploy: (0, lodash_1.merge)((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: "'",
-          forceQuotes: true
-        })
-      },
+      variables: (0, variables_1.getDeployJobVariables)(context),
       image: (0, runner_1.getRunnerImage)("gcloud"),
       script: deployScripts
     }),
@@ -357517,6 +357759,32 @@ exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
 
 /***/ }),
 
+/***/ 20408:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getDeployJobVariables = void 0;
+var js_yaml_1 = __nccwpck_require__(3618);
+var lodash_1 = __nccwpck_require__(23255);
+var __1 = __nccwpck_require__(25355);
+function getDeployJobVariables(context) {
+  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  return {
+    CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+    ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
+      lineWidth: -1,
+      quotingType: "'",
+      forceQuotes: true
+    })
+  };
+}
+exports.getDeployJobVariables = getDeployJobVariables;
+
+/***/ }),
+
 /***/ 81344:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -357569,7 +357837,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = expo
 var context_1 = __nccwpck_require__(22041);
 var gitlab_1 = __nccwpck_require__(84997);
 var utils_1 = __nccwpck_require__(70463);
-var deployJob_1 = __nccwpck_require__(82256);
+var createJobs_1 = __nccwpck_require__(26474);
 var jobName_1 = __nccwpck_require__(77311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
@@ -357601,7 +357869,7 @@ var getCloudSqlVariables = function (_a) {
   return {};
 };
 exports.GCLOUD_RUN_DEPLOY_TYPE = {
-  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
+  jobs: createJobs_1.createGoogleCloudRunDeployJobs,
   defaults: function (_a) {
     var deployConfigRaw = _a.deployConfigRaw,
       envType = _a.envType;