@catladder/pipeline 2.6.3 → 2.7.1

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 = "v2-6-3-db90530a" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v2-7-1-2e399c09" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

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

@@ -67,14 +67,14 @@ var getJobRunScriptForJob = function (context, jobName, wait) {
 };
 var getDeleteSchedulesScripts = function (context) {
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var schedules = getSchedules(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)];
+  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;
@@ -108,81 +108,85 @@ var getJobRunScripts = function (context, when) {
 exports.getJobRunScripts = getJobRunScripts;
 var getJobCreateScripts = function (context) {
   return getCloudRunJobsWithNames(context).map(function (_a, jobIndex) {
-    var _b = _a.job,
-      command = _b.command,
-      image = _b.image,
-      cpu = _b.cpu,
-      _c = _b.memory,
-      memory = _c === void 0 ? "512Mi" : _c,
-      _d = _b.timeout,
-      timeout = _d === void 0 ? "10m" : _d,
-      _e = _b.parallelism,
-      parallelism = _e === void 0 ? 1 : _e,
-      volumes = _b.volumes,
+    var _b, _c, _d, _e;
+    var job = _a.job,
       jobName = _a.jobName;
-    var commandArray = Array.isArray(command) ? command : command.split(" ");
+    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 commonDeployArgsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign({
+    var commonDeployArgsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
       command: "\"".concat(commandArray.join(","), "\""),
       labels: "\"".concat((0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context)), ",cloud-run-job-name=$current_job_name\""),
-      image: "\"".concat(image !== null && image !== void 0 ? image : commonImage, "\""),
+      image: "\"".concat((_b = job.image) !== null && _b !== void 0 ? _b : commonImage, "\""),
       project: project,
       region: region,
-      cpu: cpu,
-      memory: memory,
-      parallelism: parallelism,
-      "task-timeout": timeout,
+      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": 0
-    }, deployArgs)], __read((0, volumes_1.createVolumeConfig)(volumes, "job")), false));
+    }, 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(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");
   });
 };
 exports.getJobCreateScripts = getJobCreateScripts;
 var getCreateScheduleScripts = function (context) {
-  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var schedules = getSchedules(context);
   var _a = (0, common_1.getCloudRunDeployConfig)(context),
     location = _a.region,
     project = _a.projectId;
-  var uriBase = "https://".concat(location, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(project, "/jobs");
-  var gcloudArgs = {
-    project: project,
-    location: location,
-    uri: "\"$current_job_uri\"",
-    "http-method": "POST",
-    "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
-  };
-  return jobsWithSchedule.map(function (_a, jobIndex) {
-    var _b = _a.job,
-      maxRetryAttempts = _b.maxRetryAttempts,
-      schedule = _b.schedule,
-      jobName = _a.jobName,
-      schedulerName = _a.schedulerName;
-    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, gcloudArgs), {
-      schedule: "\"".concat(schedule, "\""),
-      "max-retry-attempts": maxRetryAttempts !== null && maxRetryAttempts !== void 0 ? maxRetryAttempts : 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(uriBase, "/").concat(jobName, ":run\""), "current_scheduler_name=\"".concat(schedulerName, "\""), "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");
+  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 getCloudRunJobsWithSchedule = function (context) {
+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 job = _a.job,
-      jobName = _a.jobName,
-      jobKey = _a.jobKey;
+    var _b = _a.job,
+      maxRetryAttempts = _b.maxRetryAttempts,
+      schedule = _b.schedule,
+      jobName = _a.jobName;
+    var schedulerName = jobName.concat("-scheduler");
     return {
-      job: job,
-      jobName: jobName,
-      jobKey: jobKey,
-      schedulerName: jobName.concat("-scheduler")
+      name: schedulerName,
+      maxRetryAttempts: maxRetryAttempts,
+      schedule: schedule,
+      type: "cloudRunJob",
+      jobName: jobName
     };
   });
 };

package/dist/deploy/types/googleCloudRun.d.ts

@@ -106,6 +106,18 @@ export type DeployConfigCloudRunService = {
    * defaults to gen1 according to gcloud
    */
   executionEnvironment?: "gen2" | "gen1";
+  /**
+   * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
+   *
+   * Defaults to false.
+   *
+   * Your service needs to be able to handle http2 requests.
+   * Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
+   *
+   */
+  http2?: boolean;
+} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
+export type DeployConfigCloudRunNetworkConfig = {
   network?: string;
   /**
    * vpc subnet to use, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--subnet
@@ -119,17 +131,7 @@ export type DeployConfigCloudRunService = {
    * vpc connector
    */
   vpcConnector?: string;
-  /**
-   * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
-   *
-   * Defaults to false.
-   *
-   * Your service needs to be able to handle http2 requests.
-   * Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
-   *
-   */
-  http2?: boolean;
-} & DeployConfigCloudRunWithVolumes;
+};
 export type DeployConfigCloudRunJobBase = {
   /**
    * command
@@ -157,7 +159,7 @@ export type DeployConfigCloudRunJobBase = {
    * number of tasks that may run concurrently, defaults to 1
    */
   parallelism?: number;
-} & DeployConfigCloudRunWithVolumes;
+} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
 type Minute = string;
 type Hour = string;
 type DayOfMonth = string;