@catladder/cli 0.0.0-refactor-args-791c26f6 → 0.0.0-refactor-args-e8c6d0db

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.
Files changed (3) hide show
  1. package/dist/bundles/catenv/index.js +26 -11
  2. package/dist/bundles/cli/index.js +26 -11
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -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 = "refactor-args-791c26f6" || 0;
40077
+ exports.PIPELINE_IMAGE_TAG = "refactor-args-e8c6d0db" || 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;
@@ -41283,12 +41293,17 @@ var createGoogleCloudRunDeployJobs = function (context) {
41283
41293
  value = _b[1];
41284
41294
  return "".concat(key, "=").concat(value);
41285
41295
  }).join(",");
41286
- var commonArgs = (0, createArgsString_1.createArgsString)({
41296
+ var commonArgs = {
41287
41297
  project: deployConfig.projectId,
41288
41298
  region: deployConfig.region
41289
- });
41290
- var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
41291
- var commonDeployArgs = "--image=".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels=").concat(labelsString);
41299
+ };
41300
+ var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
41301
+ var commonDeployArgs = (0, createArgsString_1.createArgsString)(__assign(__assign({
41302
+ image: gcloudImageName
41303
+ }, commonArgs), {
41304
+ "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
41305
+ labels: labelsString
41306
+ }));
41292
41307
  var serviceName = context.environment.fullName.toLowerCase();
41293
41308
  var getFullJobName = function (name) {
41294
41309
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -41346,7 +41361,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
41346
41361
  }).flat();
41347
41362
  };
41348
41363
  var getJobRunScriptForJob = function (jobName) {
41349
- return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
41364
+ return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
41350
41365
  };
41351
41366
  var getJobRunScripts = function (when) {
41352
41367
  return jobsWithNames.filter(function (_a) {
@@ -41362,20 +41377,20 @@ var createGoogleCloudRunDeployJobs = function (context) {
41362
41377
  var job = _a.job,
41363
41378
  jobName = _a.jobName,
41364
41379
  schedulerName = _a.schedulerName;
41365
- 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");
41380
+ 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");
41366
41381
  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
41367
41382
  }).flat();
41368
41383
  };
41369
41384
  var getDeleteSchedulesScripts = function () {
41370
41385
  return jobsWithSchedule.map(function (_a) {
41371
41386
  var schedulerName = _a.schedulerName;
41372
- return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location ").concat(deployConfig.region)])), false);
41387
+ return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region)])), false);
41373
41388
  }).flat();
41374
41389
  };
41375
41390
  var getDeleteJobsScripts = function () {
41376
41391
  return jobsWithNames.map(function (_a) {
41377
41392
  var jobName = _a.jobName;
41378
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgs);
41393
+ return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
41379
41394
  });
41380
41395
  };
41381
41396
  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
@@ -41385,10 +41400,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
41385
41400
  service = _b[1];
41386
41401
  return getServiceDeployScript(service, "-" + name);
41387
41402
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
41388
- 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) {
41403
+ 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) {
41389
41404
  var _b = __read(_a, 1),
41390
41405
  name = _b[0];
41391
- return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
41406
+ return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
41392
41407
  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
41393
41408
  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
41394
41409
  artifacts: {
package/dist/bundles/cli/index.js CHANGED
@@ -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 = "refactor-args-791c26f6" || 0;
351202
+ exports.PIPELINE_IMAGE_TAG = "refactor-args-e8c6d0db" || 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;
@@ -352408,12 +352418,17 @@ var createGoogleCloudRunDeployJobs = function (context) {
352408
352418
  value = _b[1];
352409
352419
  return "".concat(key, "=").concat(value);
352410
352420
  }).join(",");
352411
- var commonArgs = (0, createArgsString_1.createArgsString)({
352421
+ var commonArgs = {
352412
352422
  project: deployConfig.projectId,
352413
352423
  region: deployConfig.region
352414
- });
352415
- var cloudRunArgs = deployConfig.cloudSql ? "--set-cloudsql-instances=".concat(deployConfig.cloudSql.instanceConnectionName) : "";
352416
- var commonDeployArgs = "--image=".concat(gcloudImageName, " ").concat(commonArgs, " ").concat(cloudRunArgs, " --labels=").concat(labelsString);
352424
+ };
352425
+ var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
352426
+ var commonDeployArgs = (0, createArgsString_1.createArgsString)(__assign(__assign({
352427
+ image: gcloudImageName
352428
+ }, commonArgs), {
352429
+ "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
352430
+ labels: labelsString
352431
+ }));
352417
352432
  var serviceName = context.environment.fullName.toLowerCase();
352418
352433
  var getFullJobName = function (name) {
352419
352434
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
@@ -352471,7 +352486,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
352471
352486
  }).flat();
352472
352487
  };
352473
352488
  var getJobRunScriptForJob = function (jobName) {
352474
- return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgs);
352489
+ return "gcloud beta run jobs execute ".concat(jobName, " ").concat(commonArgsString);
352475
352490
  };
352476
352491
  var getJobRunScripts = function (when) {
352477
352492
  return jobsWithNames.filter(function (_a) {
@@ -352487,20 +352502,20 @@ var createGoogleCloudRunDeployJobs = function (context) {
352487
352502
  var job = _a.job,
352488
352503
  jobName = _a.jobName,
352489
352504
  schedulerName = _a.schedulerName;
352490
- 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");
352505
+ 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");
352491
352506
  return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs create ".concat(commonArgs)])), false), ["gcloud scheduler jobs update ".concat(commonArgs)], false);
352492
352507
  }).flat();
352493
352508
  };
352494
352509
  var getDeleteSchedulesScripts = function () {
352495
352510
  return jobsWithSchedule.map(function (_a) {
352496
352511
  var schedulerName = _a.schedulerName;
352497
- return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location ").concat(deployConfig.region)])), false);
352512
+ return __spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud scheduler jobs delete ".concat(schedulerName, " --project=").concat(deployConfig.projectId, " --location=").concat(deployConfig.region)])), false);
352498
352513
  }).flat();
352499
352514
  };
352500
352515
  var getDeleteJobsScripts = function () {
352501
352516
  return jobsWithNames.map(function (_a) {
352502
352517
  var jobName = _a.jobName;
352503
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgs);
352518
+ return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
352504
352519
  });
352505
352520
  };
352506
352521
  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
@@ -352510,10 +352525,10 @@ var createGoogleCloudRunDeployJobs = function (context) {
352510
352525
  service = _b[1];
352511
352526
  return getServiceDeployScript(service, "-" + name);
352512
352527
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
352513
- 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) {
352528
+ 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) {
352514
352529
  var _b = __read(_a, 1),
352515
352530
  name = _b[0];
352516
- return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgs);
352531
+ return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
352517
352532
  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
352518
352533
  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
352519
352534
  artifacts: {
package/package.json CHANGED
@@ -24,7 +24,7 @@
24
24
  "node": ">=12.0.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@catladder/pipeline": "0.0.0-refactor-args-791c26f6",
27
+ "@catladder/pipeline": "0.0.0-refactor-args-e8c6d0db",
28
28
  "@kubernetes/client-node": "^0.16.2",
29
29
  "@tsconfig/node14": "^1.0.1",
30
30
  "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
57
57
  "typescript": "^4.5.4",
58
58
  "vorpal": "^1.12.0"
59
59
  },
60
- "version": "0.0.0-refactor-args-791c26f6",
60
+ "version": "0.0.0-refactor-args-e8c6d0db",
61
61
  "stableVersion": "0.0.0"
62
62
  }