@catladder/cli 0.0.0-main-ec94b6d9 → 0.0.0-main-c6343c50

package/dist/bundles/catenv/index.js

@@ -40074,7 +40074,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-ec94b6d9" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-c6343c50" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41549,6 +41549,8 @@ var database_1 = __nccwpck_require__(1384);
 
 var gitlab_1 = __nccwpck_require__(4997);
 
+var jobName_1 = __nccwpck_require__(7311);
+
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -41586,7 +41588,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var serviceName = context.environment.fullName.toLowerCase();
 
   var getFullJobName = function (name) {
-    return context.environment.fullName.toLowerCase() + "-" + name.toLowerCase();
+    return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
   };
 
   var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {}) // filter out disabled jobs
@@ -41772,6 +41774,8 @@ var gitlab_1 = __nccwpck_require__(4997);
 
 var deployJob_1 = __nccwpck_require__(2256);
 
+var jobName_1 = __nccwpck_require__(7311);
+
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 
@@ -41829,7 +41833,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
           name = _b[0],
           job = _b[1];
 
-      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat(name, ":run")];
+      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
     return __assign(__assign({
       HOST_CANONICAL: HOST_CANONICAL
@@ -41949,6 +41953,23 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 7311:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getCloudRunJobName = void 0;
+
+var getCloudRunJobName = function (fullAppName, jobName) {
+  return fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+};
+
+exports.getCloudRunJobName = getCloudRunJobName;
+
+/***/ }),
+
 /***/ 6531:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/bundles/cli/index.js

@@ -351025,7 +351025,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-ec94b6d9" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-c6343c50" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352500,6 +352500,8 @@ var database_1 = __nccwpck_require__(41384);
 
 var gitlab_1 = __nccwpck_require__(84997);
 
+var jobName_1 = __nccwpck_require__(77311);
+
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -352537,7 +352539,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var serviceName = context.environment.fullName.toLowerCase();
 
   var getFullJobName = function (name) {
-    return context.environment.fullName.toLowerCase() + "-" + name.toLowerCase();
+    return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
   };
 
   var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {}) // filter out disabled jobs
@@ -352723,6 +352725,8 @@ var gitlab_1 = __nccwpck_require__(84997);
 
 var deployJob_1 = __nccwpck_require__(82256);
 
+var jobName_1 = __nccwpck_require__(77311);
+
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 
@@ -352780,7 +352784,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
           name = _b[0],
           job = _b[1];
 
-      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat(name, ":run")];
+      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
     return __assign(__assign({
       HOST_CANONICAL: HOST_CANONICAL
@@ -352900,6 +352904,23 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 77311:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getCloudRunJobName = void 0;
+
+var getCloudRunJobName = function (fullAppName, jobName) {
+  return fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+};
+
+exports.getCloudRunJobName = getCloudRunJobName;
+
+/***/ }),
+
 /***/ 16531:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-ec94b6d9",
+    "@catladder/pipeline": "0.0.0-main-c6343c50",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-main-ec94b6d9",
+  "version": "0.0.0-main-c6343c50",
   "stableVersion": "0.0.0"
 }