@catladder/cli 0.0.0-main-a4e913e3 → 0.0.0-main-abe8c6c7

package/dist/bundles/catenv/index.js

@@ -39223,14 +39223,21 @@ exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = expo
 var path_1 = __nccwpck_require__(1017);
 
 var getYarnCache = function (context, policy) {
+  var _a;
+
   if (policy === void 0) {
     policy = "pull-push";
   }
 
-  return [{
+  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  return [componentIsInWorkspace ? {
     key: "yarn",
     policy: policy,
     paths: [".yarn"]
+  } : {
+    key: context.componentConfig.dir + "-yarn",
+    policy: policy,
+    paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
   }];
 };
 
@@ -39638,7 +39645,7 @@ var getYarnInstallCommand = function (context, options) {
 
     return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
   });
-  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production") // needs yarn plugin import workspace-tools
+  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production && yarn rebuild") // needs yarn plugin import workspace-tools
   : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
 };
 
@@ -39882,7 +39889,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-a4e913e3" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-abe8c6c7" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41353,6 +41360,8 @@ var types_1 = __nccwpck_require__(3109);
 
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 
+var gitlab_1 = __nccwpck_require__(4997);
+
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b;
 
@@ -41394,12 +41403,12 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
   };
 
-  var getJobDeployScripts = function (jobName, job) {
+  var getJobCreateScripts = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
     // lucky, update on the other hand accepts it... so let's just imediatly update it
     // also we cannot upsert a job, so we have to create it and catch the error and then update
     var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs);
-    return ["set +e", "gcloud beta run jobs create ".concat(args), "set -e", "gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")];
+    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(args)])), false), ["gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")], false);
   };
 
   var getJobRunScript = function (jobName) {
@@ -41418,13 +41427,25 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return [getFullJobName(name), job];
   });
 
-  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml", "cat ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];
 
-    return getJobDeployScripts(name, job);
-  }).flat()), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
+    return getJobCreateScripts(name, job);
+  }).flat()), false), __read(jobsWithNames.filter(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return job.when === "preDeploy";
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobRunScript(name);
+  })), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];
@@ -41536,11 +41557,11 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
   additionalSecretKeys: function () {
     return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
   },
-  getAdditionalEnvVars: function (_a) {
-    var fullName = _a.fullName,
-        env = _a.env,
-        componentName = _a.componentName,
-        deployConfigRaw = _a.deployConfigRaw;
+  getAdditionalEnvVars: function (ctx) {
+    var fullName = ctx.fullName,
+        env = ctx.env,
+        componentName = ctx.componentName,
+        deployConfigRaw = ctx.deployConfigRaw;
     var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
@@ -44029,6 +44050,59 @@ exports.__esModule = true;
 
 /***/ }),
 
+/***/ 4997:
+/***/ (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.allowFailureInScripts = void 0;
+
+var allowFailureInScripts = function (script) {
+  return __spreadArray(__spreadArray(["set +e"], __read(script), false), ["set -e" // reenable
+  ], false);
+};
+
+exports.allowFailureInScripts = allowFailureInScripts;
+
+/***/ }),
+
 /***/ 7461:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/bundles/cli/index.js

@@ -350094,14 +350094,21 @@ exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = expo
 var path_1 = __nccwpck_require__(71017);
 
 var getYarnCache = function (context, policy) {
+  var _a;
+
   if (policy === void 0) {
     policy = "pull-push";
   }
 
-  return [{
+  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  return [componentIsInWorkspace ? {
     key: "yarn",
     policy: policy,
     paths: [".yarn"]
+  } : {
+    key: context.componentConfig.dir + "-yarn",
+    policy: policy,
+    paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
   }];
 };
 
@@ -350509,7 +350516,7 @@ var getYarnInstallCommand = function (context, options) {
 
     return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
   });
-  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production") // needs yarn plugin import workspace-tools
+  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production && yarn rebuild") // needs yarn plugin import workspace-tools
   : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
 };
 
@@ -350753,7 +350760,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-a4e913e3" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-abe8c6c7" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352224,6 +352231,8 @@ var types_1 = __nccwpck_require__(63109);
 
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
 
+var gitlab_1 = __nccwpck_require__(84997);
+
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b;
 
@@ -352265,12 +352274,12 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
   };
 
-  var getJobDeployScripts = function (jobName, job) {
+  var getJobCreateScripts = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
     // lucky, update on the other hand accepts it... so let's just imediatly update it
     // also we cannot upsert a job, so we have to create it and catch the error and then update
     var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs);
-    return ["set +e", "gcloud beta run jobs create ".concat(args), "set -e", "gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")];
+    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(args)])), false), ["gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")], false);
   };
 
   var getJobRunScript = function (jobName) {
@@ -352289,13 +352298,25 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return [getFullJobName(name), job];
   });
 
-  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml", "cat ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];
 
-    return getJobDeployScripts(name, job);
-  }).flat()), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
+    return getJobCreateScripts(name, job);
+  }).flat()), false), __read(jobsWithNames.filter(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return job.when === "preDeploy";
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobRunScript(name);
+  })), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];
@@ -352407,11 +352428,11 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
   additionalSecretKeys: function () {
     return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
   },
-  getAdditionalEnvVars: function (_a) {
-    var fullName = _a.fullName,
-        env = _a.env,
-        componentName = _a.componentName,
-        deployConfigRaw = _a.deployConfigRaw;
+  getAdditionalEnvVars: function (ctx) {
+    var fullName = ctx.fullName,
+        env = ctx.env,
+        componentName = ctx.componentName,
+        deployConfigRaw = ctx.deployConfigRaw;
     var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
@@ -354900,6 +354921,59 @@ exports.__esModule = true;
 
 /***/ }),
 
+/***/ 84997:
+/***/ (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.allowFailureInScripts = void 0;
+
+var allowFailureInScripts = function (script) {
+  return __spreadArray(__spreadArray(["set +e"], __read(script), false), ["set -e" // reenable
+  ], false);
+};
+
+exports.allowFailureInScripts = allowFailureInScripts;
+
+/***/ }),
+
 /***/ 37461:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {