@catladder/cli 0.0.0-refactor-args-c1b256ff → 0.0.0-refactor-args-5694b77b

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 = "refactor-args-c1b256ff" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-args-5694b77b" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41297,13 +41297,12 @@ var createGoogleCloudRunDeployJobs = function (context) {
     project: deployConfig.projectId,
     region: deployConfig.region
   };
-  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  var commonDeployArgs = (0, createArgsString_1.createArgsString)(__assign(__assign({
+  var commonDeployArgs = __assign(__assign({
     image: gcloudImageName
   }, commonArgs), {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
-  }));
+  });
   var serviceName = context.environment.fullName.toLowerCase();
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -41336,23 +41335,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var _a;
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
-    var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
-    var args = {
+    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      command: command ? '"' + command.split(" ").join(",") + '"' : undefined
+    }, commonDeployArgs), {
+      "env-vars-file": "____envvars.yaml",
       "allow-unauthenticated": true,
       "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
       "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
       "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
-    };
-    var argsString = (0, createArgsString_1.createArgsString)(args);
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
+    }));
+    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = 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, " --memory=").concat(job.memory || "512Mi");
-    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 commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      command: '"' + job.command.split(" ").join(",") + '"'
+    }, commonDeployArgs), {
+      memory: job.memory || "512Mi"
+    }));
+    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);
   };
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
   var getJobCreateScripts = function () {
     return jobsWithNames.map(function (_a) {
       var job = _a.job,
@@ -41382,9 +41388,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
     }).flat();
   };
   var getDeleteSchedulesScripts = function () {
+    var argsString = (0, createArgsString_1.createArgsString)({
+      project: deployConfig.projectId,
+      location: deployConfig.region
+    });
     return jobsWithSchedule.map(function (_a) {
       var schedulerName = _a.schedulerName;
-      return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region)])), false);
+      return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)])), false);
     }).flat();
   };
   var getDeleteJobsScripts = function () {

package/dist/bundles/cli/index.js

@@ -351199,7 +351199,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-args-c1b256ff" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-args-5694b77b" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352422,13 +352422,12 @@ var createGoogleCloudRunDeployJobs = function (context) {
     project: deployConfig.projectId,
     region: deployConfig.region
   };
-  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  var commonDeployArgs = (0, createArgsString_1.createArgsString)(__assign(__assign({
+  var commonDeployArgs = __assign(__assign({
     image: gcloudImageName
   }, commonArgs), {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
-  }));
+  });
   var serviceName = context.environment.fullName.toLowerCase();
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -352461,23 +352460,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var _a;
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
-    var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
-    var args = {
+    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      command: command ? '"' + command.split(" ").join(",") + '"' : undefined
+    }, commonDeployArgs), {
+      "env-vars-file": "____envvars.yaml",
       "allow-unauthenticated": true,
       "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
       "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
       "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
-    };
-    var argsString = (0, createArgsString_1.createArgsString)(args);
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
+    }));
+    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = 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, " --memory=").concat(job.memory || "512Mi");
-    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 commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      command: '"' + job.command.split(" ").join(",") + '"'
+    }, commonDeployArgs), {
+      memory: job.memory || "512Mi"
+    }));
+    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);
   };
+  var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
   var getJobCreateScripts = function () {
     return jobsWithNames.map(function (_a) {
       var job = _a.job,
@@ -352507,9 +352513,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
     }).flat();
   };
   var getDeleteSchedulesScripts = function () {
+    var argsString = (0, createArgsString_1.createArgsString)({
+      project: deployConfig.projectId,
+      location: deployConfig.region
+    });
     return jobsWithSchedule.map(function (_a) {
       var schedulerName = _a.schedulerName;
-      return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region)])), false);
+      return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)])), false);
     }).flat();
   };
   var getDeleteJobsScripts = function () {

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-refactor-args-c1b256ff",
+    "@catladder/pipeline": "0.0.0-refactor-args-5694b77b",
     "@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-refactor-args-c1b256ff",
+  "version": "0.0.0-refactor-args-5694b77b",
   "stableVersion": "0.0.0"
 }