@backstage/plugin-catalog-backend 1.5.1 → 1.6.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,83 @@
 # @backstage/plugin-catalog-backend
 
+## 1.6.0-next.1
+
+### Minor Changes
+
+- c395abb5b2: The catalog no longer stops after the first processor `validateEntityKind`
+  method returns `true` when validating entity kind shapes. Instead, it continues
+  through all registered processors that have this method, and requires that _at
+  least one_ of them returned true.
+
+  The old behavior of stopping early made it harder to extend existing core kinds
+  with additional fields, since the `BuiltinKindsEntityProcessor` is always
+  present at the top of the processing chain and ensures that your additional
+  validation code would never be run.
+
+  This is technically a breaking change, although it should not affect anybody
+  under normal circumstances, except if you had problematic validation code that
+  you were unaware that it was not being run. That code may now start to exhibit
+  those problems.
+
+  If you need to disable this new behavior, `CatalogBuilder` as used in your
+  `packages/backend/src/plugins/catalog.ts` file now has a
+  `useLegacySingleProcessorValidation()` method to go back to the old behavior.
+
+  ```diff
+   const builder = await CatalogBuilder.create(env);
+  +builder.useLegacySingleProcessorValidation();
+  ```
+
+### Patch Changes
+
+- 2a8e3cc0b5: Optimize `Stitcher` process to be more memory efficient
+- 5b3e2afa45: Fixed deprecated use of `substr` into `substring`.
+- Updated dependencies
+  - @backstage/backend-common@0.17.0-next.1
+  - @backstage/types@1.0.2-next.1
+  - @backstage/backend-plugin-api@0.1.5-next.1
+  - @backstage/plugin-catalog-node@1.2.2-next.1
+  - @backstage/plugin-permission-node@0.7.2-next.1
+  - @backstage/config@1.0.5-next.1
+  - @backstage/integration@1.4.1-next.1
+  - @backstage/catalog-client@1.2.0-next.1
+  - @backstage/catalog-model@1.1.4-next.1
+  - @backstage/errors@1.1.4-next.1
+  - @backstage/plugin-catalog-common@1.0.9-next.1
+  - @backstage/plugin-permission-common@0.7.2-next.1
+  - @backstage/plugin-scaffolder-common@1.2.3-next.1
+  - @backstage/plugin-search-common@1.1.2-next.1
+
+## 1.6.0-next.0
+
+### Minor Changes
+
+- 16891a212c: Added new `POST /entities/by-refs` endpoint, which allows you to efficiently
+  batch-fetch entities by their entity ref. This can be useful e.g. in graphql
+  resolvers or similar contexts where you need to fetch many entities at the same
+  time.
+
+### Patch Changes
+
+- d8593ce0e6: Do not use deprecated `LocationSpec` from the `@backstage/plugin-catalog-node` package
+- 3280711113: Updated dependency `msw` to `^0.49.0`.
+- e982f77fe3: Registered shutdown hook in experimental catalog plugin.
+- Updated dependencies
+  - @backstage/catalog-client@1.2.0-next.0
+  - @backstage/backend-common@0.16.1-next.0
+  - @backstage/integration@1.4.1-next.0
+  - @backstage/plugin-permission-common@0.7.2-next.0
+  - @backstage/plugin-permission-node@0.7.2-next.0
+  - @backstage/types@1.0.2-next.0
+  - @backstage/backend-plugin-api@0.1.5-next.0
+  - @backstage/plugin-catalog-node@1.2.2-next.0
+  - @backstage/catalog-model@1.1.4-next.0
+  - @backstage/config@1.0.5-next.0
+  - @backstage/errors@1.1.4-next.0
+  - @backstage/plugin-catalog-common@1.0.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.3-next.0
+  - @backstage/plugin-search-common@1.1.2-next.0
+
 ## 1.5.1
 
 ### Patch Changes

package/alpha/package.json

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

package/dist/index.alpha.d.ts

@@ -38,7 +38,7 @@ import { EntityRelationSpec } from '@backstage/plugin-catalog-node';
 import { GetEntitiesRequest } from '@backstage/catalog-client';
 import { JsonValue } from '@backstage/types';
 import { LocationEntityV1alpha1 } from '@backstage/catalog-model';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec as LocationSpec_2 } from '@backstage/plugin-catalog-common';
 import { Logger } from 'winston';
 import { Permission } from '@backstage/plugin-permission-common';
 import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
@@ -114,7 +114,7 @@ export declare class AnnotateLocationEntityProcessor implements CatalogProcessor
         integrations: ScmIntegrationRegistry;
     });
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec, _: CatalogProcessorEmit, originLocation: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2, _: CatalogProcessorEmit, originLocation: LocationSpec_2): Promise<Entity>;
 }
 
 /** @public */
@@ -125,7 +125,7 @@ export declare class AnnotateScmSlugEntityProcessor implements CatalogProcessor
     });
     getProcessorName(): string;
     static fromConfig(config: Config): AnnotateScmSlugEntityProcessor;
-    preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2): Promise<Entity>;
 }
 
 /** @public */
@@ -133,7 +133,7 @@ export declare class BuiltinKindsEntityProcessor implements CatalogProcessor {
     private readonly validators;
     getProcessorName(): string;
     validateEntityKind(entity: Entity): Promise<boolean>;
-    postProcessEntity(entity: Entity, _location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    postProcessEntity(entity: Entity, _location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /**
@@ -177,6 +177,7 @@ export declare class CatalogBuilder {
     private locationAnalyzer;
     private readonly permissionRules;
     private allowedLocationType;
+    private legacySingleProcessorValidation;
     /**
      * Creates a catalog builder.
      */
@@ -306,13 +307,18 @@ export declare class CatalogBuilder {
      * @param permissionRules - Additional permission rules
      * @alpha
      */
-    addPermissionRules(...permissionRules: Array<CatalogPermissionRule | Array<CatalogPermissionRule>>): void;
+    addPermissionRules(...permissionRules: Array<CatalogPermissionRule | Array<CatalogPermissionRule>>): this;
     /**
      * Sets up the allowed location types from being registered via the location service.
      *
      * @param allowedLocationTypes - the allowed location types
      */
     setAllowedLocationTypes(allowedLocationTypes: string[]): CatalogBuilder;
+    /**
+     * Enables the legacy behaviour of canceling validation early whenever only a
+     * single processor declares an entity kind to be valid.
+     */
+    useLegacySingleProcessorValidation(): this;
     /**
      * Wires up and returns all of the component parts of the catalog
      */
@@ -427,7 +433,7 @@ export declare class CodeOwnersProcessor implements CatalogProcessor {
         reader: UrlReader;
     });
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2): Promise<Entity>;
 }
 
 /**
@@ -586,7 +592,7 @@ export { EntityRelationSpec }
 /** @public */
 export declare class FileReaderProcessor implements CatalogProcessor {
     getProcessorName(): string;
-    readLocation(location: LocationSpec, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser): Promise<boolean>;
+    readLocation(location: LocationSpec_2, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser): Promise<boolean>;
 }
 
 /** @public */
@@ -605,7 +611,7 @@ export declare class LocationEntityProcessor implements CatalogProcessor {
     private readonly options;
     constructor(options: LocationEntityProcessorOptions);
     getProcessorName(): string;
-    postProcessEntity(entity: Entity, location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    postProcessEntity(entity: Entity, location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /** @public */
@@ -613,16 +619,28 @@ export declare type LocationEntityProcessorOptions = {
     integrations: ScmIntegrationRegistry;
 };
 
-export { LocationSpec }
+/**
+ * Holds the entity location information.
+ *
+ * @remarks
+ *
+ *  `presence` flag: when using repo importer plugin, location is being created before the component yaml file is merged to the main branch.
+ *  This flag is then set to indicate that the file can be not present.
+ *  default value: 'required'.
+ *
+ * @public
+ * @deprecated use the same type from `@backstage/plugin-catalog-common` instead
+ */
+export declare type LocationSpec = LocationSpec_2;
 
 /** @public */
 export declare function locationSpecToLocationEntity(opts: {
-    location: LocationSpec;
+    location: LocationSpec_2;
     parentEntity?: Entity;
 }): LocationEntityV1alpha1;
 
 /** @public */
-export declare function parseEntityYaml(data: Buffer, location: LocationSpec): Iterable<CatalogProcessorResult>;
+export declare function parseEntityYaml(data: Buffer, location: LocationSpec_2): Iterable<CatalogProcessorResult>;
 
 /**
  * These permission rules can be used to conditionally filter catalog entities
@@ -663,7 +681,7 @@ export declare class PlaceholderProcessor implements CatalogProcessor {
     private readonly options;
     constructor(options: PlaceholderProcessorOptions);
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /** @public */
@@ -719,7 +737,7 @@ export declare class UrlReaderProcessor implements CatalogProcessor {
         logger: Logger;
     });
     getProcessorName(): string;
-    readLocation(location: LocationSpec, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser, cache: CatalogProcessorCache): Promise<boolean>;
+    readLocation(location: LocationSpec_2, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser, cache: CatalogProcessorCache): Promise<boolean>;
     private doRead;
 }
 

package/dist/index.beta.d.ts

@@ -38,7 +38,7 @@ import { EntityRelationSpec } from '@backstage/plugin-catalog-node';
 import { GetEntitiesRequest } from '@backstage/catalog-client';
 import { JsonValue } from '@backstage/types';
 import { LocationEntityV1alpha1 } from '@backstage/catalog-model';
-import { LocationSpec } from '@backstage/plugin-catalog-node';
+import { LocationSpec as LocationSpec_2 } from '@backstage/plugin-catalog-common';
 import { Logger } from 'winston';
 import { Permission } from '@backstage/plugin-permission-common';
 import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
@@ -114,7 +114,7 @@ export declare class AnnotateLocationEntityProcessor implements CatalogProcessor
         integrations: ScmIntegrationRegistry;
     });
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec, _: CatalogProcessorEmit, originLocation: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2, _: CatalogProcessorEmit, originLocation: LocationSpec_2): Promise<Entity>;
 }
 
 /** @public */
@@ -125,7 +125,7 @@ export declare class AnnotateScmSlugEntityProcessor implements CatalogProcessor
     });
     getProcessorName(): string;
     static fromConfig(config: Config): AnnotateScmSlugEntityProcessor;
-    preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2): Promise<Entity>;
 }
 
 /** @public */
@@ -133,7 +133,7 @@ export declare class BuiltinKindsEntityProcessor implements CatalogProcessor {
     private readonly validators;
     getProcessorName(): string;
     validateEntityKind(entity: Entity): Promise<boolean>;
-    postProcessEntity(entity: Entity, _location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    postProcessEntity(entity: Entity, _location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /**
@@ -177,6 +177,7 @@ export declare class CatalogBuilder {
     private locationAnalyzer;
     private readonly permissionRules;
     private allowedLocationType;
+    private legacySingleProcessorValidation;
     /**
      * Creates a catalog builder.
      */
@@ -305,6 +306,11 @@ export declare class CatalogBuilder {
      * @param allowedLocationTypes - the allowed location types
      */
     setAllowedLocationTypes(allowedLocationTypes: string[]): CatalogBuilder;
+    /**
+     * Enables the legacy behaviour of canceling validation early whenever only a
+     * single processor declares an entity kind to be valid.
+     */
+    useLegacySingleProcessorValidation(): this;
     /**
      * Wires up and returns all of the component parts of the catalog
      */
@@ -380,7 +386,7 @@ export declare class CodeOwnersProcessor implements CatalogProcessor {
         reader: UrlReader;
     });
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2): Promise<Entity>;
 }
 
 /* Excluded from this release type: createCatalogConditionalDecision */
@@ -501,7 +507,7 @@ export { EntityRelationSpec }
 /** @public */
 export declare class FileReaderProcessor implements CatalogProcessor {
     getProcessorName(): string;
-    readLocation(location: LocationSpec, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser): Promise<boolean>;
+    readLocation(location: LocationSpec_2, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser): Promise<boolean>;
 }
 
 /** @public */
@@ -520,7 +526,7 @@ export declare class LocationEntityProcessor implements CatalogProcessor {
     private readonly options;
     constructor(options: LocationEntityProcessorOptions);
     getProcessorName(): string;
-    postProcessEntity(entity: Entity, location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    postProcessEntity(entity: Entity, location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /** @public */
@@ -528,16 +534,28 @@ export declare type LocationEntityProcessorOptions = {
     integrations: ScmIntegrationRegistry;
 };
 
-export { LocationSpec }
+/**
+ * Holds the entity location information.
+ *
+ * @remarks
+ *
+ *  `presence` flag: when using repo importer plugin, location is being created before the component yaml file is merged to the main branch.
+ *  This flag is then set to indicate that the file can be not present.
+ *  default value: 'required'.
+ *
+ * @public
+ * @deprecated use the same type from `@backstage/plugin-catalog-common` instead
+ */
+export declare type LocationSpec = LocationSpec_2;
 
 /** @public */
 export declare function locationSpecToLocationEntity(opts: {
-    location: LocationSpec;
+    location: LocationSpec_2;
     parentEntity?: Entity;
 }): LocationEntityV1alpha1;
 
 /** @public */
-export declare function parseEntityYaml(data: Buffer, location: LocationSpec): Iterable<CatalogProcessorResult>;
+export declare function parseEntityYaml(data: Buffer, location: LocationSpec_2): Iterable<CatalogProcessorResult>;
 
 /* Excluded from this release type: permissionRules */
 
@@ -550,7 +568,7 @@ export declare class PlaceholderProcessor implements CatalogProcessor {
     private readonly options;
     constructor(options: PlaceholderProcessorOptions);
     getProcessorName(): string;
-    preProcessEntity(entity: Entity, location: LocationSpec, emit: CatalogProcessorEmit): Promise<Entity>;
+    preProcessEntity(entity: Entity, location: LocationSpec_2, emit: CatalogProcessorEmit): Promise<Entity>;
 }
 
 /** @public */
@@ -606,7 +624,7 @@ export declare class UrlReaderProcessor implements CatalogProcessor {
         logger: Logger;
     });
     getProcessorName(): string;
-    readLocation(location: LocationSpec, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser, cache: CatalogProcessorCache): Promise<boolean>;
+    readLocation(location: LocationSpec_2, optional: boolean, emit: CatalogProcessorEmit, parser: CatalogProcessorParser, cache: CatalogProcessorCache): Promise<boolean>;
     private doRead;
 }
 

package/dist/index.cjs.js

@@ -601,7 +601,7 @@ class PlaceholderProcessor {
       } else if (keys.length !== 1) {
         return [data, false];
       }
-      const resolverKey = keys[0].substr(1);
+      const resolverKey = keys[0].substring(1);
       const resolverValue = data[keys[0]];
       const resolver = this.options.resolvers[resolverKey];
       if (!resolver) {
@@ -2525,6 +2525,31 @@ class DefaultEntitiesCatalog {
       pageInfo
     };
   }
+  async entitiesBatch(request) {
+    const lookup = /* @__PURE__ */ new Map();
+    for (const chunk of lodash__default["default"].chunk(request.entityRefs, 200)) {
+      let query = this.database("final_entities").innerJoin("refresh_state", {
+        "refresh_state.entity_id": "final_entities.entity_id"
+      }).select({
+        entityRef: "refresh_state.entity_ref",
+        entity: "final_entities.final_entity"
+      }).whereIn("refresh_state.entity_ref", chunk);
+      if (request == null ? void 0 : request.filter) {
+        query = parseFilter(request.filter, query, this.database);
+      }
+      for (const row of await query) {
+        lookup.set(row.entityRef, row.entity ? JSON.parse(row.entity) : null);
+      }
+    }
+    let items = request.entityRefs.map((ref) => {
+      var _a;
+      return (_a = lookup.get(ref)) != null ? _a : null;
+    });
+    if (request.fields) {
+      items = items.map((e) => e && request.fields(e));
+    }
+    return { items };
+  }
   async removeEntityByUid(uid) {
     await this.database("refresh_state").update({
       result_hash: "child-was-deleted",
@@ -2905,13 +2930,16 @@ class DefaultCatalogProcessingOrchestrator {
         e
       );
     }
-    let foundKind = false;
+    let valid = false;
     for (const processor of this.options.processors) {
       if (processor.validateEntityKind) {
         try {
-          foundKind = await processor.validateEntityKind(entity);
-          if (foundKind) {
-            break;
+          const thisValid = await processor.validateEntityKind(entity);
+          if (thisValid) {
+            valid = true;
+            if (this.options.legacySingleProcessorValidation) {
+              break;
+            }
           }
         } catch (e) {
           throw new errors.InputError(
@@ -2921,7 +2949,7 @@ class DefaultCatalogProcessingOrchestrator {
         }
       }
     }
-    if (!foundKind) {
+    if (!valid) {
       throw new errors.InputError(
         `No processor recognized the entity ${context.entityRef} as valid, possibly caused by a foreign kind or apiVersion`
       );
@@ -3134,22 +3162,24 @@ class Stitcher {
       hash: "",
       stitch_ticket: ticket
     }).onConflict("entity_id").merge(["stitch_ticket"]);
-    const result = await this.database.with("incoming_references", function incomingReferences(builder) {
-      return builder.from("refresh_state_references").where({ target_entity_ref: entityRef }).count({ count: "*" });
-    }).select({
-      entityId: "refresh_state.entity_id",
-      processedEntity: "refresh_state.processed_entity",
-      errors: "refresh_state.errors",
-      incomingReferenceCount: "incoming_references.count",
-      previousHash: "final_entities.hash",
-      relationType: "relations.type",
-      relationTarget: "relations.target_entity_ref"
-    }).from("refresh_state").where({ "refresh_state.entity_ref": entityRef }).crossJoin(this.database.raw("incoming_references")).leftOuterJoin("final_entities", {
-      "final_entities.entity_id": "refresh_state.entity_id"
-    }).leftOuterJoin("relations", {
-      "relations.source_entity_ref": "refresh_state.entity_ref"
-    }).orderBy("relationType", "asc").orderBy("relationTarget", "asc");
-    if (!result.length) {
+    const [processedResult, relationsResult] = await Promise.all([
+      this.database.with("incoming_references", function incomingReferences(builder) {
+        return builder.from("refresh_state_references").where({ target_entity_ref: entityRef }).count({ count: "*" });
+      }).select({
+        entityId: "refresh_state.entity_id",
+        processedEntity: "refresh_state.processed_entity",
+        errors: "refresh_state.errors",
+        incomingReferenceCount: "incoming_references.count",
+        previousHash: "final_entities.hash"
+      }).from("refresh_state").where({ "refresh_state.entity_ref": entityRef }).crossJoin(this.database.raw("incoming_references")).leftOuterJoin("final_entities", {
+        "final_entities.entity_id": "refresh_state.entity_id"
+      }),
+      this.database.distinct({
+        relationType: "type",
+        relationTarget: "target_entity_ref"
+      }).from("relations").where({ source_entity_ref: entityRef }).orderBy("relationType", "asc").orderBy("relationTarget", "asc")
+    ]);
+    if (!processedResult.length) {
       this.logger.error(
         `Unable to stitch ${entityRef}, item does not exist in refresh state table`
       );
@@ -3161,7 +3191,7 @@ class Stitcher {
       errors,
       incomingReferenceCount,
       previousHash
-    } = result[0];
+    } = processedResult[0];
     if (!processedEntity) {
       this.logger.debug(
         `Unable to stitch ${entityRef}, the entity has not yet been processed`
@@ -3189,11 +3219,7 @@ class Stitcher {
         }));
       }
     }
-    const uniqueRelationRows = lodash.uniqBy(
-      result,
-      (r) => `${r.relationType}:${r.relationTarget}`
-    );
-    entity.relations = uniqueRelationRows.filter((row) => row.relationType).map((row) => ({
+    entity.relations = relationsResult.filter((row) => row.relationType).map((row) => ({
       type: row.relationType,
       targetRef: row.relationTarget
     }));
@@ -3230,6 +3256,19 @@ class Stitcher {
   }
 }
 
+const schema = zod.z.object({
+  entityRefs: zod.z.array(zod.z.string())
+});
+function entitiesBatchRequest(req) {
+  try {
+    return schema.parse(req.body);
+  } catch (error) {
+    throw new errors.InputError(
+      `Malformed request body (did you remember to specify an application/json content type?), ${error.message}`
+    );
+  }
+}
+
 function basicEntityFilter(items) {
   const filtersByKey = {};
   for (const [key, value] of Object.entries(items)) {
@@ -3292,8 +3331,8 @@ function parseEntityFilterString(filterString) {
   const filtersByKey = {};
   for (const statement of statements) {
     const equalsIndex = statement.indexOf("=");
-    const key = equalsIndex === -1 ? statement : statement.substr(0, equalsIndex).trim();
-    const value = equalsIndex === -1 ? void 0 : statement.substr(equalsIndex + 1).trim();
+    const key = equalsIndex === -1 ? statement : statement.substring(0, equalsIndex).trim();
+    const value = equalsIndex === -1 ? void 0 : statement.substring(equalsIndex + 1).trim();
     if (!key) {
       throw new errors.InputError(
         `Invalid filter, '${statement}' is not a valid statement (expected a string on the form a=b or a= or a)`
@@ -3369,6 +3408,17 @@ function parseEntityTransformParams(params) {
   };
 }
 
+function parseEntityFacetParams(params) {
+  const facetStrings = parseStringsParam(params.facet, "facet");
+  if (facetStrings) {
+    const filtered = facetStrings.filter(Boolean);
+    if (filtered.length) {
+      return filtered;
+    }
+  }
+  throw new errors.InputError("Missing facet parameter");
+}
+
 async function requireRequestBody(req) {
   const contentType = req.header("content-type");
   if (!contentType) {
@@ -3405,17 +3455,6 @@ function disallowReadonlyMode(readonly) {
   }
 }
 
-function parseEntityFacetParams(params) {
-  const facetStrings = parseStringsParam(params.facet, "facet");
-  if (facetStrings) {
-    const filtered = facetStrings.filter(Boolean);
-    if (filtered.length) {
-      return filtered;
-    }
-  }
-  throw new errors.InputError("Missing facet parameter");
-}
-
 async function createRouter(options) {
   const {
     entitiesCatalog,
@@ -3503,7 +3542,16 @@ async function createRouter(options) {
         });
         res.status(200).json(response);
       }
-    ).get("/entity-facets", async (req, res) => {
+    ).post("/entities/by-refs", async (req, res) => {
+      const request = entitiesBatchRequest(req);
+      const token = getBearerToken(req.header("authorization"));
+      const response = await entitiesCatalog.entitiesBatch({
+        entityRefs: request.entityRefs,
+        fields: parseEntityTransformParams(req.query),
+        authorizationToken: token
+      });
+      res.status(200).json(response);
+    }).get("/entity-facets", async (req, res) => {
       const response = await entitiesCatalog.facets({
         filter: parseEntityFilterParams(req.query),
         facets: parseEntityFacetParams(req.query),
@@ -3829,6 +3877,27 @@ class AuthorizedEntitiesCatalog {
     }
     return this.entitiesCatalog.entities(request);
   }
+  async entitiesBatch(request) {
+    const authorizeDecision = (await this.permissionApi.authorizeConditional(
+      [{ permission: pluginCatalogCommon.catalogEntityReadPermission }],
+      { token: request == null ? void 0 : request.authorizationToken }
+    ))[0];
+    if (authorizeDecision.result === pluginPermissionCommon.AuthorizeResult.DENY) {
+      return {
+        items: new Array(request.entityRefs.length).fill(null)
+      };
+    }
+    if (authorizeDecision.result === pluginPermissionCommon.AuthorizeResult.CONDITIONAL) {
+      const permissionFilter = this.transformConditions(
+        authorizeDecision.conditions
+      );
+      return this.entitiesCatalog.entitiesBatch({
+        ...request,
+        filter: (request == null ? void 0 : request.filter) ? { allOf: [permissionFilter, request.filter] } : permissionFilter
+      });
+    }
+    return this.entitiesCatalog.entitiesBatch(request);
+  }
   async removeEntityByUid(uid, options) {
     const authorizeResponse = (await this.permissionApi.authorizeConditional(
       [{ permission: pluginCatalogCommon.catalogEntityDeletePermission }],
@@ -3989,6 +4058,7 @@ class CatalogBuilder {
       maxSeconds: 150
     });
     this.locationAnalyzer = void 0;
+    this.legacySingleProcessorValidation = false;
     this.env = env;
     this.entityPolicies = [];
     this.entityPoliciesReplace = false;
@@ -4070,11 +4140,16 @@ class CatalogBuilder {
   }
   addPermissionRules(...permissionRules) {
     this.permissionRules.push(...permissionRules.flat());
+    return this;
   }
   setAllowedLocationTypes(allowedLocationTypes) {
     this.allowedLocationType = allowedLocationTypes;
     return this;
   }
+  useLegacySingleProcessorValidation() {
+    this.legacySingleProcessorValidation = true;
+    return this;
+  }
   async build() {
     var _a, _b;
     const { config, database, logger, permissions } = this.env;
@@ -4099,7 +4174,8 @@ class CatalogBuilder {
       rulesEnforcer,
       logger,
       parser,
-      policy
+      policy,
+      legacySingleProcessorValidation: this.legacySingleProcessorValidation
     });
     const stitcher = new Stitcher(dbClient, logger);
     const unauthorizedEntitiesCatalog = new DefaultEntitiesCatalog(
@@ -4373,7 +4449,8 @@ const catalogPlugin = backendPluginApi.createBackendPlugin({
         reader: backendPluginApi.urlReaderServiceRef,
         permissions: backendPluginApi.permissionsServiceRef,
         database: backendPluginApi.databaseServiceRef,
-        httpRouter: backendPluginApi.httpRouterServiceRef
+        httpRouter: backendPluginApi.httpRouterServiceRef,
+        lifecycle: backendPluginApi.lifecycleServiceRef
       },
       async init({
         logger,
@@ -4381,7 +4458,8 @@ const catalogPlugin = backendPluginApi.createBackendPlugin({
         reader,
         database,
         permissions,
-        httpRouter
+        httpRouter,
+        lifecycle
       }) {
         const winstonLogger = backendPluginApi.loggerToWinstonLogger(logger);
         const builder = await CatalogBuilder.create({
@@ -4395,6 +4473,11 @@ const catalogPlugin = backendPluginApi.createBackendPlugin({
         builder.addEntityProvider(...processingExtensions.entityProviders);
         const { processingEngine, router } = await builder.build();
         await processingEngine.start();
+        lifecycle.addShutdownHook({
+          fn: async () => {
+            await processingEngine.stop();
+          }
+        });
         httpRouter.use(router);
       }
     });