@catladder/cli 0.0.0-main-deeb54d7 → 0.0.0-main-30854c6a

package/dist/bundles/catenv/index.js

@@ -40865,7 +40865,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-deeb54d7" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-30854c6a" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42391,6 +42391,256 @@ exports.DEPLOY_RUNNER_VARIABLES = {
 
 /***/ }),
 
+/***/ 8159:
+/***/ (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;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getDeleteUnusedImagesCommands = exports.getPushToArtifactsRegistryCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryImageName = void 0;
+var docker_1 = __nccwpck_require__(3219);
+var gitlab_1 = __nccwpck_require__(4997);
+var types_1 = __nccwpck_require__(3109);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(7547);
+/**
+ *
+ * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
+ */
+var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
+  var _a;
+  if (lecacyReviewImageName === void 0) {
+    lecacyReviewImageName = false;
+  }
+  var deployConfig = context.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  if (lecacyReviewImageName && context.environment.envType !== "review") {
+    throw new Error("lecacyReviewImageName is only allowed for review app");
+  }
+  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
+  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
+  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" && !lecacyReviewImageName ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
+  return gcloudImagePath.join("/");
+};
+exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
+var getArtifactsRegistryImage = function (context) {
+  return "".concat((0, exports.getArtifactsRegistryImageName)(context), ":$DOCKER_IMAGE_TAG");
+};
+exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
+/**
+ * commands to pull the image from the default registry and pushes it to google artifact registry. We might build and push directly to google artifact registry in the future
+ */
+var getPushToArtifactsRegistryCommands = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+  return [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(fullImageName, ":$DOCKER_IMAGE_TAG"), "docker push ".concat(fullImageName, ":$DOCKER_IMAGE_TAG")];
+};
+exports.getPushToArtifactsRegistryCommands = getPushToArtifactsRegistryCommands;
+var getDeleteImageCommands = function (fullImageName, keepNewest) {
+  if (keepNewest === void 0) {
+    keepNewest = 0;
+  }
+  if (keepNewest === 0) {
+    // no need to list tags, we delete the whole thing
+    return ["gcloud artifacts docker images delete ".concat(fullImageName, " --quiet --delete-tags")];
+  }
+  // delete unused tags
+  var listAllImagesCommand = "gcloud artifacts docker images list ".concat(fullImageName, " --sort-by=~CREATE_TIME --format=\"value(version)\"");
+  var listImagesToDeletecommand = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllImagesCommand, keepNewest);
+  var deleteImageCommand = "gcloud artifacts docker images delete ".concat(fullImageName, "@$version --quiet --delete-tags");
+  var deleteImagesCommand = "".concat(listImagesToDeletecommand, " | while read -r version; do ").concat(deleteImageCommand, "; done");
+  return [deleteImagesCommand];
+};
+/**
+ * commands to delete unused images.
+ *
+ * @param context
+ * @param keep how many of the newest images to keep
+ * @returns
+ */
+var getDeleteUnusedImagesCommands = function (context, keep) {
+  if (keep === void 0) {
+    keep = 0;
+  }
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+  return __spreadArray(__spreadArray([], __read(getDeleteImageCommands(fullImageName, keep)), false), __read(context.environment.envType === "review" ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0)) : []), false);
+};
+exports.getDeleteUnusedImagesCommands = getDeleteUnusedImagesCommands;
+
+/***/ }),
+
+/***/ 964:
+/***/ (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;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getRemoveOldRevisionsAndImagesCommand = void 0;
+var artifactsRegistry_1 = __nccwpck_require__(8159);
+var cloudRunRevisions_1 = __nccwpck_require__(1101);
+var getRemoveOldRevisionsAndImagesCommand = function (context, when) {
+  if (when === "onStop") {
+    // service is already deleted, so we don't need to delete old revisions, just delete all images
+    return (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context);
+  }
+  // this number only targets inactive revisions
+  var revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+  // this number needs to be higher than inactive after deploy, so we add one
+  var imagesToKeep = revisionsToKeep + 1;
+  var deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
+  var deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
+  return __spreadArray(__spreadArray([], __read(deleteOldRevisionsCommands), false), __read(deleteOldImagesCommands), false);
+};
+exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
+
+/***/ }),
+
+/***/ 1101:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"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);
+};
+exports.__esModule = true;
+exports.getDeleteUnusedRevisionsCommands = void 0;
+var types_1 = __nccwpck_require__(3109);
+var createArgsString_1 = __nccwpck_require__(8686);
+var getServiceName_1 = __nccwpck_require__(9391);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(7547);
+var getListRevisionsCommand = function (context, args) {
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var deployConfig = context.componentConfig.deploy;
+  if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var filterRevisionArgs = __assign({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    // only show inactive revisions
+    service: serviceName,
+    limit: "unlimited",
+    "sort-by": "metadata.creationTimestamp"
+  }, args);
+  // this prints out all inactive images of the given app
+  return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
+};
+var getDeleteUnusedRevisionsCommands = function (context, keep) {
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  // this prints out all inactive images of the given app
+  var listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
+    format: "\"value(name)\"",
+    filter: "'(status.conditions.status=False OR status.conditions.status=Unknown)'"
+  });
+  // this removes the newest `revisionsToKeep` images
+  var listRevisionsToDeleteCmd = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllInactiveRevisionsCmd, keep);
+  var deleteRevisionCmd = "gcloud run revisions delete ".concat((0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    quiet: true
+  }), " $revisionname ");
+  var deleteRevisionsCmd = "".concat(listRevisionsToDeleteCmd, " | while read -r revisionname; do ").concat(deleteRevisionCmd, "; done");
+  return [deleteRevisionsCmd];
+};
+exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
+
+/***/ }),
+
 /***/ 2256:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -42454,11 +42704,14 @@ var createArgsString_1 = __nccwpck_require__(8686);
 var database_1 = __nccwpck_require__(1384);
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 var jobName_1 = __nccwpck_require__(7311);
+var artifactsRegistry_1 = __nccwpck_require__(8159);
+var getServiceName_1 = __nccwpck_require__(9391);
+var cleanup_1 = __nccwpck_require__(964);
 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\""];
 };
 var createGoogleCloudRunDeployJobs = function (context) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
   if (deployConfig === false) {
     return [];
@@ -42467,11 +42720,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
-  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
-  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);
-  var gcloudImageName = "".concat(gcloudImagePath.join("/"), ":$DOCKER_IMAGE_TAG");
-  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)];
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
     var _b = __read(_a, 2),
@@ -42484,16 +42732,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
     region: deployConfig.region
   };
   var commonDeployArgs = __assign(__assign({
-    image: gcloudImageName
+    image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
   });
-  var serviceName = context.environment.fullName.toLowerCase();
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
   };
-  var jobsWithNames = Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {})
+  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
   // filter out disabled jobs
   .filter(function (entry) {
     return Boolean(entry[1]);
@@ -42605,18 +42853,19 @@ var createGoogleCloudRunDeployJobs = function (context) {
       "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
     });
   };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("pushToArtifactRegistry", "Pushing image to artifacts registry")(pushImageToArtifactsRegistry)), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-  : []), 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) {
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("pushToArtifactRegistry", "Pushing image to artifacts registry")((0, artifactsRegistry_1.getPushToArtifactsRegistryCommands)(context))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  : []), 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) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false))), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
-  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) {
+  })), false), __read(getJobRunScripts("postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
+  )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  var stopScripts = __spreadArray(__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) {
     var _b = __read(_a, 1),
       name = _b[0];
     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), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
   return (0, base_1.createDeployementJobs)(context, {
     deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
       artifacts: {
@@ -42924,6 +43173,21 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 9391:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getServiceName = void 0;
+var getServiceName = function (context) {
+  return context.environment.fullName.toLowerCase();
+};
+exports.getServiceName = getServiceName;
+
+/***/ }),
+
 /***/ 7311:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -42939,6 +43203,29 @@ exports.getCloudRunJobName = getCloudRunJobName;
 
 /***/ }),
 
+/***/ 7547:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.removeFirstLinesFromCommandOutput = void 0;
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+var removeFirstLinesFromCommandOutput = function (cmd, removeFirstN) {
+  return removeFirstN === 0 ? cmd : "".concat(cmd, " | tail -n +").concat(removeFirstN + 1);
+};
+exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
+
+/***/ }),
+
 /***/ 463:
 /***/ ((__unused_webpack_module, exports) => {
 

package/dist/bundles/cli/index.js

@@ -354984,7 +354984,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-deeb54d7" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-30854c6a" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -356510,6 +356510,256 @@ exports.DEPLOY_RUNNER_VARIABLES = {
 
 /***/ }),
 
+/***/ 28159:
+/***/ (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;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getDeleteUnusedImagesCommands = exports.getPushToArtifactsRegistryCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryImageName = void 0;
+var docker_1 = __nccwpck_require__(33219);
+var gitlab_1 = __nccwpck_require__(84997);
+var types_1 = __nccwpck_require__(63109);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(77547);
+/**
+ *
+ * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
+ */
+var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
+  var _a;
+  if (lecacyReviewImageName === void 0) {
+    lecacyReviewImageName = false;
+  }
+  var deployConfig = context.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  if (lecacyReviewImageName && context.environment.envType !== "review") {
+    throw new Error("lecacyReviewImageName is only allowed for review app");
+  }
+  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
+  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
+  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" && !lecacyReviewImageName ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
+  return gcloudImagePath.join("/");
+};
+exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
+var getArtifactsRegistryImage = function (context) {
+  return "".concat((0, exports.getArtifactsRegistryImageName)(context), ":$DOCKER_IMAGE_TAG");
+};
+exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
+/**
+ * commands to pull the image from the default registry and pushes it to google artifact registry. We might build and push directly to google artifact registry in the future
+ */
+var getPushToArtifactsRegistryCommands = function (context) {
+  var deployConfig = context.componentConfig.deploy;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+  return [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(fullImageName, ":$DOCKER_IMAGE_TAG"), "docker push ".concat(fullImageName, ":$DOCKER_IMAGE_TAG")];
+};
+exports.getPushToArtifactsRegistryCommands = getPushToArtifactsRegistryCommands;
+var getDeleteImageCommands = function (fullImageName, keepNewest) {
+  if (keepNewest === void 0) {
+    keepNewest = 0;
+  }
+  if (keepNewest === 0) {
+    // no need to list tags, we delete the whole thing
+    return ["gcloud artifacts docker images delete ".concat(fullImageName, " --quiet --delete-tags")];
+  }
+  // delete unused tags
+  var listAllImagesCommand = "gcloud artifacts docker images list ".concat(fullImageName, " --sort-by=~CREATE_TIME --format=\"value(version)\"");
+  var listImagesToDeletecommand = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllImagesCommand, keepNewest);
+  var deleteImageCommand = "gcloud artifacts docker images delete ".concat(fullImageName, "@$version --quiet --delete-tags");
+  var deleteImagesCommand = "".concat(listImagesToDeletecommand, " | while read -r version; do ").concat(deleteImageCommand, "; done");
+  return [deleteImagesCommand];
+};
+/**
+ * commands to delete unused images.
+ *
+ * @param context
+ * @param keep how many of the newest images to keep
+ * @returns
+ */
+var getDeleteUnusedImagesCommands = function (context, keep) {
+  if (keep === void 0) {
+    keep = 0;
+  }
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+  return __spreadArray(__spreadArray([], __read(getDeleteImageCommands(fullImageName, keep)), false), __read(context.environment.envType === "review" ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0)) : []), false);
+};
+exports.getDeleteUnusedImagesCommands = getDeleteUnusedImagesCommands;
+
+/***/ }),
+
+/***/ 10964:
+/***/ (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;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getRemoveOldRevisionsAndImagesCommand = void 0;
+var artifactsRegistry_1 = __nccwpck_require__(28159);
+var cloudRunRevisions_1 = __nccwpck_require__(31101);
+var getRemoveOldRevisionsAndImagesCommand = function (context, when) {
+  if (when === "onStop") {
+    // service is already deleted, so we don't need to delete old revisions, just delete all images
+    return (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context);
+  }
+  // this number only targets inactive revisions
+  var revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+  // this number needs to be higher than inactive after deploy, so we add one
+  var imagesToKeep = revisionsToKeep + 1;
+  var deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
+  var deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
+  return __spreadArray(__spreadArray([], __read(deleteOldRevisionsCommands), false), __read(deleteOldImagesCommands), false);
+};
+exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
+
+/***/ }),
+
+/***/ 31101:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"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);
+};
+exports.__esModule = true;
+exports.getDeleteUnusedRevisionsCommands = void 0;
+var types_1 = __nccwpck_require__(63109);
+var createArgsString_1 = __nccwpck_require__(8686);
+var getServiceName_1 = __nccwpck_require__(89391);
+var removeFirstLinesFromCommandOutput_1 = __nccwpck_require__(77547);
+var getListRevisionsCommand = function (context, args) {
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
+  var deployConfig = context.componentConfig.deploy;
+  if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  var filterRevisionArgs = __assign({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    // only show inactive revisions
+    service: serviceName,
+    limit: "unlimited",
+    "sort-by": "metadata.creationTimestamp"
+  }, args);
+  // this prints out all inactive images of the given app
+  return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
+};
+var getDeleteUnusedRevisionsCommands = function (context, keep) {
+  var deployConfig = context.componentConfig.deploy;
+  if (deployConfig === false) {
+    return [];
+  }
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+    // should not happen
+    throw new Error("deploy config is wrong");
+  }
+  // this prints out all inactive images of the given app
+  var listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
+    format: "\"value(name)\"",
+    filter: "'(status.conditions.status=False OR status.conditions.status=Unknown)'"
+  });
+  // this removes the newest `revisionsToKeep` images
+  var listRevisionsToDeleteCmd = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllInactiveRevisionsCmd, keep);
+  var deleteRevisionCmd = "gcloud run revisions delete ".concat((0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    region: deployConfig.region,
+    quiet: true
+  }), " $revisionname ");
+  var deleteRevisionsCmd = "".concat(listRevisionsToDeleteCmd, " | while read -r revisionname; do ").concat(deleteRevisionCmd, "; done");
+  return [deleteRevisionsCmd];
+};
+exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
+
+/***/ }),
+
 /***/ 82256:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -356573,11 +356823,14 @@ var createArgsString_1 = __nccwpck_require__(8686);
 var database_1 = __nccwpck_require__(41384);
 var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
 var jobName_1 = __nccwpck_require__(77311);
+var artifactsRegistry_1 = __nccwpck_require__(28159);
+var getServiceName_1 = __nccwpck_require__(89391);
+var cleanup_1 = __nccwpck_require__(10964);
 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\""];
 };
 var createGoogleCloudRunDeployJobs = function (context) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
   if (deployConfig === false) {
     return [];
@@ -356586,11 +356839,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
-  var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
-  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);
-  var gcloudImageName = "".concat(gcloudImagePath.join("/"), ":$DOCKER_IMAGE_TAG");
-  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)];
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
     var _b = __read(_a, 2),
@@ -356603,16 +356851,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
     region: deployConfig.region
   };
   var commonDeployArgs = __assign(__assign({
-    image: gcloudImageName
+    image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
     "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
     labels: labelsString
   });
-  var serviceName = context.environment.fullName.toLowerCase();
+  var serviceName = (0, getServiceName_1.getServiceName)(context);
   var getFullJobName = function (name) {
     return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
   };
-  var jobsWithNames = Object.entries((_b = deployConfig.jobs) !== null && _b !== void 0 ? _b : {})
+  var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
   // filter out disabled jobs
   .filter(function (entry) {
     return Boolean(entry[1]);
@@ -356724,18 +356972,19 @@ var createGoogleCloudRunDeployJobs = function (context) {
       "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
     });
   };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("pushToArtifactRegistry", "Pushing image to artifacts registry")(pushImageToArtifactsRegistry)), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-  : []), 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) {
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("pushToArtifactRegistry", "Pushing image to artifacts registry")((0, artifactsRegistry_1.getPushToArtifactsRegistryCommands)(context))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  : []), 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) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false))), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
-  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) {
+  })), false), __read(getJobRunScripts("postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
+  )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  var stopScripts = __spreadArray(__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) {
     var _b = __read(_a, 1),
       name = _b[0];
     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), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
   return (0, base_1.createDeployementJobs)(context, {
     deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
       artifacts: {
@@ -357043,6 +357292,21 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 89391:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getServiceName = void 0;
+var getServiceName = function (context) {
+  return context.environment.fullName.toLowerCase();
+};
+exports.getServiceName = getServiceName;
+
+/***/ }),
+
 /***/ 77311:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -357058,6 +357322,29 @@ exports.getCloudRunJobName = getCloudRunJobName;
 
 /***/ }),
 
+/***/ 77547:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.removeFirstLinesFromCommandOutput = void 0;
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+var removeFirstLinesFromCommandOutput = function (cmd, removeFirstN) {
+  return removeFirstN === 0 ? cmd : "".concat(cmd, " | tail -n +").concat(removeFirstN + 1);
+};
+exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
+
+/***/ }),
+
 /***/ 70463:
 /***/ ((__unused_webpack_module, exports) => {
 

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-deeb54d7",
+    "@catladder/pipeline": "0.0.0-main-30854c6a",
     "@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-main-deeb54d7",
+  "version": "0.0.0-main-30854c6a",
   "stableVersion": "0.0.0"
 }