@catladder/cli 0.0.0-main-769c42d3 → 0.0.0-main-e3289b9f

package/dist/bundles/catenv/index.js

@@ -40532,7 +40532,7 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
       // custom script
-      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.componentConfig.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
       "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }
@@ -40917,7 +40917,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-769c42d3" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-e3289b9f" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42758,6 +42758,7 @@ var createArgsString_1 = __nccwpck_require__(8686);
 var jobName_1 = __nccwpck_require__(7311);
 var common_1 = __nccwpck_require__(5655);
 var getLabels_1 = __nccwpck_require__(486);
+var volumes_1 = __nccwpck_require__(8662);
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -42812,6 +42813,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({
@@ -42827,8 +42830,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);
@@ -42906,12 +42910,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__(486);
 var createArgsString_1 = __nccwpck_require__(8686);
 var getServiceName_1 = __nccwpck_require__(9391);
 var common_1 = __nccwpck_require__(5655);
+var volumes_1 = __nccwpck_require__(8662);
 var getServiceDeployScript = function (context, service, nameSuffix) {
   var _a, _b, _c, _d, _e;
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
@@ -42920,7 +42956,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), {
@@ -42936,8 +42972,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) {
@@ -43246,6 +43284,69 @@ exports.getDeployJobVariables = getDeployJobVariables;
 
 /***/ }),
 
+/***/ 8662:
+/***/ (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;
+
+/***/ }),
+
 /***/ 1344:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/bundles/cli/index.js

@@ -355462,7 +355462,7 @@ var createRailsBuildJobs = function (context) {
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
       // custom script
-      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.componentConfig.dir), "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
       //  replace private git ssh gem sources with https to make bundler with credentials via env var work
       "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")], false)
     }
@@ -355847,7 +355847,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-769c42d3" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-e3289b9f" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -357688,6 +357688,7 @@ var createArgsString_1 = __nccwpck_require__(8686);
 var jobName_1 = __nccwpck_require__(77311);
 var common_1 = __nccwpck_require__(75655);
 var getLabels_1 = __nccwpck_require__(30486);
+var volumes_1 = __nccwpck_require__(84497);
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -357742,6 +357743,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({
@@ -357757,8 +357760,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);
@@ -357836,12 +357840,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__(30486);
 var createArgsString_1 = __nccwpck_require__(8686);
 var getServiceName_1 = __nccwpck_require__(89391);
 var common_1 = __nccwpck_require__(75655);
+var volumes_1 = __nccwpck_require__(84497);
 var getServiceDeployScript = function (context, service, nameSuffix) {
   var _a, _b, _c, _d, _e;
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
@@ -357850,7 +357886,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), {
@@ -357866,8 +357902,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) {
@@ -358176,6 +358214,69 @@ exports.getDeployJobVariables = getDeployJobVariables;
 
 /***/ }),
 
+/***/ 84497:
+/***/ (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;
+
+/***/ }),
+
 /***/ 81344:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {