@catladder/pipeline 0.0.0-refactor-cloud-run-825d7e86 → 0.0.0-refactore-catenv-command-validates-argument-78d05852

package/dist/build/rails/build.js

@@ -74,7 +74,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)
     }

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

@@ -28290,7 +28290,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)
     }
@@ -28740,7 +28740,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-cloud-run-825d7e86" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactore-catenv-command-validates-argument-78d05852" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -29650,7 +29650,7 @@ exports.__esModule = true;
 exports.translateLegacyFromComponents = exports.resolveReferences = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var string_replace_async_1 = __importDefault(__nccwpck_require__(4439));
-var REGEX = /\$\{(([^:]+):)?([^}]+)}/gm;
+var REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
 var resolveReferences = function (vars, getOtherVariables, alreadyVisitedBase) {
   if (alreadyVisitedBase === void 0) {
     alreadyVisitedBase = {};
@@ -30584,7 +30584,7 @@ var getLabels_1 = __nccwpck_require__(2101);
 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);
@@ -30595,7 +30595,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;
@@ -30607,7 +30607,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;
@@ -30635,9 +30635,7 @@ 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 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
+  // 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({
     command: '"' + commandArray.join(",") + '"'
@@ -30647,10 +30645,13 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     })),
     image: job.image || commonDeployArgs.image,
     memory: job.memory || "512Mi",
-    "task-timeout": job.timeout || "10m"
+    "task-timeout": job.timeout || "10m",
+    parallelism: job.parallelism || 1,
+    "env-vars-file": "____envvars.yaml",
+    "max-retries": 0
   }));
   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)], false);
 };
 var getCreateScheduleScripts = function (context) {
   var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
@@ -30670,7 +30671,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;
@@ -30756,9 +30757,10 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
     "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
     ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
-    "cpu-boost": true
+    "cpu-boost": true,
+    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment
   }));
-  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) {
@@ -30766,7 +30768,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;
 
@@ -30811,11 +30813,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__(4436);
 var artifactsRegistry_1 = __nccwpck_require__(998);
+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) {
@@ -31225,22 +31239,28 @@ var lodash_1 = __nccwpck_require__(3255);
  * @param args args record
  * @returns
  */
-var createArgsString = function (args) {
-  return Object.entries(args).filter(function (_a) {
-    var _b = __read(_a, 2),
-      value = _b[1];
-    return !(0, lodash_1.isNil)(value);
-  }).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    if (value === true) {
-      return "--".concat(key);
-    } else if (value === false) {
-      return "--no-".concat(key);
-    }
-    return "--".concat(key, "=").concat(value);
-  }).join(" ");
+var createArgsString = function () {
+  var args = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args[_i] = arguments[_i];
+  }
+  return args.map(function (argObj) {
+    return Object.entries(argObj).filter(function (_a) {
+      var _b = __read(_a, 2),
+        value = _b[1];
+      return !(0, lodash_1.isNil)(value);
+    }).map(function (_a) {
+      var _b = __read(_a, 2),
+        key = _b[0],
+        value = _b[1];
+      if (value === true) {
+        return "--".concat(key);
+      } else if (value === false) {
+        return "--no-".concat(key);
+      }
+      return "--".concat(key, "=").concat(value);
+    });
+  }).flat().join(" ");
 };
 exports.createArgsString = createArgsString;
 

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-cloud-run-825d7e86" || "";
+exports.PIPELINE_IMAGE_TAG = "refactore-catenv-command-validates-argument-78d05852" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/resolveReferences.js

@@ -146,7 +146,7 @@ exports.__esModule = true;
 exports.translateLegacyFromComponents = exports.resolveReferences = void 0;
 var lodash_1 = require("lodash");
 var string_replace_async_1 = __importDefault(require("string-replace-async"));
-var REGEX = /\$\{(([^:]+):)?([^}]+)}/gm;
+var REGEX = /\$\{(([^:}]+):)?([^}]+)}/gm;
 var resolveReferences = function (vars, getOtherVariables, alreadyVisitedBase) {
   if (alreadyVisitedBase === void 0) {
     alreadyVisitedBase = {};

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

@@ -51,7 +51,7 @@ var getLabels_1 = require("../../../context/getLabels");
 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);
@@ -62,7 +62,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;
@@ -74,7 +74,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;
@@ -102,9 +102,7 @@ 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 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
+  // 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({
     command: '"' + commandArray.join(",") + '"'
@@ -114,10 +112,13 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     })),
     image: job.image || commonDeployArgs.image,
     memory: job.memory || "512Mi",
-    "task-timeout": job.timeout || "10m"
+    "task-timeout": job.timeout || "10m",
+    parallelism: job.parallelism || 1,
+    "env-vars-file": "____envvars.yaml",
+    "max-retries": 0
   }));
   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)], false);
 };
 var getCreateScheduleScripts = function (context) {
   var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
@@ -137,7 +138,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;

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

@@ -38,9 +38,10 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
     "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
     ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
-    "cpu-boost": true
+    "cpu-boost": true,
+    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment
   }));
-  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) {
@@ -48,6 +49,6 @@ 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;

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

@@ -1,5 +1,8 @@
 import type { Context } from "../../../types/context";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
+export declare const gcloudCmd: (version?: "beta" | undefined) => string;
+export declare const gcloudRunCmd: (version?: "beta" | undefined) => string;
+export declare const gcloudSchedulerCmd: (version?: "beta" | undefined) => string;
 export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
 export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;

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

@@ -33,11 +33,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 = require("../../types");
 var artifactsRegistry_1 = require("../artifactsRegistry");
+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/deploy/cloudRun/utils/createArgsString.d.ts

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

package/dist/deploy/cloudRun/utils/createArgsString.js

@@ -35,21 +35,27 @@ var lodash_1 = require("lodash");
  * @param args args record
  * @returns
  */
-var createArgsString = function (args) {
-  return Object.entries(args).filter(function (_a) {
-    var _b = __read(_a, 2),
-      value = _b[1];
-    return !(0, lodash_1.isNil)(value);
-  }).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    if (value === true) {
-      return "--".concat(key);
-    } else if (value === false) {
-      return "--no-".concat(key);
-    }
-    return "--".concat(key, "=").concat(value);
-  }).join(" ");
+var createArgsString = function () {
+  var args = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args[_i] = arguments[_i];
+  }
+  return args.map(function (argObj) {
+    return Object.entries(argObj).filter(function (_a) {
+      var _b = __read(_a, 2),
+        value = _b[1];
+      return !(0, lodash_1.isNil)(value);
+    }).map(function (_a) {
+      var _b = __read(_a, 2),
+        key = _b[0],
+        value = _b[1];
+      if (value === true) {
+        return "--".concat(key);
+      } else if (value === false) {
+        return "--no-".concat(key);
+      }
+      return "--".concat(key, "=").concat(value);
+    });
+  }).flat().join(" ");
 };
 exports.createArgsString = createArgsString;

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

@@ -70,6 +70,15 @@ export declare type DeployConfigCloudRunService = {
    * memory limit. Defaults to 512MB
    */
   memory?: Memory;
+  /**
+   *
+   * set the execution environment.
+   *
+   * see https://cloud.google.com/run/docs/about-execution-environments
+   *
+   * defaults to gen1 according to gcloud
+   */
+  executionEnvironment?: "gen2" | "gen1";
 };
 export declare type DeployConfigCloudRunJobBase = {
   /**
@@ -81,7 +90,7 @@ export declare type DeployConfigCloudRunJobBase = {
    */
   image?: string;
   /**
-   * memory limit of the job, defaults to 51Mi
+   * memory limit of the job, defaults to 512Mi
    */
   memory?: `${number}${"M" | "G" | "Mi" | "Gi"}`;
   /**
@@ -90,6 +99,10 @@ export declare type DeployConfigCloudRunJobBase = {
    * you can specify something like 10m30s
    */
   timeout?: string;
+  /**
+   * number of tasks that may run concurrently, defaults to 1
+   */
+  parallelism?: number;
 };
 declare type Minute = string;
 declare type Hour = string;
@@ -99,6 +112,12 @@ declare type Month = string;
 export declare type DeployConfigCloudRunJobWithSchedule = DeployConfigCloudRunJobBase & {
   when: "schedule";
   schedule: `${Minute} ${Hour} ${DayOfMonth} ${Month} ${DayOfWeek}`;
+  /**
+   * Max number of retries of the cloud scheduler.
+   * Note: the task itself is never retried.
+   *
+   * defaults to 0 (no retries)
+   */
   maxRetryAttempts?: 0 | 1 | 2 | 3 | 4 | 5;
 };
 export declare type DeployConfigCloudRunJobNormal = DeployConfigCloudRunJobBase & {