Move the model into a plugin-catalog-model for sharing outside the backend

packages/backend/package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "start": "backstage-cli watch-deps --build -- tsc-watch --onFirstSuccess nodemon",
+    "start": "backstage-cli watch-deps --build -- tsc-watch --onFirstSuccess \\\"nodemon -r esm\\\"",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
     "clean": "backstage-cli clean",
@@ -18,13 +18,15 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.6",
+    "@backstage/catalog-model": "^0.1.1-alpha.6",
     "@backstage/plugin-auth-backend": "^0.1.1-alpha.6",
     "@backstage/plugin-catalog-backend": "^0.1.1-alpha.6",
-    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.6",
-    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.6",
     "@backstage/plugin-identity-backend": "^0.1.1-alpha.6",
+    "@backstage/plugin-scaffolder-backend": "^0.1.1-alpha.6",
+    "@backstage/plugin-sentry-backend": "^0.1.1-alpha.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
+    "esm": "^3.2.25",
     "express": "^4.17.1",
     "helmet": "^3.22.0",
     "knex": "^0.21.1",
@@ -43,6 +45,9 @@
     "typescript": "^3.9.2"
   },
   "nodemonConfig": {
-    "watch": "./dist"
+    "watch": [
+      "./dist",
+      "node_modules/@backstage*"
+    ]
   }
 }

packages/backend/src/plugins/catalog.ts

@@ -21,22 +21,28 @@ import {
   DatabaseManager,
   DescriptorParsers,
   LocationReaders,
+  IngestionModels,
   runPeriodically,
 } from '@backstage/plugin-catalog-backend';
 import { PluginEnvironment } from '../types';
+import { EntityPolicies } from '@backstage/catalog-model';
 
 export default async function ({ logger, database }: PluginEnvironment) {
-  const reader = LocationReaders.create();
-  const parser = DescriptorParsers.create();
+  const policy = new EntityPolicies();
+  const ingestion = new IngestionModels(
+    new LocationReaders(),
+    new DescriptorParsers(),
+    new EntityPolicies(),
+  );
 
   const db = await DatabaseManager.createDatabase(database, logger);
   runPeriodically(
-    () => DatabaseManager.refreshLocations(db, reader, parser, logger),
+    () => DatabaseManager.refreshLocations(db, ingestion, policy, logger),
     10000,
   );
 
   const entitiesCatalog = new DatabaseEntitiesCatalog(db);
-  const locationsCatalog = new DatabaseLocationsCatalog(db, reader);
+  const locationsCatalog = new DatabaseLocationsCatalog(db, ingestion);
 
   return await createRouter({ entitiesCatalog, locationsCatalog, logger });
 }