@catladder/pipeline 0.0.0-main-0fb24c4d → 0.0.0-main-e3289b9f

package/dist/bundles/catladder-gitlab/index.js

@@ -28740,7 +28740,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-0fb24c4d" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-e3289b9f" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -30581,6 +30581,7 @@ var createArgsString_1 = __nccwpck_require__(947);
 var jobName_1 = __nccwpck_require__(9357);
 var common_1 = __nccwpck_require__(5113);
 var getLabels_1 = __nccwpck_require__(2101);
+var volumes_1 = __nccwpck_require__(2118);
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -30635,6 +30636,8 @@ var getJobCreateScripts = function (context) {
 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({
@@ -30650,8 +30653,9 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     "env-vars-file": "____envvars.yaml",
     "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)(), " jobs update ").concat(argsString)], false);
+  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);
@@ -30729,12 +30733,44 @@ var __assign = this && this.__assign || function () {
   };
   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));
+};
 exports.__esModule = true;
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 var getLabels_1 = __nccwpck_require__(2101);
 var createArgsString_1 = __nccwpck_require__(947);
 var getServiceName_1 = __nccwpck_require__(5044);
 var common_1 = __nccwpck_require__(5113);
+var volumes_1 = __nccwpck_require__(2118);
 var getServiceDeployScript = function (context, service, nameSuffix) {
   var _a, _b, _c, _d, _e;
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
@@ -30743,7 +30779,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
   var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
   var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
   var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
-  var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
     // command as empty string resets it to default (uses the image's entrypoint)
     command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
   }, commonDeployArgs), {
@@ -30759,8 +30795,10 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "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);
+  })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
+  // volumes require beta
+  var requiresBeta = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes) && Object.keys(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes).length > 0;
+  return "".concat((0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {
@@ -31069,6 +31107,69 @@ exports.getDeployJobVariables = getDeployJobVariables;
 
 /***/ }),
 
+/***/ 2118:
+/***/ (function(__unused_webpack_module, exports) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.createVolumeConfig = void 0;
+var createVolumeConfig = function (volumes, type) {
+  if (!volumes) {
+    return [];
+  }
+  return __spreadArray(__spreadArray([], __read(Object.entries(volumes).map(function (_a) {
+    var _b = __read(_a, 2),
+      volumeName = _b[0],
+      _c = _b[1],
+      type = _c.type,
+      bucket = _c.bucket,
+      mountPath = _c.mountPath,
+      readonly = _c.readonly;
+    return {
+      "add-volume": "name=".concat(volumeName, ",type=").concat(type, ",bucket=").concat(bucket).concat(readonly ? ",readonly=true" : ""),
+      "add-volume-mount": "volume=".concat(volumeName, ",mount-path=").concat(mountPath)
+    };
+  })), false), [type === "service" ? {
+    "execution-environment": "gen2"
+  } : {}], false);
+};
+exports.createVolumeConfig = createVolumeConfig;
+
+/***/ }),
+
 /***/ 8718:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-0fb24c4d" || "";
+exports.PIPELINE_IMAGE_TAG = "main-e3289b9f" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

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

@@ -48,6 +48,7 @@ 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 getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -102,6 +103,8 @@ var getJobCreateScripts = function (context) {
 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({
@@ -117,8 +120,9 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     "env-vars-file": "____envvars.yaml",
     "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)(), " jobs update ").concat(argsString)], false);
+  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);

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

@@ -10,12 +10,44 @@ var __assign = this && this.__assign || function () {
   };
   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));
+};
 exports.__esModule = true;
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 var getLabels_1 = require("../../../context/getLabels");
 var createArgsString_1 = require("../utils/createArgsString");
 var getServiceName_1 = require("../utils/getServiceName");
 var common_1 = require("./common");
+var volumes_1 = require("./volumes");
 var getServiceDeployScript = function (context, service, nameSuffix) {
   var _a, _b, _c, _d, _e;
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
@@ -24,7 +56,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
   var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
   var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
   var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
-  var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+  var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
     // command as empty string resets it to default (uses the image's entrypoint)
     command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
   }, commonDeployArgs), {
@@ -40,8 +72,10 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "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);
+  })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
+  // volumes require beta
+  var requiresBeta = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes) && Object.keys(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes).length > 0;
+  return "".concat((0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {

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

@@ -0,0 +1,3 @@
+import type { DeployConfigCloudRunVolumes } from "../../types";
+import type { keyValuesArg } from "../utils/createArgsString";
+export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job") => keyValuesArg[];

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

@@ -0,0 +1,56 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.createVolumeConfig = void 0;
+var createVolumeConfig = function (volumes, type) {
+  if (!volumes) {
+    return [];
+  }
+  return __spreadArray(__spreadArray([], __read(Object.entries(volumes).map(function (_a) {
+    var _b = __read(_a, 2),
+      volumeName = _b[0],
+      _c = _b[1],
+      type = _c.type,
+      bucket = _c.bucket,
+      mountPath = _c.mountPath,
+      readonly = _c.readonly;
+    return {
+      "add-volume": "name=".concat(volumeName, ",type=").concat(type, ",bucket=").concat(bucket).concat(readonly ? ",readonly=true" : ""),
+      "add-volume-mount": "volume=".concat(volumeName, ",mount-path=").concat(mountPath)
+    };
+  })), false), [type === "service" ? {
+    "execution-environment": "gen2"
+  } : {}], false);
+};
+exports.createVolumeConfig = createVolumeConfig;

package/dist/deploy/cloudRun/utils/createArgsString.d.ts

@@ -9,5 +9,4 @@
  * @returns
  */
 export declare const createArgsString: (...args: keyValuesArg[]) => string;
-declare type keyValuesArg = Record<string, string | number | true | false | undefined>;
-export {};
+export declare type keyValuesArg = Record<string, string | number | true | false | undefined>;

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

@@ -79,7 +79,7 @@ export declare type DeployConfigCloudRunService = {
    * defaults to gen1 according to gcloud
    */
   executionEnvironment?: "gen2" | "gen1";
-};
+} & DeployConfigCloudRunWithVolumes;
 export declare type DeployConfigCloudRunJobBase = {
   /**
    * command
@@ -103,7 +103,7 @@ export declare type DeployConfigCloudRunJobBase = {
    * number of tasks that may run concurrently, defaults to 1
    */
   parallelism?: number;
-};
+} & DeployConfigCloudRunWithVolumes;
 declare type Minute = string;
 declare type Hour = string;
 declare type DayOfMonth = string;
@@ -123,6 +123,13 @@ export declare type DeployConfigCloudRunJobWithSchedule = DeployConfigCloudRunJo
 export declare type DeployConfigCloudRunJobNormal = DeployConfigCloudRunJobBase & {
   when: "manual" | "preDeploy" | "postDeploy" | "preStop" | "postStop";
 };
+export declare type DeployConfigCloudRunWithVolumes = {
+  /**
+   * adds volumes to the service. This is an experimental feature and requires beta gcloud.
+   * sets executionEnvironment to gen2 automatically, since that is required
+   */
+  volumes?: DeployConfigCloudRunVolumes;
+};
 export declare type DeployConfigCloudRunJob = DeployConfigCloudRunJobNormal | DeployConfigCloudRunJobWithSchedule;
 export declare type DeployConfigCloudRun = {
   /**
@@ -159,4 +166,11 @@ export declare type DeployConfigCloudRun = {
    */
   cloudSql?: DeployConfigCloudRunCloudSql | false;
 } & DeployConfigBase;
+export declare type DeployConfigCloudRunVolumes = Record<string, DeployConfigCloudRunVolume>;
+export declare type DeployConfigCloudRunVolume = {
+  type: "cloud-storage";
+  bucket: string;
+  mountPath: string;
+  readonly?: boolean;
+};
 export {};