@catladder/cli 0.0.0-refactor-gcloud-api-ee7f86ef → 0.0.0-refactor-gcloud-api-3167c158

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-gcloud-api-ee7f86ef" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-3167c158" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41212,6 +41212,16 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
 "use strict";
 
 
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -41257,6 +41267,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 var database_1 = __nccwpck_require__(1384);
 var gitlab_1 = __nccwpck_require__(4997);
 var jobName_1 = __nccwpck_require__(7311);
+var createArgsString_1 = __nccwpck_require__(8686);
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -41282,9 +41293,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
       value = _b[1];
     return "".concat(key, "=").concat(value);
   }).join(",");
-  var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
-  var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
-  var commonDeployArgs = "--image ".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels ").concat(labelsString);
+  var commonArgs = {
+    project: deployConfig.projectId,
+    region: deployConfig.region
+  };
+  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);
@@ -41314,35 +41332,33 @@ var createGoogleCloudRunDeployJobs = function (context) {
     };
   });
   var getServiceDeployScript = function (service, nameSuffix) {
-    var _a;
+    var _a, _b;
     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 = {
-      "allow-unauthenticated": true,
+    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      command: command ? '"' + command.split(" ").join(",") + '"' : undefined
+    }, commonDeployArgs), {
+      "env-vars-file": "____envvars.yaml",
       "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 = 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];
-      return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
-    }).join(" ");
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
+    }));
+    var authenticationString = ((_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _b !== void 0 ? _b : true) ? "--allow-unauthenticated" : "--no-allow-unauthenticated";
+    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString, " ").concat(authenticationString);
   };
   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,
@@ -41351,7 +41367,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
     }).flat();
   };
   var getJobRunScriptForJob = function (jobName) {
-    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
+    return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
   };
   var getJobRunScripts = function (when) {
     return jobsWithNames.filter(function (_a) {
@@ -41367,20 +41383,32 @@ 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 () {
     return jobsWithNames.map(function (_a) {
       var jobName = _a.jobName;
-      return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgs);
+      return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
     });
   };
   var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
@@ -41390,10 +41418,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
   })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgs)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
-    return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
+    return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
   })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
@@ -41539,6 +41567,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
 
 /***/ }),
 
+/***/ 8686:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+exports.__esModule = true;
+exports.createArgsString = void 0;
+var lodash_1 = __nccwpck_require__(3255);
+/**
+ * creates arguments string:
+ *
+ * --key=value
+ *
+ * - undefined or null values will get removed completly
+ * - true will just be "--key"
+ * @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];
+    return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
+  }).join(" ");
+};
+exports.createArgsString = createArgsString;
+
+/***/ }),
+
 /***/ 1384:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {