@backstage/plugin-catalog-backend 1.4.0 → 1.4.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @backstage/plugin-catalog-backend
 
+## 1.4.1-next.0
+
+### Patch Changes
+
+- 8cb6e10105: Fixed a bug where entities provided without a location key would always replace existing entities, rather than updating them.
+- 63296ebcd4: Allow Placeholder value to be any value, not only string.
+- 74022e0163: Make sure to stitch entities correctly after deletion, to ensure that their relations are updated.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.2-next.0
+  - @backstage/backend-plugin-api@0.1.3-next.0
+  - @backstage/catalog-client@1.1.1-next.0
+  - @backstage/plugin-catalog-node@1.1.1-next.0
+  - @backstage/plugin-scaffolder-common@1.2.1-next.0
+  - @backstage/backend-common@0.15.2-next.0
+  - @backstage/plugin-permission-node@0.6.6-next.0
+  - @backstage/config@1.0.3-next.0
+  - @backstage/errors@1.1.2-next.0
+  - @backstage/integration@1.3.2-next.0
+  - @backstage/types@1.0.0
+  - @backstage/plugin-catalog-common@1.0.7-next.0
+  - @backstage/plugin-permission-common@0.6.5-next.0
+  - @backstage/plugin-search-common@1.0.2-next.0
+
 ## 1.4.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.4.0",
+  "version": "1.4.1-next.0",
   "main": "../dist/index.cjs.js",
   "types": "../dist/index.alpha.d.ts"
 }

package/dist/index.cjs.js

@@ -608,7 +608,7 @@ class PlaceholderProcessor {
       const resolverKey = keys[0].substr(1);
       const resolverValue = data[keys[0]];
       const resolver = this.options.resolvers[resolverKey];
-      if (!resolver || typeof resolverValue !== "string") {
+      if (!resolver) {
         return [data, false];
       }
       const read = async (url) => {
@@ -1872,6 +1872,7 @@ class DefaultProcessingDatabase {
     );
   }
   async createDelta(tx, options) {
+    var _a, _b;
     if (options.type === "delta") {
       return {
         toAdd: [],
@@ -1914,7 +1915,7 @@ class DefaultProcessingDatabase {
       const upsertItem = { deferred: item.deferred, hash: item.hash };
       if (!oldRef) {
         toAdd.push(upsertItem);
-      } else if (oldRef.locationKey !== item.deferred.locationKey) {
+      } else if (((_a = oldRef == null ? void 0 : oldRef.locationKey) != null ? _a : void 0) !== ((_b = item.deferred.locationKey) != null ? _b : void 0)) {
         toRemove.push(item.ref);
         toAdd.push(upsertItem);
       } else if (oldRef.oldEntityHash !== item.hash) {
@@ -2032,7 +2033,7 @@ function startTaskPipeline(options) {
 
 const CACHE_TTL = 5;
 class DefaultCatalogProcessingEngine {
-  constructor(logger, processingDatabase, orchestrator, stitcher, createHash, pollingIntervalMs = 1e3, onProcessingError) {
+  constructor(logger, processingDatabase, orchestrator, stitcher, createHash, pollingIntervalMs = 1e3, onProcessingError, tracker = progressTracker()) {
     this.logger = logger;
     this.processingDatabase = processingDatabase;
     this.orchestrator = orchestrator;
@@ -2040,7 +2041,7 @@ class DefaultCatalogProcessingEngine {
     this.createHash = createHash;
     this.pollingIntervalMs = pollingIntervalMs;
     this.onProcessingError = onProcessingError;
-    this.tracker = progressTracker();
+    this.tracker = tracker;
   }
   async start() {
     if (this.stopFunc) {
@@ -2443,8 +2444,9 @@ function parseFilter(filter, query, db, negate = false) {
   });
 }
 class DefaultEntitiesCatalog {
-  constructor(database) {
+  constructor(database, stitcher) {
     this.database = database;
+    this.stitcher = stitcher;
   }
   async entities(request) {
     const db = this.database;
@@ -2496,13 +2498,22 @@ class DefaultEntitiesCatalog {
   }
   async removeEntityByUid(uid) {
     await this.database("refresh_state").update({
-      result_hash: "child-was-deleted"
+      result_hash: "child-was-deleted",
+      next_update_at: this.database.fn.now()
     }).whereIn("entity_ref", function parents(builder) {
       return builder.from("refresh_state").innerJoin("refresh_state_references", {
         "refresh_state_references.target_entity_ref": "refresh_state.entity_ref"
       }).where("refresh_state.entity_id", "=", uid).select("refresh_state_references.source_entity_ref");
     });
+    const relationPeers = await this.database.from("relations").innerJoin("refresh_state", {
+      "refresh_state.entity_ref": "relations.target_entity_ref"
+    }).where("relations.originating_entity_id", "=", uid).andWhere("refresh_state.entity_id", "!=", uid).select({ ref: "relations.target_entity_ref" }).union(
+      (other) => other.from("relations").innerJoin("refresh_state", {
+        "refresh_state.entity_ref": "relations.source_entity_ref"
+      }).where("relations.originating_entity_id", "=", uid).andWhere("refresh_state.entity_id", "!=", uid).select({ ref: "relations.source_entity_ref" })
+    );
     await this.database("refresh_state").where("entity_id", uid).delete();
+    await this.stitcher.stitch(new Set(relationPeers.map((p) => p.ref)));
   }
   async entityAncestry(rootRef) {
     const [rootRow] = await this.database("refresh_state").leftJoin("final_entities", {
@@ -4050,7 +4061,11 @@ class CatalogBuilder {
       parser,
       policy
     });
-    const unauthorizedEntitiesCatalog = new DefaultEntitiesCatalog(dbClient);
+    const stitcher = new Stitcher(dbClient, logger);
+    const unauthorizedEntitiesCatalog = new DefaultEntitiesCatalog(
+      dbClient,
+      stitcher
+    );
     let permissionEvaluator;
     if ("authorizeConditional" in permissions) {
       permissionEvaluator = permissions;
@@ -4088,7 +4103,6 @@ class CatalogBuilder {
       permissions: pluginCatalogCommon.catalogPermissions,
       rules: this.permissionRules
     });
-    const stitcher = new Stitcher(dbClient, logger);
     const locationStore = new DefaultLocationStore(dbClient);
     const configLocationProvider = new ConfigLocationEntityProvider(config);
     const entityProviders = lodash__default["default"].uniqBy(