@catladder/cli 0.0.0-main-debac862 → 0.0.0-main-be63979a

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -40074,7 +40074,7 @@ exports.readConfigSync = readConfigSync;
40074
40074
 
40075
40075
  exports.__esModule = true;
40076
40076
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40077
- exports.PIPELINE_IMAGE_TAG = "main-debac862" || 0;
40077
+ exports.PIPELINE_IMAGE_TAG = "main-be63979a" || 0;
40078
40078
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40079
40079
 
40080
40080
  /***/ }),
@@ -41212,6 +41212,16 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
41212
41212
  "use strict";
41213
41213
 
41214
41214
 
41215
+ var __assign = this && this.__assign || function () {
41216
+ __assign = Object.assign || function (t) {
41217
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
41218
+ s = arguments[i];
41219
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
41220
+ }
41221
+ return t;
41222
+ };
41223
+ return __assign.apply(this, arguments);
41224
+ };
41215
41225
  var __read = this && this.__read || function (o, n) {
41216
41226
  var m = typeof Symbol === "function" && o[Symbol.iterator];
41217
41227
  if (!m) return o;
@@ -41257,6 +41267,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
41257
41267
  var database_1 = __nccwpck_require__(1384);
41258
41268
  var gitlab_1 = __nccwpck_require__(4997);
41259
41269
  var jobName_1 = __nccwpck_require__(7311);
41270
+ var createArgsString_1 = __nccwpck_require__(8686);
41260
41271
  var setExtraVarsScripts = function (deployConfig) {
41261
41272
  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
41262
41273
  };
@@ -41282,9 +41293,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
41282
41293
  value = _b[1];
41283
41294
  return "".concat(key, "=").concat(value);
41284
41295
  }).join(",");
41285
- var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
41286
- var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
41287
- var commonDeployArgs = "--image ".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels ").concat(labelsString);
41296
+ var commonArgs = {
41297
+ project: deployConfig.projectId,
41298
+ region: deployConfig.region
41299
+ };
41300
+ var commonDeployArgs = __assign(__assign({
41301
+ image: gcloudImageName
41302
+ }, commonArgs), {
41303
+ "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
41304
+ labels: labelsString
41305
+ });
41288
41306
  var serviceName = context.environment.fullName.toLowerCase();
41289
41307
  var getFullJobName = function (name) {
41290
41308
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -41314,35 +41332,33 @@ var createGoogleCloudRunDeployJobs = function (context) {
41314
41332
  };
41315
41333
  });
41316
41334
  var getServiceDeployScript = function (service, nameSuffix) {
41317
- var _a;
41335
+ var _a, _b;
41318
41336
  var customConfig = service !== true ? service : undefined;
41319
41337
  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
41320
- var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
41321
- var args = {
41322
- "allow-unauthenticated": true,
41338
+ var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
41339
+ command: command ? '"' + command.split(" ").join(",") + '"' : undefined
41340
+ }, commonDeployArgs), {
41341
+ "env-vars-file": "____envvars.yaml",
41323
41342
  "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
41324
41343
  "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
41325
41344
  "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
41326
- };
41327
- var argsString = Object.entries(args).filter(function (_a) {
41328
- var _b = __read(_a, 2),
41329
- value = _b[1];
41330
- return !(0, lodash_1.isNil)(value);
41331
- }).map(function (_a) {
41332
- var _b = __read(_a, 2),
41333
- key = _b[0],
41334
- value = _b[1];
41335
- return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
41336
- }).join(" ");
41337
- return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
41345
+ }));
41346
+ var authenticationString = ((_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _b !== void 0 ? _b : true) ? "--allow-unauthenticated" : "--no-allow-unauthenticated";
41347
+ return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString, " ").concat(authenticationString);
41338
41348
  };
41339
41349
  var getJobCreateScriptsForJob = function (jobName, job) {
41340
41350
  // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
41341
41351
  // lucky, update on the other hand accepts it... so let's just imediatly update it
41342
41352
  // also we cannot upsert a job, so we have to create it and catch the error and then update
41343
- var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs, " --memory=").concat(job.memory || "512Mi");
41344
- 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);
41353
+ var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
41354
+ command: '"' + job.command.split(" ").join(",") + '"'
41355
+ }, commonDeployArgs), {
41356
+ memory: job.memory || "512Mi"
41357
+ }));
41358
+ var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
41359
+ 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);
41345
41360
  };
41361
+ var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
41346
41362
  var getJobCreateScripts = function () {
41347
41363
  return jobsWithNames.map(function (_a) {
41348
41364
  var job = _a.job,
@@ -41351,7 +41367,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
41351
41367
  }).flat();
41352
41368
  };
41353
41369
  var getJobRunScriptForJob = function (jobName) {
41354
- return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
41370
+ return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
41355
41371
  };
41356
41372
  var getJobRunScripts = function (when) {
41357
41373
  return jobsWithNames.filter(function (_a) {
@@ -41367,20 +41383,32 @@ var createGoogleCloudRunDeployJobs = function (context) {
41367
41383
  var job = _a.job,
41368
41384
  jobName = _a.jobName,
41369
41385
  schedulerName = _a.schedulerName;
41370
- 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");
41386
+ var argsString = (0, createArgsString_1.createArgsString)({
41387
+ project: deployConfig.projectId,
41388
+ location: deployConfig.region,
41389
+ schedule: "\"".concat(job.schedule, "\""),
41390
+ uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
41391
+ "http-method": "POST",
41392
+ "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"
41393
+ });
41394
+ var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
41371
41395
  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
41372
41396
  }).flat();
41373
41397
  };
41374
41398
  var getDeleteSchedulesScripts = function () {
41399
+ var argsString = (0, createArgsString_1.createArgsString)({
41400
+ project: deployConfig.projectId,
41401
+ location: deployConfig.region
41402
+ });
41375
41403
  return jobsWithSchedule.map(function (_a) {
41376
41404
  var schedulerName = _a.schedulerName;
41377
- return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location ").concat(deployConfig.region)])), false);
41405
+ return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)])), false);
41378
41406
  }).flat();
41379
41407
  };
41380
41408
  var getDeleteJobsScripts = function () {
41381
41409
  return jobsWithNames.map(function (_a) {
41382
41410
  var jobName = _a.jobName;
41383
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgs);
41411
+ return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
41384
41412
  });
41385
41413
  };
41386
41414
  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) {
41390
41418
  service = _b[1];
41391
41419
  return getServiceDeployScript(service, "-" + name);
41392
41420
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
41393
- 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) {
41421
+ 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) {
41394
41422
  var _b = __read(_a, 1),
41395
41423
  name = _b[0];
41396
- return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
41424
+ return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
41397
41425
  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
41398
41426
  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
41399
41427
  artifacts: {
@@ -41539,6 +41567,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
41539
41567
 
41540
41568
  /***/ }),
41541
41569
 
41570
+ /***/ 8686:
41571
+ /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
41572
+
41573
+ "use strict";
41574
+
41575
+
41576
+ var __read = this && this.__read || function (o, n) {
41577
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
41578
+ if (!m) return o;
41579
+ var i = m.call(o),
41580
+ r,
41581
+ ar = [],
41582
+ e;
41583
+ try {
41584
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
41585
+ } catch (error) {
41586
+ e = {
41587
+ error: error
41588
+ };
41589
+ } finally {
41590
+ try {
41591
+ if (r && !r.done && (m = i["return"])) m.call(i);
41592
+ } finally {
41593
+ if (e) throw e.error;
41594
+ }
41595
+ }
41596
+ return ar;
41597
+ };
41598
+ exports.__esModule = true;
41599
+ exports.createArgsString = void 0;
41600
+ var lodash_1 = __nccwpck_require__(3255);
41601
+ /**
41602
+ * creates arguments string:
41603
+ *
41604
+ * --key=value
41605
+ *
41606
+ * - undefined or null values will get removed completly
41607
+ * - true will just be "--key"
41608
+ * @param args args record
41609
+ * @returns
41610
+ */
41611
+ var createArgsString = function (args) {
41612
+ return Object.entries(args).filter(function (_a) {
41613
+ var _b = __read(_a, 2),
41614
+ value = _b[1];
41615
+ return !(0, lodash_1.isNil)(value);
41616
+ }).map(function (_a) {
41617
+ var _b = __read(_a, 2),
41618
+ key = _b[0],
41619
+ value = _b[1];
41620
+ return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
41621
+ }).join(" ");
41622
+ };
41623
+ exports.createArgsString = createArgsString;
41624
+
41625
+ /***/ }),
41626
+
41542
41627
  /***/ 1384:
41543
41628
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
41544
41629
 
@@ -351199,7 +351199,7 @@ exports.readConfigSync = readConfigSync;
351199
351199
 
351200
351200
  exports.__esModule = true;
351201
351201
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351202
- exports.PIPELINE_IMAGE_TAG = "main-debac862" || 0;
351202
+ exports.PIPELINE_IMAGE_TAG = "main-be63979a" || 0;
351203
351203
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351204
351204
 
351205
351205
  /***/ }),
@@ -352337,6 +352337,16 @@ exports.getBaseRollbackJob = getBaseRollbackJob;
352337
352337
  "use strict";
352338
352338
 
352339
352339
 
352340
+ var __assign = this && this.__assign || function () {
352341
+ __assign = Object.assign || function (t) {
352342
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
352343
+ s = arguments[i];
352344
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
352345
+ }
352346
+ return t;
352347
+ };
352348
+ return __assign.apply(this, arguments);
352349
+ };
352340
352350
  var __read = this && this.__read || function (o, n) {
352341
352351
  var m = typeof Symbol === "function" && o[Symbol.iterator];
352342
352352
  if (!m) return o;
@@ -352382,6 +352392,7 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
352382
352392
  var database_1 = __nccwpck_require__(41384);
352383
352393
  var gitlab_1 = __nccwpck_require__(84997);
352384
352394
  var jobName_1 = __nccwpck_require__(77311);
352395
+ var createArgsString_1 = __nccwpck_require__(8686);
352385
352396
  var setExtraVarsScripts = function (deployConfig) {
352386
352397
  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
352387
352398
  };
@@ -352407,9 +352418,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
352407
352418
  value = _b[1];
352408
352419
  return "".concat(key, "=").concat(value);
352409
352420
  }).join(",");
352410
- var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
352411
- var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
352412
- var commonDeployArgs = "--image ".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels ").concat(labelsString);
352421
+ var commonArgs = {
352422
+ project: deployConfig.projectId,
352423
+ region: deployConfig.region
352424
+ };
352425
+ var commonDeployArgs = __assign(__assign({
352426
+ image: gcloudImageName
352427
+ }, commonArgs), {
352428
+ "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
352429
+ labels: labelsString
352430
+ });
352413
352431
  var serviceName = context.environment.fullName.toLowerCase();
352414
352432
  var getFullJobName = function (name) {
352415
352433
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -352439,35 +352457,33 @@ var createGoogleCloudRunDeployJobs = function (context) {
352439
352457
  };
352440
352458
  });
352441
352459
  var getServiceDeployScript = function (service, nameSuffix) {
352442
- var _a;
352460
+ var _a, _b;
352443
352461
  var customConfig = service !== true ? service : undefined;
352444
352462
  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
352445
- var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
352446
- var args = {
352447
- "allow-unauthenticated": true,
352463
+ var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
352464
+ command: command ? '"' + command.split(" ").join(",") + '"' : undefined
352465
+ }, commonDeployArgs), {
352466
+ "env-vars-file": "____envvars.yaml",
352448
352467
  "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
352449
352468
  "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
352450
352469
  "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
352451
- };
352452
- var argsString = Object.entries(args).filter(function (_a) {
352453
- var _b = __read(_a, 2),
352454
- value = _b[1];
352455
- return !(0, lodash_1.isNil)(value);
352456
- }).map(function (_a) {
352457
- var _b = __read(_a, 2),
352458
- key = _b[0],
352459
- value = _b[1];
352460
- return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
352461
- }).join(" ");
352462
- return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml ").concat(argsString);
352470
+ }));
352471
+ var authenticationString = ((_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _b !== void 0 ? _b : true) ? "--allow-unauthenticated" : "--no-allow-unauthenticated";
352472
+ return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString, " ").concat(authenticationString);
352463
352473
  };
352464
352474
  var getJobCreateScriptsForJob = function (jobName, job) {
352465
352475
  // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
352466
352476
  // lucky, update on the other hand accepts it... so let's just imediatly update it
352467
352477
  // also we cannot upsert a job, so we have to create it and catch the error and then update
352468
- var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs, " --memory=").concat(job.memory || "512Mi");
352469
- 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);
352478
+ var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
352479
+ command: '"' + job.command.split(" ").join(",") + '"'
352480
+ }, commonDeployArgs), {
352481
+ memory: job.memory || "512Mi"
352482
+ }));
352483
+ var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
352484
+ 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);
352470
352485
  };
352486
+ var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
352471
352487
  var getJobCreateScripts = function () {
352472
352488
  return jobsWithNames.map(function (_a) {
352473
352489
  var job = _a.job,
@@ -352476,7 +352492,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
352476
352492
  }).flat();
352477
352493
  };
352478
352494
  var getJobRunScriptForJob = function (jobName) {
352479
- return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
352495
+ return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
352480
352496
  };
352481
352497
  var getJobRunScripts = function (when) {
352482
352498
  return jobsWithNames.filter(function (_a) {
@@ -352492,20 +352508,32 @@ var createGoogleCloudRunDeployJobs = function (context) {
352492
352508
  var job = _a.job,
352493
352509
  jobName = _a.jobName,
352494
352510
  schedulerName = _a.schedulerName;
352495
- 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");
352511
+ var argsString = (0, createArgsString_1.createArgsString)({
352512
+ project: deployConfig.projectId,
352513
+ location: deployConfig.region,
352514
+ schedule: "\"".concat(job.schedule, "\""),
352515
+ uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
352516
+ "http-method": "POST",
352517
+ "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"
352518
+ });
352519
+ var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
352496
352520
  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
352497
352521
  }).flat();
352498
352522
  };
352499
352523
  var getDeleteSchedulesScripts = function () {
352524
+ var argsString = (0, createArgsString_1.createArgsString)({
352525
+ project: deployConfig.projectId,
352526
+ location: deployConfig.region
352527
+ });
352500
352528
  return jobsWithSchedule.map(function (_a) {
352501
352529
  var schedulerName = _a.schedulerName;
352502
- return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location ").concat(deployConfig.region)])), false);
352530
+ return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " ").concat(argsString)])), false);
352503
352531
  }).flat();
352504
352532
  };
352505
352533
  var getDeleteJobsScripts = function () {
352506
352534
  return jobsWithNames.map(function (_a) {
352507
352535
  var jobName = _a.jobName;
352508
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgs);
352536
+ return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
352509
352537
  });
352510
352538
  };
352511
352539
  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
@@ -352515,10 +352543,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
352515
352543
  service = _b[1];
352516
352544
  return getServiceDeployScript(service, "-" + name);
352517
352545
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
352518
- 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) {
352546
+ 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) {
352519
352547
  var _b = __read(_a, 1),
352520
352548
  name = _b[0];
352521
- return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
352549
+ return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
352522
352550
  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
352523
352551
  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
352524
352552
  artifacts: {
@@ -352664,6 +352692,63 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
352664
352692
 
352665
352693
  /***/ }),
352666
352694
 
352695
+ /***/ 8686:
352696
+ /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
352697
+
352698
+ "use strict";
352699
+
352700
+
352701
+ var __read = this && this.__read || function (o, n) {
352702
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
352703
+ if (!m) return o;
352704
+ var i = m.call(o),
352705
+ r,
352706
+ ar = [],
352707
+ e;
352708
+ try {
352709
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
352710
+ } catch (error) {
352711
+ e = {
352712
+ error: error
352713
+ };
352714
+ } finally {
352715
+ try {
352716
+ if (r && !r.done && (m = i["return"])) m.call(i);
352717
+ } finally {
352718
+ if (e) throw e.error;
352719
+ }
352720
+ }
352721
+ return ar;
352722
+ };
352723
+ exports.__esModule = true;
352724
+ exports.createArgsString = void 0;
352725
+ var lodash_1 = __nccwpck_require__(23255);
352726
+ /**
352727
+ * creates arguments string:
352728
+ *
352729
+ * --key=value
352730
+ *
352731
+ * - undefined or null values will get removed completly
352732
+ * - true will just be "--key"
352733
+ * @param args args record
352734
+ * @returns
352735
+ */
352736
+ var createArgsString = function (args) {
352737
+ return Object.entries(args).filter(function (_a) {
352738
+ var _b = __read(_a, 2),
352739
+ value = _b[1];
352740
+ return !(0, lodash_1.isNil)(value);
352741
+ }).map(function (_a) {
352742
+ var _b = __read(_a, 2),
352743
+ key = _b[0],
352744
+ value = _b[1];
352745
+ return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
352746
+ }).join(" ");
352747
+ };
352748
+ exports.createArgsString = createArgsString;
352749
+
352750
+ /***/ }),
352751
+
352667
352752
  /***/ 41384:
352668
352753
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
352669
352754