@catladder/cli 0.0.0-main-825d7e86 → 0.0.0-main-84dc1fbc

package/dist/bundles/catenv/index.js

@@ -40920,7 +40920,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-825d7e86" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-84dc1fbc" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42764,7 +42764,7 @@ var getLabels_1 = __nccwpck_require__(486);
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
+  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
 };
 var getDeleteSchedulesScripts = function (context) {
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
@@ -42775,7 +42775,7 @@ var getDeleteSchedulesScripts = function (context) {
   });
   return jobsWithSchedule.map(function (_a) {
     var schedulerName = _a.schedulerName;
-    return ["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)];
+    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(schedulerName, " ").concat(argsString)];
   }).flat();
 };
 exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
@@ -42787,7 +42787,7 @@ var getDeleteJobsScripts = function (context) {
     var jobName = _a.jobName;
     return [
     // first delete all job executions. Otherwise delete might fail if one of those is still running
-    "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
+    "".concat((0, common_1.gcloudRunCmd)(), " jobs executions list ").concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} ").concat((0, common_1.gcloudRunCmd)(), " jobs executions delete {}  --quiet ").concat(commonArgsString), "".concat((0, common_1.gcloudRunCmd)(), " jobs delete ").concat(jobName, " ").concat(commonArgsString)];
   });
 };
 exports.getDeleteJobsScripts = getDeleteJobsScripts;
@@ -42830,7 +42830,7 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     "task-timeout": job.timeout || "10m"
   }));
   var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
-  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(argsString)])), false), ["gcloud beta run jobs update ".concat(argsString, " --env-vars-file=____envvars.yaml")], false);
+  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, " --env-vars-file=____envvars.yaml")], false);
 };
 var getCreateScheduleScripts = function (context) {
   var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
@@ -42850,7 +42850,7 @@ var getCreateScheduleScripts = function (context) {
       "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)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
+    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();
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
@@ -42938,7 +42938,7 @@ 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
   }));
-  return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
+  return "".concat((0, common_1.gcloudRunCmd)(), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {
@@ -42946,7 +42946,7 @@ var getServiceDeleteScript = function (context, serviceSuffix) {
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var fullServiceName = serviceSuffix ? "".concat(serviceName, "-").concat(serviceSuffix) : serviceName;
-  return ["gcloud run services delete ".concat(fullServiceName, " ").concat(commonArgsString)];
+  return ["".concat((0, common_1.gcloudRunCmd)(), " services delete ").concat(fullServiceName, " ").concat(commonArgsString)];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;
 
@@ -42991,11 +42991,23 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = void 0;
+exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 var types_1 = __nccwpck_require__(3109);
 var artifactsRegistry_1 = __nccwpck_require__(8159);
+var gcloudCmd = function (version) {
+  return version ? "gcloud ".concat(version) : "gcloud";
+};
+exports.gcloudCmd = gcloudCmd;
+var gcloudRunCmd = function (version) {
+  return "".concat((0, exports.gcloudCmd)(version), " run");
+};
+exports.gcloudRunCmd = gcloudRunCmd;
+var gcloudSchedulerCmd = function (version) {
+  return "".concat((0, exports.gcloudCmd)(version), " scheduler");
+};
+exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
 var setGoogleProjectNumberScript = function (deployConfig) {
-  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
+  return ["export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
 exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
 var makeLabelString = function (obj) {

package/dist/bundles/cli/index.js

@@ -355470,7 +355470,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-825d7e86" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-84dc1fbc" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -357314,7 +357314,7 @@ var getLabels_1 = __nccwpck_require__(30486);
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
+  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
 };
 var getDeleteSchedulesScripts = function (context) {
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
@@ -357325,7 +357325,7 @@ var getDeleteSchedulesScripts = function (context) {
   });
   return jobsWithSchedule.map(function (_a) {
     var schedulerName = _a.schedulerName;
-    return ["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)];
+    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(schedulerName, " ").concat(argsString)];
   }).flat();
 };
 exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
@@ -357337,7 +357337,7 @@ var getDeleteJobsScripts = function (context) {
     var jobName = _a.jobName;
     return [
     // first delete all job executions. Otherwise delete might fail if one of those is still running
-    "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
+    "".concat((0, common_1.gcloudRunCmd)(), " jobs executions list ").concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} ").concat((0, common_1.gcloudRunCmd)(), " jobs executions delete {}  --quiet ").concat(commonArgsString), "".concat((0, common_1.gcloudRunCmd)(), " jobs delete ").concat(jobName, " ").concat(commonArgsString)];
   });
 };
 exports.getDeleteJobsScripts = getDeleteJobsScripts;
@@ -357380,7 +357380,7 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     "task-timeout": job.timeout || "10m"
   }));
   var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
-  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(argsString)])), false), ["gcloud beta run jobs update ".concat(argsString, " --env-vars-file=____envvars.yaml")], false);
+  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, " --env-vars-file=____envvars.yaml")], false);
 };
 var getCreateScheduleScripts = function (context) {
   var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
@@ -357400,7 +357400,7 @@ var getCreateScheduleScripts = function (context) {
       "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)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
+    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();
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
@@ -357488,7 +357488,7 @@ 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
   }));
-  return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
+  return "".concat((0, common_1.gcloudRunCmd)(), " deploy ").concat(fullServiceName, " ").concat(argsString);
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 var getServiceDeleteScript = function (context, serviceSuffix) {
@@ -357496,7 +357496,7 @@ var getServiceDeleteScript = function (context, serviceSuffix) {
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var fullServiceName = serviceSuffix ? "".concat(serviceName, "-").concat(serviceSuffix) : serviceName;
-  return ["gcloud run services delete ".concat(fullServiceName, " ").concat(commonArgsString)];
+  return ["".concat((0, common_1.gcloudRunCmd)(), " services delete ").concat(fullServiceName, " ").concat(commonArgsString)];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;
 
@@ -357541,11 +357541,23 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = void 0;
+exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 var types_1 = __nccwpck_require__(63109);
 var artifactsRegistry_1 = __nccwpck_require__(28159);
+var gcloudCmd = function (version) {
+  return version ? "gcloud ".concat(version) : "gcloud";
+};
+exports.gcloudCmd = gcloudCmd;
+var gcloudRunCmd = function (version) {
+  return "".concat((0, exports.gcloudCmd)(version), " run");
+};
+exports.gcloudRunCmd = gcloudRunCmd;
+var gcloudSchedulerCmd = function (version) {
+  return "".concat((0, exports.gcloudCmd)(version), " scheduler");
+};
+exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
 var setGoogleProjectNumberScript = function (deployConfig) {
-  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
+  return ["export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
 exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
 var makeLabelString = function (obj) {

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-main-825d7e86",
+  "version": "0.0.0-main-84dc1fbc",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -73,7 +73,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-825d7e86",
+    "@catladder/pipeline": "0.0.0-main-84dc1fbc",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",