@catladder/pipeline 1.167.0 → 1.168.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 = "v1-167-0-1ded88bb" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v1-168-1-1cf21d4c" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getEnvironmentVariables.d.ts

@@ -9,7 +9,7 @@ export type SecretEnvVar = {
 declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
   ENV_SHORT: string;
   APP_DIR: string;
-  ENV_TYPE: "dev" | "review" | "stage" | "prod" | "local";
+  ENV_TYPE: "stage" | "dev" | "review" | "prod" | "local";
 };
 type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 export type PredefinedVariables = BasePredefinedVariables & {

package/dist/deploy/base/deploy.d.ts

@@ -1,5 +1,5 @@
+import type { DeployJobDefinition } from "../../types";
 import { type ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services" | "runnerVariables">;
 export declare const createDeployJob: (context: ComponentContext, jobDefinition: DeployJobDefinition) => CatladderJob;

package/dist/deploy/base/deploy.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+var createJobCache_1 = require("../../build/cache/createJobCache");
 var docker_1 = require("../../build/docker");
 var sbom_1 = require("../../build/sbom");
 var context_1 = require("../../types/context");
@@ -70,7 +71,7 @@ var createDeployJob = function (context, jobDefinition) {
     name: exports.DEPLOY_JOB_NAME,
     script: jobDefinition.script,
     image: jobDefinition.image,
-    cache: jobDefinition.cache,
+    cache: jobDefinition.cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache) : undefined,
     artifacts: jobDefinition.artifacts,
     services: jobDefinition.services,
     envMode: "stagePerEnv",

package/dist/deploy/base/index.d.ts

@@ -1,8 +1,6 @@
 import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition, RollbackJobDefinition, StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { type DeployJobDefinition } from "./deploy";
-import { type RollbackJobDefinition } from "./rollback";
-import { type StopJobDefinition } from "./stop";
 export declare const createDeployementJobs: (context: ComponentContext, definitions: {
   deploy: DeployJobDefinition;
   stop?: StopJobDefinition;

package/dist/deploy/base/rollback.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { RollbackJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "runnerVariables" | "image">;
 export declare const createRollbackJob: (context: ComponentContext, jobDefinition: RollbackJobDefinition) => CatladderJob;

package/dist/deploy/base/stop.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "runnerVariables">;
 export declare const createStopJob: (context: ComponentContext, jobDefinition: StopJobDefinition) => CatladderJob;

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;
@@ -45,13 +53,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
-var gitlab_1 = require("../../../utils/gitlab");
 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);
@@ -96,58 +104,73 @@ var getJobRunScripts = function (context, when) {
 };
 exports.getJobRunScripts = getJobRunScripts;
 var getJobCreateScripts = function (context) {
-  var jobsWithNames = getCloudRunJobsWithNames(context);
-  return jobsWithNames.map(function (_a) {
-    var job = _a.job,
+  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,
       jobName = _a.jobName;
-    return getJobCreateScriptsForJob(context, jobName, job);
-  }).flat();
+    var commandArray = Array.isArray(command) ? command : 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 = (0, createArgsString_1.createArgsString)(__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, "\""),
+      project: project,
+      region: region,
+      cpu: cpu,
+      memory: memory,
+      parallelism: parallelism,
+      "task-timeout": timeout,
+      "env-vars-file": constants_1.ENV_VARS_FILENAME,
+      "max-retries": 0
+    }, deployArgs));
+    // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
+    // lucky, update on the other hand accepts it... so let's just imediatly update it
+    // we cannot upsert a job, so we have to create it and catch the error and then update
+    var hasVolumes = Object.keys(volumes || {}).length > 0;
+    var needsBeta = hasVolumes ? "beta" : undefined;
+    var volumeArgs = hasVolumes ? createArgsString_1.createArgsString.apply(void 0, __spreadArray([], __read((0, volumes_1.createVolumeConfig)(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)(needsBeta), " jobs update \"$current_job_name\" ").concat(commonDeployArgsString, " ").concat(volumeArgs), "else", "  ".concat((0, common_1.gcloudRunCmd)(), " jobs create \"$current_job_name\" ").concat(commonDeployArgsString), "fi"].filter(utils_1.notNil).join("\n");
+  });
 };
 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 yet accept `--add-volume` 🤦
-  // lucky, update on the other hand accepts it... so let's just imediatly update it
-  // 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.toString()
-    })),
-    image: job.image || commonDeployArgs.image,
-    cpu: job === null || job === void 0 ? void 0 : job.cpu,
-    memory: job.memory || "512Mi",
-    "task-timeout": job.timeout || "10m",
-    parallelism: job.parallelism || 1,
-    "env-vars-file": constants_1.ENV_VARS_FILENAME,
-    "max-retries": 0
-  }));
-  var requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 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)(requiresBeta ? "beta" : undefined), " jobs update ").concat(argsString, " ").concat(createArgsString_1.createArgsString.apply(void 0, __spreadArray([], __read((0, volumes_1.createVolumeConfig)(job === null || job === void 0 ? void 0 : job.volumes, "job")), false)))], 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,
+  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)({
-      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();
+    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");
+  });
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
 var getCloudRunJobsWithSchedule = function (context) {
@@ -156,10 +179,12 @@ var getCloudRunJobsWithSchedule = function (context) {
     return entry.job.when === "schedule";
   }).map(function (_a) {
     var job = _a.job,
-      jobName = _a.jobName;
+      jobName = _a.jobName,
+      jobKey = _a.jobKey;
     return {
       job: job,
       jobName: jobName,
+      jobKey: jobKey,
       schedulerName: jobName.concat("-scheduler")
     };
   });
@@ -176,11 +201,12 @@ var getCloudRunJobsWithNames = function (context) {
     return Boolean(entry[1]);
   }).map(function (_a) {
     var _b = __read(_a, 2),
-      name = _b[0],
+      jobKey = _b[0],
       job = _b[1];
     return {
-      jobName: getFullJobName(name),
-      job: job
+      jobName: getFullJobName(jobKey),
+      job: job,
+      jobKey: jobKey
     };
   });
   return jobsWithNames;

package/dist/deploy/custom/deployJob.js

@@ -35,13 +35,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCustomDeployJobs = void 0;
+var getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
 var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
     // should not happen
@@ -51,18 +52,19 @@ var createCustomDeployJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
     noCustomPostInstall: true
   });
-  return (0, base_1.createDeployementJobs)(context, {
+  var result = (0, base_1.createDeployementJobs)(context, {
     deploy: {
       image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-      cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+      cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
       script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
       variables: {}
     },
     stop: deployConfig.stopScript ? {
-      image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+      image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
       script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
       variables: {}
     } : undefined
   });
+  return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;

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

@@ -1,5 +1,5 @@
+import type { WithCacheConfig } from "../../build";
 import type { GitlabJobImage } from "../../types";
-import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigCustom = {
   /**
@@ -26,8 +26,4 @@ export type DeployConfigCustom = {
    * image to use
    */
   jobImage?: GitlabJobImage;
-  /**
-   * customize cache for the job
-   */
-  jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase & WithCacheConfig;