@catladder/pipeline 0.0.0-refactore-catenv-command-validates-argument-78d05852 → 0.0.0-reference-database-url-1befbbee

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

@@ -10,6 +10,14 @@ var __assign = this && this.__assign || function () {
   };
   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;
@@ -41,139 +49,82 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
-exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
-var gitlab_1 = require("../../../utils/gitlab");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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 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, " ").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 ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(schedulerName, " ").concat(argsString)];
-  }).flat();
-};
-exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
+var constants_1 = require("./constants");
+var volumes_1 = require("./volumes");
+var getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
 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 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);
-  // 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",
-    parallelism: job.parallelism || 1,
-    "env-vars-file": "____envvars.yaml",
-    "max-retries": 0
-  }));
-  var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
-  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), ["".concat((0, common_1.gcloudRunCmd)(), " jobs update ").concat(argsString)], 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)(["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create ").concat(commonArgs)])), false), ["".concat((0, common_1.gcloudSchedulerCmd)(), " 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) {
+  return (0, exports.getCloudRunJobsWithNames)(context).map(function (_a, jobIndex) {
+    var _b, _c, _d, _e, _f;
     var job = _a.job,
-      jobName = _a.jobName;
-    return {
-      job: job,
-      jobName: jobName,
-      schedulerName: jobName + "-scheduler"
-    };
+      fullJobName = _a.fullJobName;
+    var commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
+    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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(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,
+      region: region,
+      cpu: job.cpu,
+      memory: (_c = job.memory) !== null && _c !== void 0 ? _c : "512Mi",
+      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": (_f = job.maxRetries) !== null && _f !== void 0 ? _f : 0
+    }, deployArgs), {
+      // network
+      "vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
+      "vpc-egress": job === null || job === void 0 ? void 0 : job.vpcEgress,
+      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(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 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],
+      jobName = _b[0],
       job = _b[1];
     return {
-      jobName: getFullJobName(name),
-      job: job
+      fullJobName: (0, jobName_1.getFullJobName)(context, jobName),
+      job: job,
+      jobName: jobName
     };
   });
   return jobsWithNames;
-};
+};
+exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;

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

@@ -1,4 +1,4 @@
-import type { Context } from "../../../types/context";
+import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
-export declare const getServiceDeployScript: (context: Context, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string | undefined) => string;
-export declare const getServiceDeleteScript: (context: Context, serviceSuffix?: string | undefined) => string[];
+export declare const getServiceDeployScript: (context: ComponentContext, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string) => string;
+export declare const getServiceDeleteScript: (context: ComponentContext, serviceSuffix?: string) => string[];

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

@@ -10,38 +10,87 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+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.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 var getLabels_1 = require("../../../context/getLabels");
 var createArgsString_1 = require("../utils/createArgsString");
+var getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
 var getServiceName_1 = require("../utils/getServiceName");
 var common_1 = require("./common");
+var constants_1 = require("./constants");
+var healthCheck_1 = require("./healthCheck");
+var volumes_1 = require("./volumes");
 var getServiceDeployScript = function (context, service, nameSuffix) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   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 command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.type !== "disabled" ? context.build.config.startCommand : undefined : 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({
+  var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
+  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign(__assign({
     // command as empty string resets it to default (uses the image's entrypoint)
-    command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
+    command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.args)
   }, commonDeployArgs), {
+    image: (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.image) !== null && _b !== void 0 ? _b : commonDeployArgs.image,
     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,
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
+    "min-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _c !== void 0 ? _c : 0,
+    "max-instances": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _d !== void 0 ? _d : 100,
     "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
+    cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu,
     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",
+    timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
+    "vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
+    "vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
+    network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
+    subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
+    "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
+    "allow-unauthenticated": (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _e !== void 0 ? _e : true,
+    ingress: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _f !== void 0 ? _f : "all",
     "cpu-boost": true,
-    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment
-  }));
-  return "".concat((0, common_1.gcloudRunCmd)(), " deploy ").concat(fullServiceName, " ").concat(argsString);
+    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
+    gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
+    "gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType
+  }), (0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck))], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
+  var version = requiresBeta(customConfig) ? "beta" : undefined;
+  return "".concat((0, common_1.gcloudRunCmd)(version), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {
@@ -51,4 +100,19 @@ var getServiceDeleteScript = function (context, serviceSuffix) {
   var fullServiceName = serviceSuffix ? "".concat(serviceName, "-").concat(serviceSuffix) : serviceName;
   return ["".concat((0, common_1.gcloudRunCmd)(), " services delete ").concat(fullServiceName, " ").concat(commonArgsString)];
 };
-exports.getServiceDeleteScript = getServiceDeleteScript;
+exports.getServiceDeleteScript = getServiceDeleteScript;
+var requiresBeta = function (config) {
+  if (!config) {
+    return false;
+  }
+  if (config.gpuType) {
+    return true;
+  }
+  if (config.gpu && config.gpu > 0) {
+    return true;
+  }
+  if (config.healthCheck !== undefined) {
+    return true;
+  }
+  return false;
+};

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

@@ -1,16 +1,16 @@
-import type { Context } from "../../../types/context";
+import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
-export declare const gcloudCmd: (version?: "beta" | undefined) => string;
-export declare const gcloudRunCmd: (version?: "beta" | undefined) => string;
-export declare const gcloudSchedulerCmd: (version?: "beta" | undefined) => string;
+export declare const gcloudCmd: (version?: "beta") => string;
+export declare const gcloudRunCmd: (version?: "beta") => string;
+export declare const gcloudSchedulerCmd: (version?: "beta") => string;
 export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
-export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;
-export declare function getCommonCloudRunArgs(context: Context): {
+export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
+export declare function getCommonCloudRunArgs(context: ComponentContext): {
   project: string;
   region: import("../../types").Gcloudregion;
 };
-export declare function getCommonDeployArgs(context: Context): {
+export declare function getCommonDeployArgs(context: ComponentContext): {
   "set-cloudsql-instances": string | undefined;
   project: string;
   region: import("../../types").Gcloudregion;

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

@@ -32,7 +32,9 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 var types_1 = require("../../types");
 var artifactsRegistry_1 = require("../artifactsRegistry");
@@ -49,7 +51,7 @@ var gcloudSchedulerCmd = function (version) {
 };
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
 var setGoogleProjectNumberScript = function (deployConfig) {
-  return ["export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
+  return ["export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), 'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"'];
 };
 exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
 var makeLabelString = function (obj) {
@@ -62,7 +64,8 @@ var makeLabelString = function (obj) {
 };
 exports.makeLabelString = makeLabelString;
 var getCloudRunDeployConfig = function (context) {
-  var deployConfig = context.componentConfig.deploy;
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

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

@@ -0,0 +1 @@
+export declare const ENV_VARS_FILENAME = "____envvars.yaml";

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

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ENV_VARS_FILENAME = void 0;
+exports.ENV_VARS_FILENAME = "____envvars.yaml";

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

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

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

@@ -0,0 +1,115 @@
+"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.getOnDeployExecuteScript = void 0;
+var createArgsString_1 = require("../../utils/createArgsString");
+var getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
+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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
+  }));
+  var fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(fullJobName.toString(), " ").concat(argString);
+};

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[];