@catladder/pipeline 0.0.0-fix-config-move-not-working-again-bf012644 → 0.0.0-fix-handle-missing-cloud-sql-proxy-command-error-and-show-nice-4dbbecce

package/dist/bash/bashEscape.d.ts

@@ -15,6 +15,9 @@ export declare const escapeString: (value: string | null | undefined, {
 export declare const escapeBashExpression: (value: BashExpression, options: EscapeOptions) => BashExpression;
 export declare const escapeDoubleQuotes: (value: string | null | undefined) => string | undefined;
 export declare const escapeSingleQuotes: (value: string | null | undefined) => string | undefined;
+export type EscapeForDotEnvOptions = {
+  quoteMode: "auto" | "always";
+};
 /**
  *
  * escape env vars for .env files.
@@ -31,4 +34,4 @@ export declare const escapeSingleQuotes: (value: string | null | undefined) => s
  *
  * - other languages are currently only partially supported, since most .env implementations are slightly different
  */
-export declare const escapeForDotEnv: (value: VariableValue | undefined | null) => string;
+export declare const escapeForDotEnv: (value: VariableValue | undefined | null, options?: EscapeForDotEnvOptions) => string;

package/dist/bash/bashEscape.js

@@ -65,14 +65,19 @@ exports.escapeSingleQuotes = escapeSingleQuotes;
  *
  * - other languages are currently only partially supported, since most .env implementations are slightly different
  */
-var escapeForDotEnv = function (value) {
+var escapeForDotEnv = function (value, options) {
+  if (options === void 0) {
+    options = {
+      quoteMode: "auto"
+    };
+  }
   if (value === undefined || value === null) {
     return "";
   }
   if (typeof value === "string") {
     // if string contains newlines, we need to wrap it in quotes
     // we additionaly escape newlines, that give best compatibility
-    if (value.includes("\n")) {
+    if (options.quoteMode === "always" || value.includes("\n")) {
       var newlinesReplaces = value.replace(/\n/g, "\\n");
       // default to ", but if this is not possible, we try to use ' or `
       var quote = value.includes("\"") ? value.includes("'") ? value.includes("`") ?

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "fix-config-move-not-working-again-bf012644" || "latest";
+exports.PIPELINE_IMAGE_TAG = "fix-handle-missing-cloud-sql-proxy-command-error-and-show-nice-4dbbecce" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getEnvConfig.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEnvConfig = void 0;
-var utils_1 = require("../utils");
+var lodash_1 = require("lodash");
 var getEnvConfig = function (config, componentName, env) {
   var _a, _b;
   var defaultConfig = config.components[componentName];
@@ -16,6 +16,17 @@ var getEnvConfig = function (config, componentName, env) {
     // env is disabled, still return the default config
     return defaultConfig;
   }
-  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+  /**
+   *   env config is merged with default. Arrays are not merged.
+   * you can customize this by providing a function that takes the default value as argument
+   */
+  return (0, lodash_1.mergeWith)({}, defaultConfig, envCustomizations, function (defaultValue, customValue) {
+    // check if custom value is a function (and default is not),
+    // we currently don't have config options that are functions, but we might in the future
+    if (typeof customValue === "function" && typeof defaultValue !== "function") {
+      return customValue(defaultValue);
+    }
+    return undefined;
+  });
 };
 exports.getEnvConfig = getEnvConfig;

package/dist/deploy/cloudRun/createJobs/cloudRunJobs.d.ts

@@ -1,7 +1,9 @@
 import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRunJob } from "../../types/googleCloudRun";
-export declare const getDeleteSchedulesScripts: (context: ComponentContext) => string[];
 export declare const getDeleteJobsScripts: (context: ComponentContext) => string[];
-export declare const getJobRunScripts: (context: ComponentContext, when: DeployConfigCloudRunJob["when"]) => string[];
 export declare const getJobCreateScripts: (context: ComponentContext) => string[];
-export declare const getCreateScheduleScripts: (context: ComponentContext) => string[];
+export declare const getCloudRunJobsWithNames: (context: ComponentContext) => {
+  fullJobName: import("../../..").StringOrBashExpression;
+  job: DeployConfigCloudRunJob;
+  jobName: string;
+}[];

package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js

@@ -52,73 +52,41 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
+exports.getCloudRunJobsWithNames = exports.getJobCreateScripts = exports.getDeleteJobsScripts = void 0;
+var getLabels_1 = require("../../../context/getLabels");
+var utils_1 = require("../../../utils");
 var createArgsString_1 = require("../utils/createArgsString");
 var jobName_1 = require("../utils/jobName");
 var common_1 = require("./common");
-var getLabels_1 = require("../../../context/getLabels");
-var volumes_1 = require("./volumes");
 var constants_1 = require("./constants");
-var utils_1 = require("../../../utils");
-var getJobRunScriptForJob = function (context, jobName, wait) {
-  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName.toString(), " ").concat(commonArgsString).concat(wait ? " --wait" : "");
-};
-var getDeleteSchedulesScripts = function (context) {
-  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  var schedules = getSchedules(context);
-  var argsString = (0, createArgsString_1.createArgsString)({
-    project: deployConfig.projectId,
-    location: deployConfig.region
-  });
-  return schedules.map(function (_a) {
-    var name = _a.name;
-    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(name, " ").concat(argsString)];
-  }).flat();
-};
-exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
+var volumes_1 = require("./volumes");
+var onDeploy_1 = require("./execute/onDeploy");
 var getDeleteJobsScripts = function (context) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  var jobsWithNames = getCloudRunJobsWithNames(context);
+  var jobsWithNames = (0, exports.getCloudRunJobsWithNames)(context);
   return jobsWithNames.flatMap(function (_a) {
-    var jobName = _a.jobName;
+    var fullJobName = _a.fullJobName;
     return [
     // first delete all job executions. Otherwise delete might fail if one of those is still running
-    "".concat((0, common_1.gcloudRunCmd)(), " jobs executions list ").concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} ").concat((0, common_1.gcloudRunCmd)(), " jobs executions delete {}  --quiet ").concat(commonArgsString), "".concat((0, common_1.gcloudRunCmd)(), " jobs delete ").concat(jobName, " ").concat(commonArgsString)];
+    "".concat((0, common_1.gcloudRunCmd)(), " jobs executions list ").concat(commonArgsString, " --job ").concat(fullJobName, " --format=\"value(name)\" | xargs -I {} ").concat((0, common_1.gcloudRunCmd)(), " jobs executions delete {}  --quiet ").concat(commonArgsString), "".concat((0, common_1.gcloudRunCmd)(), " jobs delete ").concat(fullJobName, " ").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 _b;
-    var jobName = _a.jobName,
-      job = _a.job;
-    // always wait for completion for preStop and postStop jobs
-    // since stop will delete the jobs afterwards, so they will fail
-    var waitForCompletion = ["preStop", "postStop"].includes(when) ? true : "waitForCompletion" in job ? (_b = job.waitForCompletion) !== null && _b !== void 0 ? _b : false : false;
-    return getJobRunScriptForJob(context, jobName, waitForCompletion);
-  });
-};
-exports.getJobRunScripts = getJobRunScripts;
 var getJobCreateScripts = function (context) {
-  return getCloudRunJobsWithNames(context).map(function (_a, jobIndex) {
-    var _b, _c, _d, _e;
+  return (0, exports.getCloudRunJobsWithNames)(context).map(function (_a, jobIndex) {
+    var _b, _c, _d, _e, _f;
     var job = _a.job,
-      jobName = _a.jobName;
+      fullJobName = _a.fullJobName;
     var commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
-    var _f = (0, common_1.getCommonDeployArgs)(context),
-      commonImage = _f.image,
-      project = _f.project,
-      region = _f.region,
-      deployArgs = __rest(_f, ["image", "project", "region"]);
+    var _g = (0, common_1.getCommonDeployArgs)(context),
+      commonImage = _g.image,
+      project = _g.project,
+      region = _g.region,
+      deployArgs = __rest(_g, ["image", "project", "region"]);
     var commonDeployArgsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
       command: "\"".concat(commandArray.join(","), "\""),
+      args: (0, onDeploy_1.getCloudRunJobArgsArg)(job.args),
       labels: "\"".concat((0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context)), ",cloud-run-job-name=$current_job_name\""),
       image: "\"".concat((_b = job.image) !== null && _b !== void 0 ? _b : commonImage, "\""),
       project: project,
@@ -128,7 +96,7 @@ var getJobCreateScripts = function (context) {
       parallelism: (_d = job.parallelism) !== null && _d !== void 0 ? _d : 1,
       "task-timeout": (_e = job.timeout) !== null && _e !== void 0 ? _e : "10m",
       "env-vars-file": constants_1.ENV_VARS_FILENAME,
-      "max-retries": 0
+      "max-retries": (_f = job.maxRetries) !== null && _f !== void 0 ? _f : 0
     }, deployArgs), {
       // network
       "vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
@@ -136,79 +104,27 @@ var getJobCreateScripts = function (context) {
       network: job === null || job === void 0 ? void 0 : job.network,
       subnet: job === null || job === void 0 ? void 0 : job.subnet
     })], __read((0, volumes_1.createVolumeConfig)(job.volumes, "job")), false));
-    return [jobIndex === 0 ? "exist_job_names=\"$(\n  ".concat((0, common_1.gcloudRunCmd)(), " jobs list --filter='metadata.name ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --project='").concat(project, "' --region='").concat(region, "'\n)\"") : null, "current_job_name=\"".concat(jobName, "\""), 'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then', "  ".concat((0, common_1.gcloudRunCmd)(), " jobs update \"$current_job_name\" ").concat(commonDeployArgsString), "else", "  ".concat((0, common_1.gcloudRunCmd)(), " jobs create \"$current_job_name\" ").concat(commonDeployArgsString), "fi"].filter(utils_1.notNil).join("\n");
+    return [jobIndex === 0 ? "exist_job_names=\"$(\n  ".concat((0, common_1.gcloudRunCmd)(), " jobs list --filter='metadata.name ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --project='").concat(project, "' --region='").concat(region, "'\n)\"") : null, "current_job_name=\"".concat(fullJobName, "\""), 'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then', "  ".concat((0, common_1.gcloudRunCmd)(), " jobs update \"$current_job_name\" ").concat(commonDeployArgsString), "else", "  ".concat((0, common_1.gcloudRunCmd)(), " jobs create \"$current_job_name\" ").concat(commonDeployArgsString), "fi"].filter(utils_1.notNil).join("\n");
   });
 };
 exports.getJobCreateScripts = getJobCreateScripts;
-var getCreateScheduleScripts = function (context) {
-  var schedules = getSchedules(context);
-  var _a = (0, common_1.getCloudRunDeployConfig)(context),
-    location = _a.region,
-    project = _a.projectId;
-  return schedules.map(function (scheduler, jobIndex) {
-    var _a;
-    var uri = getSchedulerUrl(scheduler, context);
-    var argsString = (0, createArgsString_1.createArgsString)({
-      project: project,
-      location: location,
-      uri: "\"$current_job_uri\"",
-      "http-method": "POST",
-      "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\"",
-      schedule: "\"".concat(scheduler.schedule, "\""),
-      "max-retry-attempts": (_a = scheduler.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0
-    });
-    return [jobIndex === 0 ? "exist_scheduler_names=\"$(\n  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs list --filter='httpTarget.uri ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --location='").concat(location, "' --project='").concat(project, "'\n)\"") : null, "current_job_uri=\"".concat(uri, "\""), "current_scheduler_name=\"".concat(scheduler.name, "\""), "if grep \"$current_scheduler_name\" <<<\"$exist_scheduler_names\" >/dev/null; then", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update http \"$current_scheduler_name\" ").concat(argsString), "else", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create http \"$current_scheduler_name\" ").concat(argsString), "fi"].filter(utils_1.notNil).join("\n");
-  });
-};
-exports.getCreateScheduleScripts = getCreateScheduleScripts;
-var getSchedulerUrl = function (scheduler, context) {
-  if (scheduler.type === "cloudRunJob") {
-    var _a = (0, common_1.getCloudRunDeployConfig)(context),
-      location_1 = _a.region,
-      project = _a.projectId;
-    var uriBase = "https://".concat(location_1, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(project, "/jobs");
-    return "".concat(uriBase, "/").concat(scheduler.jobName, ":run");
-  }
-  throw new Error("Unknown scheduler type: ".concat(scheduler.type));
-};
-var getSchedules = function (context) {
-  var jobsWithNames = getCloudRunJobsWithNames(context);
-  return jobsWithNames.filter(function (entry) {
-    return entry.job.when === "schedule";
-  }).map(function (_a) {
-    var _b = _a.job,
-      maxRetryAttempts = _b.maxRetryAttempts,
-      schedule = _b.schedule,
-      jobName = _a.jobName;
-    var schedulerName = jobName.concat("-scheduler");
-    return {
-      name: schedulerName,
-      maxRetryAttempts: maxRetryAttempts,
-      schedule: schedule,
-      type: "cloudRunJob",
-      jobName: jobName
-    };
-  });
-};
 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),
-      jobKey = _b[0],
+      jobName = _b[0],
       job = _b[1];
     return {
-      jobName: getFullJobName(jobKey),
+      fullJobName: (0, jobName_1.getFullJobName)(context, jobName),
       job: job,
-      jobKey: jobKey
+      jobName: jobName
     };
   });
   return jobsWithNames;
-};
+};
+exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;

package/dist/deploy/cloudRun/createJobs/execute/onDeploy.d.ts

@@ -0,0 +1,4 @@
+import type { ComponentContext } from "../../../../types/context";
+import type { DeployConfigCloudRunExecuteOnDeploy, DeployConfigCloudRunJob } from "../../../types/googleCloudRun";
+export declare const getOnDeployExecuteScript: (context: ComponentContext, when: DeployConfigCloudRunExecuteOnDeploy["when"]) => string[];
+export declare const getCloudRunJobArgsArg: (args: DeployConfigCloudRunExecuteOnDeploy["args"] | DeployConfigCloudRunJob["args"]) => string | undefined;

package/dist/deploy/cloudRun/createJobs/execute/onDeploy.js

@@ -0,0 +1,120 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCloudRunJobArgsArg = exports.getOnDeployExecuteScript = void 0;
+var createArgsString_1 = require("../../utils/createArgsString");
+var jobName_1 = require("../../utils/jobName");
+var cloudRunJobs_1 = require("../cloudRunJobs");
+var common_1 = require("../common");
+var getOnDeployExecuteScript = function (context, when) {
+  var executes = getExecutes(context);
+  return executes.filter(function (_a) {
+    var config = _a.config;
+    return config.when === when;
+  }).map(function (execute) {
+    return getJobRunScriptForExecute(context, execute);
+  });
+};
+exports.getOnDeployExecuteScript = getOnDeployExecuteScript;
+var getExecutes = function (context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return __spreadArray(__spreadArray([], __read(getLegacyExecutes(context)), false), __read(Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    if (!value || value.when !== "schedule" && value.type !== "job") {
+      return [];
+    }
+    return [{
+      jobName: key,
+      config: value
+    }];
+  })), false);
+};
+var getLegacyExecutes = function (context) {
+  var jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+  return jobsWithNames.flatMap(function (_a) {
+    var jobName = _a.jobName,
+      job = _a.job;
+    if (!job.when || !["preDeploy", "postDeploy", "preStop", "postStop"].includes(job.when)) {
+      return [];
+    }
+    return [{
+      jobName: jobName,
+      config: __assign({
+        job: jobName,
+        type: "job",
+        when: job.when
+      }, job.when === "preDeploy" || job.when === "postDeploy" ? {
+        waitForCompletion: job.waitForCompletion
+      } : {})
+    }];
+  });
+};
+var getJobRunScriptForExecute = function (context, _a) {
+  var _b;
+  var jobName = _a.jobName,
+    config = _a.config;
+  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  // always wait for completion for preStop and postStop jobs
+  // since stop will delete the jobs afterwards, so they will fail
+  var waitForCompletion = ["preStop", "postStop"].includes(config.when) ? true // always
+  : "waitForCompletion" in config ? (_b = config.waitForCompletion) !== null && _b !== void 0 ? _b : false // depends on config
+  : false;
+  var argString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, commonArgs), {
+    wait: waitForCompletion === true ? true : undefined,
+    args: (0, exports.getCloudRunJobArgsArg)(config.args)
+  }));
+  var fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(fullJobName.toString(), " ").concat(argString);
+};
+var getCloudRunJobArgsArg = function (args) {
+  return args !== undefined ? args.length > 0 ? args === null || args === void 0 ? void 0 : args.map(function (arg) {
+    return "\"".concat(arg, "\"");
+  }).join(",") : "" : undefined;
+};
+exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;

package/dist/deploy/cloudRun/createJobs/execute/schedules.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentContext } from "../../../../types/context";
+export declare const getDeleteSchedulesScript: (context: ComponentContext) => string[];
+export declare const getCreateScheduleScript: (context: ComponentContext) => string[];

package/dist/deploy/cloudRun/createJobs/execute/schedules.js

@@ -0,0 +1,173 @@
+"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 __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCreateScheduleScript = exports.getDeleteSchedulesScript = void 0;
+var bash_1 = require("../../../../bash");
+var utils_1 = require("../../../../utils");
+var cloudRunExecutionUrl_1 = require("../../utils/cloudRunExecutionUrl");
+var createArgsString_1 = require("../../utils/createArgsString");
+var jobName_1 = require("../../utils/jobName");
+var cloudRunJobs_1 = require("../cloudRunJobs");
+var common_1 = require("../common");
+var getDeleteSchedulesScript = function (context) {
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  var schedules = getSchedules(context);
+  var argsString = (0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    location: deployConfig.region
+  });
+  return schedules.map(function (_a) {
+    var fullName = _a.fullName;
+    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(fullName, " ").concat(argsString)];
+  }).flat();
+};
+exports.getDeleteSchedulesScript = getDeleteSchedulesScript;
+var getCreateScheduleScript = function (context) {
+  var schedules = getSchedules(context);
+  var _a = (0, common_1.getCloudRunDeployConfig)(context),
+    location = _a.region,
+    project = _a.projectId;
+  return schedules.map(function (_a, jobIndex) {
+    var _b;
+    var fullName = _a.fullName,
+      config = _a.config;
+    var _c = getSchedulerArgs(config, context),
+      uri = _c.uri,
+      args = __rest(_c, ["uri"]);
+    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      project: project,
+      location: location,
+      uri: "\"$current_job_uri\""
+    }, args), {
+      schedule: "\"".concat(config.schedule, "\""),
+      "max-retry-attempts": (_b = config.maxRetryAttempts) !== null && _b !== void 0 ? _b : 0
+    }));
+    return [jobIndex === 0 ? "exist_scheduler_names=\"$(\n  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs list --filter='httpTarget.uri ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --location='").concat(location, "' --project='").concat(project, "'\n)\"") : null, "current_job_uri=\"".concat(uri, "\""), "current_scheduler_name=\"".concat(fullName, "\""), "if grep \"$current_scheduler_name\" <<<\"$exist_scheduler_names\" >/dev/null; then", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update http \"$current_scheduler_name\" ").concat(argsString), "else", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create http \"$current_scheduler_name\" ").concat(argsString), "fi"].filter(utils_1.notNil).join("\n");
+  });
+};
+exports.getCreateScheduleScript = getCreateScheduleScript;
+var getSchedulerArgs = function (scheduler, context) {
+  var _a;
+  if (scheduler.type === "job") {
+    var _b = (0, common_1.getCloudRunDeployConfig)(context),
+      projectId = _b.projectId,
+      region = _b.region;
+    var body = scheduler.args !== undefined ? {
+      overrides: {
+        containerOverrides: [((_a = scheduler.args) === null || _a === void 0 ? void 0 : _a.length) > 0 ? {
+          args: scheduler.args
+        } : {
+          args: [],
+          clearArgs: true // not sure why this is neeeded, but it is
+        }]
+      }
+    } : null;
+    return {
+      uri: (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(scheduler.job, {
+        appFullName: context.environment.fullName,
+        projectId: projectId,
+        region: region
+      }),
+      "message-body": body ? '"' + (0, bash_1.bashEscape)(JSON.stringify(body)) + '"' : undefined,
+      "http-method": "POST",
+      "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
+    };
+  }
+  if (scheduler.type === "http") {
+    return {
+      uri: scheduler.url,
+      "message-body": scheduler.body,
+      "http-method": scheduler.method,
+      "oidc-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
+    };
+  }
+  throw new Error("Unknown scheduler type: ".concat(scheduler.type));
+};
+var getSchedules = function (context) {
+  var legacyScheduleJobs = getLegacyJobSchedules(context);
+  var schedules = getScheduledExecutes(context);
+  return Object.entries(__assign(__assign({}, legacyScheduleJobs), schedules)).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      config = _b[1];
+    return {
+      name: name,
+      fullName: (0, jobName_1.getFullSchedulerName)(context, name),
+      config: config
+    };
+  });
+};
+var getLegacyJobSchedules = function (context) {
+  var jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+  return Object.fromEntries(jobsWithNames.filter(function (entry) {
+    return entry.job.when === "schedule";
+  }).map(function (_a) {
+    var _b = _a.job,
+      maxRetryAttempts = _b.maxRetryAttempts,
+      schedule = _b.schedule,
+      jobName = _a.jobName;
+    var schedulerName = jobName.concat("-scheduler");
+    return [schedulerName, {
+      type: "job",
+      job: jobName,
+      maxRetryAttempts: maxRetryAttempts,
+      schedule: schedule,
+      when: "schedule"
+    }];
+  }));
+};
+var getScheduledExecutes = function (context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return Object.fromEntries(Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    if (!value || value.when !== "schedule") {
+      return [];
+    }
+    return [[key, value]];
+  }));
+};

package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js

@@ -44,19 +44,21 @@ var cleanup_1 = require("../cleanup");
 var database_1 = require("../utils/database");
 var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 var cloudRunJobs_1 = require("./cloudRunJobs");
+var onDeploy_1 = require("./execute/onDeploy");
 var cloudRunServices_1 = require("./cloudRunServices");
 var common_1 = require("./common");
 var constants_1 = require("./constants");
+var schedules_1 = require("./execute/schedules");
 function getCloudRunDeployScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
   return __spreadArray(__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)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __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) {
+  : []), false), __read((0, schedules_1.getCreateScheduleScript)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(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 (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"))), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;

package/dist/deploy/cloudRun/createJobs/getCloudRunStopScripts.js

@@ -40,15 +40,17 @@ var cleanup_1 = require("../cleanup");
 var database_1 = require("../utils/database");
 var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 var cloudRunJobs_1 = require("./cloudRunJobs");
+var onDeploy_1 = require("./execute/onDeploy");
+var schedules_1 = require("./execute/schedules");
 var cloudRunServices_1 = require("./cloudRunServices");
 var common_1 = require("./common");
 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) {
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(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 (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);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop")), false), __read((0, schedules_1.getDeleteSchedulesScript)(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;