@catladder/cli 0.0.0-main-f8d86374 → 0.0.0-main-0eb13d37

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 +7 -6
  2. package/dist/bundles/cli/index.js +7 -6
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -40865,7 +40865,7 @@ exports.readConfigSync = readConfigSync;
40865
40865
 
40866
40866
  exports.__esModule = true;
40867
40867
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40868
- exports.PIPELINE_IMAGE_TAG = "main-f8d86374" || 0;
40868
+ exports.PIPELINE_IMAGE_TAG = "main-0eb13d37" || 0;
40869
40869
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40870
40870
 
40871
40871
  /***/ }),
@@ -42458,7 +42458,7 @@ var setExtraVarsScripts = function (deployConfig) {
42458
42458
  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
42459
42459
  };
42460
42460
  var createGoogleCloudRunDeployJobs = function (context) {
42461
- var _a, _b, _c;
42461
+ var _a, _b, _c, _d;
42462
42462
  var deployConfig = context.componentConfig.deploy;
42463
42463
  if (deployConfig === false) {
42464
42464
  return [];
@@ -42469,7 +42469,8 @@ var createGoogleCloudRunDeployJobs = function (context) {
42469
42469
  }
42470
42470
  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
42471
42471
  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
42472
- var gcloudImageName = "".concat(dockerUrl, "/").concat(context.environment.shortName, "/").concat(context.componentName, ":$DOCKER_IMAGE_TAG");
42472
+ var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
42473
+ var gcloudImageName = "".concat(gcloudImagePath.join("/"), ":$DOCKER_IMAGE_TAG");
42473
42474
  var pushImageToArtifactsRegistry = [docker_1.gitlabDockerLogin, "gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)];
42474
42475
  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
42475
42476
  var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
@@ -42492,7 +42493,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
42492
42493
  var getFullJobName = function (name) {
42493
42494
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
42494
42495
  };
42495
- var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
42496
+ var jobsWithNames = Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {})
42496
42497
  // filter out disabled jobs
42497
42498
  .filter(function (entry) {
42498
42499
  return Boolean(entry[1]);
@@ -42605,13 +42606,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
42605
42606
  });
42606
42607
  };
42607
42608
  var deployScripts = __spreadArray(__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
42608
- : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
42609
+ : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
42609
42610
  var _b = __read(_a, 2),
42610
42611
  name = _b[0],
42611
42612
  service = _b[1];
42612
42613
  return getServiceDeployScript(service, "-" + name);
42613
42614
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
42614
- var stopScripts = __spreadArray(__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) {
42615
+ var stopScripts = __spreadArray(__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((_d = deployConfig.additionalServices) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
42615
42616
  var _b = __read(_a, 1),
42616
42617
  name = _b[0];
42617
42618
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
package/dist/bundles/cli/index.js CHANGED
@@ -354984,7 +354984,7 @@ exports.readConfigSync = readConfigSync;
354984
354984
 
354985
354985
  exports.__esModule = true;
354986
354986
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
354987
- exports.PIPELINE_IMAGE_TAG = "main-f8d86374" || 0;
354987
+ exports.PIPELINE_IMAGE_TAG = "main-0eb13d37" || 0;
354988
354988
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
354989
354989
 
354990
354990
  /***/ }),
@@ -356577,7 +356577,7 @@ var setExtraVarsScripts = function (deployConfig) {
356577
356577
  return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
356578
356578
  };
356579
356579
  var createGoogleCloudRunDeployJobs = function (context) {
356580
- var _a, _b, _c;
356580
+ var _a, _b, _c, _d;
356581
356581
  var deployConfig = context.componentConfig.deploy;
356582
356582
  if (deployConfig === false) {
356583
356583
  return [];
@@ -356588,7 +356588,8 @@ var createGoogleCloudRunDeployJobs = function (context) {
356588
356588
  }
356589
356589
  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
356590
356590
  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
356591
- var gcloudImageName = "".concat(dockerUrl, "/").concat(context.environment.shortName, "/").concat(context.componentName, ":$DOCKER_IMAGE_TAG");
356591
+ var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
356592
+ var gcloudImageName = "".concat(gcloudImagePath.join("/"), ":$DOCKER_IMAGE_TAG");
356592
356593
  var pushImageToArtifactsRegistry = [docker_1.gitlabDockerLogin, "gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)];
356593
356594
  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
356594
356595
  var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
@@ -356611,7 +356612,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
356611
356612
  var getFullJobName = function (name) {
356612
356613
  return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
356613
356614
  };
356614
- var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
356615
+ var jobsWithNames = Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {})
356615
356616
  // filter out disabled jobs
356616
356617
  .filter(function (entry) {
356617
356618
  return Boolean(entry[1]);
@@ -356724,13 +356725,13 @@ var createGoogleCloudRunDeployJobs = function (context) {
356724
356725
  });
356725
356726
  };
356726
356727
  var deployScripts = __spreadArray(__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
356727
- : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
356728
+ : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
356728
356729
  var _b = __read(_a, 2),
356729
356730
  name = _b[0],
356730
356731
  service = _b[1];
356731
356732
  return getServiceDeployScript(service, "-" + name);
356732
356733
  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
356733
- var stopScripts = __spreadArray(__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) {
356734
+ var stopScripts = __spreadArray(__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((_d = deployConfig.additionalServices) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
356734
356735
  var _b = __read(_a, 1),
356735
356736
  name = _b[0];
356736
356737
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
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-main-f8d86374",
27
+ "@catladder/pipeline": "0.0.0-main-0eb13d37",
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-main-f8d86374",
60
+ "version": "0.0.0-main-0eb13d37",
61
61
  "stableVersion": "0.0.0"
62
62
  }