@catladder/cli 0.0.0-refactor-args-0adc5b8e → 0.0.0-refactor-args-c1264291

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-0adc5b8e" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-args-c1264291" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41303,7 +41303,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
   });
-  var commonDeployArgsString = (0, createArgsString_1.createArgsString)(commonDeployArgs);
   var serviceName = context.environment.fullName.toLowerCase();
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -41351,8 +41350,13 @@ var createGoogleCloudRunDeployJobs = function (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
-    var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgsString, " --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 () {
@@ -41379,14 +41383,26 @@ var createGoogleCloudRunDeployJobs = function (context) {
       var job = _a.job,
         jobName = _a.jobName,
         schedulerName = _a.schedulerName;
-      var commonArgs = "http ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region, "       --schedule=\"").concat(job.schedule, "\"       --uri=\"https://").concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\"       --http-method POST       --oauth-service-account-email $GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com");
+      var argsString = (0, createArgsString_1.createArgsString)({
+        project: deployConfig.projectId,
+        location: deployConfig.region,
+        schedule: "\"".concat(job.schedule, "\""),
+        uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
+        "http-method": "POST",
+        "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);
     }).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-0adc5b8e" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-args-c1264291" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352428,7 +352428,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
   });
-  var commonDeployArgsString = (0, createArgsString_1.createArgsString)(commonDeployArgs);
   var serviceName = context.environment.fullName.toLowerCase();
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -352476,8 +352475,13 @@ var createGoogleCloudRunDeployJobs = function (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
-    var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgsString, " --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 () {
@@ -352504,14 +352508,26 @@ var createGoogleCloudRunDeployJobs = function (context) {
       var job = _a.job,
         jobName = _a.jobName,
         schedulerName = _a.schedulerName;
-      var commonArgs = "http ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region, "       --schedule=\"").concat(job.schedule, "\"       --uri=\"https://").concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\"       --http-method POST       --oauth-service-account-email $GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com");
+      var argsString = (0, createArgsString_1.createArgsString)({
+        project: deployConfig.projectId,
+        location: deployConfig.region,
+        schedule: "\"".concat(job.schedule, "\""),
+        uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
+        "http-method": "POST",
+        "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);
     }).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-0adc5b8e",
+    "@catladder/pipeline": "0.0.0-refactor-args-c1264291",
     "@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-0adc5b8e",
+  "version": "0.0.0-refactor-args-c1264291",
   "stableVersion": "0.0.0"
 }