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

package/dist/bundles/catenv/index.js

@@ -44,11 +44,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var getProjectConfig_1 = __nccwpck_require__(4146);
+var parseChoiceArgument_1 = __nccwpck_require__(3008);
 var printVariables_1 = __nccwpck_require__(7770);
 var writeDotEnvFiles_1 = __nccwpck_require__(4295);
 var writeEnvDTs_1 = __nccwpck_require__(4615);
-exports["default"] = (function (choice) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
+exports["default"] = (function () { return __awaiter(void 0, void 0, void 0, function () {
+    var config, choice;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0: return [4 /*yield*/, (0, getProjectConfig_1.getProjectConfig)()];
@@ -57,6 +58,7 @@ exports["default"] = (function (choice) { return __awaiter(void 0, void 0, void
                 if (!config) {
                     return [2 /*return*/];
                 }
+                choice = (0, parseChoiceArgument_1.parseChoiceArgument)(config);
                 return [4 /*yield*/, (0, printVariables_1.printVariables)(config, choice)];
             case 2:
                 _a.sent();
@@ -543,9 +545,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 var catenv_1 = __importDefault(__nccwpck_require__(3073));
-var parseChoice_1 = __nccwpck_require__(3319);
-var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
-(0, catenv_1["default"])(choice).then(function () {
+(0, catenv_1["default"])().then(function () {
     // we have to exit manually, because we have some file watches
     process.exit();
 });
@@ -795,15 +795,12 @@ var resolveSecrets = function (vorpal, varSets) { return __awaiter(void 0, void
                             .map(function (_a) {
                             var key = _a[0], value = _a[1];
                             var secretKey = set.secretEnvVarKeys.find(function (k) { return k.key === key; });
-                            if (secretKey) {
-                                if (secretKey.hidden) {
-                                    return null;
-                                }
-                                for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
-                                    var variable = allVariablesInGitlab_1[_i];
-                                    value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
-                                }
-                                return [key, value];
+                            if ((secretKey === null || secretKey === void 0 ? void 0 : secretKey.hidden) || value === undefined) {
+                                return null;
+                            }
+                            for (var _i = 0, allVariablesInGitlab_1 = allVariablesInGitlab; _i < allVariablesInGitlab_1.length; _i++) {
+                                var variable = allVariablesInGitlab_1[_i];
+                                value = value.replace(new RegExp("\\$" + variable.key, "g"), variable.value);
                             }
                             return [key, value];
                         })
@@ -889,6 +886,56 @@ exports.parseChoice = parseChoice;
 
 /***/ }),
 
+/***/ 3008:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+exports.__esModule = true;
+exports.parseChoiceArgument = exports.getEnvComponentArgument = void 0;
+var pipeline_1 = __nccwpck_require__(5355);
+var envTypes = Object.keys(pipeline_1.ENV_TYPES);
+var getEnvComponentArgument = function () {
+    var _a;
+    var componentMatch = "([a-zA-Z0-9_-]+)";
+    var argRegexp = new RegExp("^((".concat(envTypes.join('|'), "):").concat(componentMatch, "|").concat(componentMatch, ")$"));
+    var envComponent = (_a = process.argv[2]) !== null && _a !== void 0 ? _a : '';
+    var _b = argRegexp.exec(envComponent), _c = _b[2], env = _c === void 0 ? 'local' : _c, componentNameWithEnv = _b[3], onlyComponentName = _b[4];
+    if (!(0, pipeline_1.isKnowEnvType)(env)) {
+        throw new Error("invalid env type! ".concat(env, ".\nEnv must be one of: ").concat(envTypes.join(', ')));
+    }
+    if (componentNameWithEnv === null || componentNameWithEnv === void 0 ? void 0 : componentNameWithEnv.length) {
+        return { env: env, componentName: componentNameWithEnv };
+    }
+    if (onlyComponentName === null || onlyComponentName === void 0 ? void 0 : onlyComponentName.length) {
+        return { env: env, componentName: onlyComponentName };
+    }
+    return { env: env };
+};
+exports.getEnvComponentArgument = getEnvComponentArgument;
+/**
+ * Parses the environment component argument and returns a Choice object.
+ * @param envComponent - The environment component argument to parse.
+ * @returns The parsed Choice object.
+ * @throws Error if the env type is invalid.
+ */
+var parseChoiceArgument = function (_a) {
+    var components = _a.components;
+    var _b = (0, exports.getEnvComponentArgument)(), env = _b.env, componentName = _b.componentName;
+    var componentNames = Object.keys(components);
+    if ((componentName === null || componentName === void 0 ? void 0 : componentName.length) && !componentNames.includes(componentName)) {
+        throw new Error("invalid component name! Component must be one of: ".concat(componentNames.join(', ')));
+    }
+    if (componentName === null || componentName === void 0 ? void 0 : componentName.length) {
+        return { env: env, componentName: componentName };
+    }
+    return { env: env };
+};
+exports.parseChoiceArgument = parseChoiceArgument;
+//# sourceMappingURL=parseChoiceArgument.js.map
+
+/***/ }),
+
 /***/ 8116:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -40535,7 +40582,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)
     }
@@ -40920,7 +40967,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;
 
 /***/ }),
@@ -41830,7 +41877,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 = {};
@@ -42764,7 +42811,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 +42822,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 +42834,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;
@@ -42815,9 +42862,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(",") + '"'
@@ -42827,10 +42872,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);
@@ -42850,7 +42898,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;
@@ -42936,9 +42984,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) {
@@ -42946,7 +42995,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 +43040,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) {
@@ -43405,22 +43466,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;