feat: moved the deprecated database implemmentation to legacy catalog

Signed-off-by: blam <ben@blam.sh> Co-authored-by: Johan Haals <johan.haals@gmail.com> Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
2021-10-07 17:59:00 +02:00
parent ec3930d755
commit f5df64c822
30 changed files with 148 additions and 116 deletions
@@ -435,7 +435,7 @@ export class CodeOwnersProcessor implements CatalogProcessor {

 // Warning: (ae-missing-release-tag) "CommonDatabase" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public
+// @public @deprecated
 export class CommonDatabase implements Database {
  constructor(database: Knex, logger: Logger_2);
  // (undocumented)
@@ -499,7 +499,7 @@ export class CommonDatabase implements Database {

 // Warning: (ae-missing-release-tag) "CreateDatabaseOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type CreateDatabaseOptions = {
  logger: Logger_2;
 };
@@ -528,7 +528,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;

 // Warning: (ae-missing-release-tag) "Database" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public
+// @public @deprecated
 export type Database = {
  transaction<T>(fn: (tx: Transaction) => Promise<T>): Promise<T>;
  addEntities(
@@ -624,7 +624,7 @@ export class DatabaseLocationsCatalog implements LocationsCatalog {

 // Warning: (ae-missing-release-tag) "DatabaseLocationUpdateLogEvent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DatabaseLocationUpdateLogEvent = {
  id: string;
  status: DatabaseLocationUpdateLogStatus;
@@ -646,7 +646,7 @@ export enum DatabaseLocationUpdateLogStatus {

 // Warning: (ae-missing-release-tag) "DatabaseManager" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export class DatabaseManager {
  // (undocumented)
  static createDatabase(
@@ -665,7 +665,7 @@ export class DatabaseManager {

 // Warning: (ae-missing-release-tag) "DbEntitiesRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbEntitiesRequest = {
  filter?: EntityFilter;
  pagination?: EntityPagination;
@@ -673,7 +673,7 @@ export type DbEntitiesRequest = {

 // Warning: (ae-missing-release-tag) "DbEntitiesResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbEntitiesResponse = {
  entities: DbEntityResponse[];
  pageInfo: DbPageInfo;
@@ -681,7 +681,7 @@ export type DbEntitiesResponse = {

 // Warning: (ae-missing-release-tag) "DbEntityRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbEntityRequest = {
  locationId?: string;
  entity: Entity;
@@ -690,7 +690,7 @@ export type DbEntityRequest = {

 // Warning: (ae-missing-release-tag) "DbEntityResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbEntityResponse = {
  locationId?: string;
  entity: Entity;
@@ -698,7 +698,7 @@ export type DbEntityResponse = {

 // Warning: (ae-missing-release-tag) "DbLocationsRow" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbLocationsRow = {
  id: string;
  type: string;
@@ -707,7 +707,7 @@ export type DbLocationsRow = {

 // Warning: (ae-missing-release-tag) "DbLocationsRowWithStatus" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbLocationsRowWithStatus = DbLocationsRow & {
  status: string | null;
  timestamp: string | null;
@@ -716,7 +716,7 @@ export type DbLocationsRowWithStatus = DbLocationsRow & {

 // Warning: (ae-missing-release-tag) "DbPageInfo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type DbPageInfo =
  | {
      hasNextPage: false;
@@ -812,7 +812,7 @@ export function durationText(startTimestamp: [number, number]): string;
 export type EntitiesCatalog = {
  entities(request?: EntitiesRequest): Promise<EntitiesResponse>;
  removeEntityByUid(uid: string): Promise<void>;
-  batchAddOrUpdateEntities(
+  batchAddOrUpdateEntities?(
    requests: EntityUpsertRequest[],
    options?: {
      locationId?: string;
@@ -943,7 +943,7 @@ export type EntityProviderMutation =

 // Warning: (ae-missing-release-tag) "EntityUpsertRequest" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type EntityUpsertRequest = {
  entity: Entity;
  relations: EntityRelationSpec[];
@@ -951,7 +951,7 @@ export type EntityUpsertRequest = {

 // Warning: (ae-missing-release-tag) "EntityUpsertResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type EntityUpsertResponse = {
  entityId: string;
  entity?: Entity;
@@ -1487,7 +1487,7 @@ export class StaticLocationProcessor implements StaticLocationProcessor {

 // Warning: (ae-missing-release-tag) "Transaction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
-// @public
+// @public @deprecated
 export type Transaction = {
  rollback(): Promise<unknown>;
 };
@@ -1512,20 +1512,20 @@ export class UrlReaderProcessor implements CatalogProcessor {

 // Warnings were encountered during analysis:
 //
-// src/catalog/types.d.ts:52:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
-// src/catalog/types.d.ts:53:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
-// src/catalog/types.d.ts:54:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
-// src/database/types.d.ts:125:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:131:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:132:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:146:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:147:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:148:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:150:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:163:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:164:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/database/types.d.ts:165:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/catalog/types.d.ts:97:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/catalog/types.d.ts:98:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
+// src/catalog/types.d.ts:99:8 - (tsdoc-param-tag-with-invalid-name) The @param block should be followed by a valid parameter name: The identifier cannot non-word characters
 // src/ingestion/processors/GithubMultiOrgReaderProcessor.d.ts:23:9 - (ae-forgotten-export) The symbol "GithubMultiOrgConfig" needs to be exported by the entry point index.d.ts
 // src/ingestion/types.d.ts:8:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:98:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:104:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:105:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:119:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:120:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:121:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:123:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:136:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:137:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
+// src/legacy/database/types.d.ts:138:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 // src/legacy/ingestion/types.d.ts:19:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 ```
@@ -22,4 +22,7 @@ export type {
  EntityUpsertRequest,
  EntityUpsertResponse,
  PageInfo,
+  EntitiesSearchFilter,
+  EntityFilter,
+  EntityPagination,
 } from './types';
@@ -15,11 +15,51 @@
 */

 import { Entity, EntityRelationSpec } from '@backstage/catalog-model';
-import { EntityFilter, EntityPagination } from '../database/types';

-//
-// Entities
-//
+/**
+ * A filter expression for entities.
+ *
+ * Any (at least one) of the outer sets must match, within which all of the
+ * individual filters must match.
+ */
+export type EntityFilter = {
+  anyOf: { allOf: EntitiesSearchFilter[] }[];
+};
+
+/**
+ * A pagination rule for entities.
+ */
+export type EntityPagination = {
+  limit?: number;
+  offset?: number;
+  after?: string;
+};
+
+/**
+ * Matches rows in the entities_search table.
+ */
+export type EntitiesSearchFilter = {
+  /**
+   * The key to match on.
+   *
+   * Matches are always case insensitive.
+   */
+  key: string;
+
+  /**
+   * Match on plain equality of values.
+   *
+   * If undefined, this factor is not taken into account. Otherwise, match on
+   * values that are equal to any of the given array items. Matches are always
+   * case insensitive.
+   */
+  matchValueIn?: string[];
+
+  /**
+   * Match on existence of key.
+   */
+  matchValueExists?: boolean;
+};

 export type PageInfo =
  | {
@@ -21,7 +21,6 @@
 */

 export * from './catalog';
-export * from './database';
 export * from './ingestion';
 export * from './legacy';
 export * from './search';
@@ -16,7 +16,7 @@

 import { getVoidLogger } from '@backstage/backend-common';
 import { Entity, LOCATION_ANNOTATION } from '@backstage/catalog-model';
-import { Database, DatabaseManager, Transaction } from '../../database';
+import { Database, DatabaseManager, Transaction } from '../database';
 import { basicEntityFilter } from '../../service/request';
 import { DatabaseEntitiesCatalog } from './DatabaseEntitiesCatalog';
 import { EntityUpsertRequest } from '../../catalog/types';
@@ -26,8 +26,8 @@ import { ConflictError } from '@backstage/errors';
 import { chunk, groupBy } from 'lodash';
 import limiterFactory from 'p-limit';
 import { Logger } from 'winston';
-import type { Database, DbEntityResponse, Transaction } from '../../database';
-import { DbEntitiesRequest } from '../../database/types';
+import type { Database, DbEntityResponse, Transaction } from '../database';
+import { DbEntitiesRequest } from '../database/types';
 import { basicEntityFilter } from '../../service/request';
 import { durationText } from '../../util/timing';
 import type {
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { DatabaseManager } from '../../database';
+import { DatabaseManager } from '../database';
 import { DatabaseLocationsCatalog } from './DatabaseLocationsCatalog';

 const bootstrapLocation = {
@@ -15,11 +15,11 @@
 */

 import { Location } from '@backstage/catalog-model';
-import type { Database } from '../../database';
+import type { Database } from '../database';
 import {
  DatabaseLocationUpdateLogEvent,
  DatabaseLocationUpdateLogStatus,
-} from '../../database/types';
+} from '../database/types';
 import { LocationResponse, LocationsCatalog } from './types';

 /** @deprecated This was part of the legacy catalog engine */
@@ -16,7 +16,7 @@

 import { Entity, Location, parseEntityRef } from '@backstage/catalog-model';
 import { ConflictError } from '@backstage/errors';
-import { basicEntityFilter } from '../service/request';
+import { basicEntityFilter } from '../../service/request';
 import { DatabaseManager } from './DatabaseManager';
 import type {
  DbEntityRequest,
@@ -44,9 +44,9 @@ import {
  DbLocationsRow,
  DbLocationsRowWithStatus,
  DbPageInfo,
-  EntityPagination,
  Transaction,
 } from './types';
+import { EntityPagination } from '../../catalog/types';

 // The number of items that are sent per batch to the database layer, when
 // doing .batchInsert calls to knex. This needs to be low enough to not cause
@@ -55,7 +55,8 @@ import {
 const BATCH_SIZE = 50;

 /**
- * The core database implementation.
+ * The core database implementation..
+ * @deprecated This was part of the legacy catalog engin
 */
 export class CommonDatabase implements Database {
  constructor(
@@ -26,6 +26,7 @@ const migrationsDir = resolvePackagePath(
  'migrations',
 );

+/** @deprecated This was part of the legacy catalog engine */
 export type CreateDatabaseOptions = {
  logger: Logger;
 };
@@ -34,6 +35,7 @@ const defaultOptions: CreateDatabaseOptions = {
  logger: getVoidLogger(),
 };

+/** @deprecated This was part of the legacy catalog engine */
 export class DatabaseManager {
  public static async createDatabase(
    knex: Knex,
@@ -21,9 +21,6 @@ export type {
  Database,
  DbEntityRequest,
  DbEntityResponse,
-  EntitiesSearchFilter,
-  EntityFilter,
-  EntityPagination,
  Transaction,
  DbEntitiesRequest,
  DbEntitiesResponse,
@@ -20,7 +20,9 @@ import type {
  EntityRelationSpec,
  Location,
 } from '@backstage/catalog-model';
+import { EntityFilter, EntityPagination } from '../../catalog/types';

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntitiesRow = {
  id: string;
  location_id: string | null;
@@ -30,22 +32,26 @@ export type DbEntitiesRow = {
  data: string;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntityRequest = {
  locationId?: string;
  entity: Entity;
  relations: EntityRelationSpec[];
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntitiesRequest = {
  filter?: EntityFilter;
  pagination?: EntityPagination;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntitiesResponse = {
  entities: DbEntityResponse[];
  pageInfo: DbPageInfo;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbPageInfo =
  | {
      hasNextPage: false;
@@ -55,11 +61,13 @@ export type DbPageInfo =
      endCursor: string;
    };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntityResponse = {
  locationId?: string;
  entity: Entity;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntitiesRelationsRow = {
  originating_entity_id: string;
  source_full_name: string;
@@ -67,18 +75,21 @@ export type DbEntitiesRelationsRow = {
  target_full_name: string;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbEntitiesSearchRow = {
  entity_id: string;
  key: string;
  value: string | null;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbLocationsRow = {
  id: string;
  type: string;
  target: string;
 };

+/** @deprecated This was part of the legacy catalog engine */
 export type DbLocationsRowWithStatus = DbLocationsRow & {
  status: string | null;
  timestamp: string | null;
@@ -90,6 +101,7 @@ export enum DatabaseLocationUpdateLogStatus {
  SUCCESS = 'success',
 }

+/** @deprecated This was part of the legacy catalog engine */
 export type DatabaseLocationUpdateLogEvent = {
  id: string;
  status: DatabaseLocationUpdateLogStatus;
@@ -99,53 +111,10 @@ export type DatabaseLocationUpdateLogEvent = {
  message?: string;
 };

-/**
- * Matches rows in the entities_search table.
- */
-export type EntitiesSearchFilter = {
-  /**
-   * The key to match on.
-   *
-   * Matches are always case insensitive.
-   */
-  key: string;
-
-  /**
-   * Match on plain equality of values.
-   *
-   * If undefined, this factor is not taken into account. Otherwise, match on
-   * values that are equal to any of the given array items. Matches are always
-   * case insensitive.
-   */
-  matchValueIn?: string[];
-
-  /**
-   * Match on existence of key.
-   */
-  matchValueExists?: boolean;
-};
-
-/**
- * A filter expression for entities.
- *
- * Any (at least one) of the outer sets must match, within which all of the
- * individual filters must match.
- */
-export type EntityFilter = {
-  anyOf: { allOf: EntitiesSearchFilter[] }[];
-};
-
-/**
- * A pagination rule for entities.
- */
-export type EntityPagination = {
-  limit?: number;
-  offset?: number;
-  after?: string;
-};
-
 /**
 * An abstraction for transactions of the underlying database technology.
+ *
+ * @deprecated This was part of the legacy catalog engine
 */
 export type Transaction = {
  rollback(): Promise<unknown>;
@@ -154,6 +123,7 @@ export type Transaction = {
 /**
 * An abstraction on top of the underlying database, wrapping the basic CRUD
 * needs.
+ * @deprecated This was part of the legacy catalog engine
 */
 export type Database = {
  /**
@@ -17,3 +17,4 @@
 export * from './catalog';
 export * from './ingestion';
 export * from './service';
+export * from './database';
@@ -19,7 +19,7 @@ import { Entity, Location, LocationSpec } from '@backstage/catalog-model';
 import { EntitiesCatalog } from '../../catalog';
 import { LocationsCatalog } from '../catalog';
 import { LocationUpdateStatus } from '../catalog/types';
-import { DatabaseLocationUpdateLogStatus } from '../../database/types';
+import { DatabaseLocationUpdateLogStatus } from '../database/types';
 import { HigherOrderOperations } from './HigherOrderOperations';
 import { LocationReader } from './types';

@@ -19,7 +19,7 @@ import { Entity } from '@backstage/catalog-model';
 import { ConfigReader } from '@backstage/config';
 import { Knex } from 'knex';
 import yaml from 'yaml';
-import { DatabaseManager } from '../../database';
+import { DatabaseManager } from '../database';
 import { CatalogProcessorParser } from '../../ingestion';
 import * as result from '../../ingestion/processors/results';
 import { CatalogBuilder } from './CatalogBuilder';
@@ -32,7 +32,7 @@ import {
  DatabaseLocationsCatalog,
  LocationsCatalog,
 } from '../catalog';
-import { DatabaseManager } from '../../database';
+import { DatabaseManager } from '../database';
 import {
  AnnotateLocationEntityProcessor,
  BitbucketDiscoveryProcessor,
@@ -34,8 +34,12 @@ import { createHash } from 'crypto';
 import { Router } from 'express';
 import lodash from 'lodash';
 import { EntitiesCatalog } from '../catalog';
-import { DatabaseLocationsCatalog, LocationsCatalog } from '../legacy/catalog';
-import { CommonDatabase } from '../database/CommonDatabase';
+import {
+  DatabaseLocationsCatalog,
+  LocationsCatalog,
+  CommonDatabase,
+} from '../legacy';
+
 import {
  AnnotateLocationEntityProcessor,
  BitbucketDiscoveryProcessor,
@@ -22,13 +22,14 @@ import {
  EntitiesRequest,
  EntitiesResponse,
  EntityAncestryResponse,
+  EntityPagination,
 } from '../catalog/types';
-import { DbPageInfo, EntityPagination } from '../database/types';
 import {
  DbFinalEntitiesRow,
  DbRefreshStateReferencesRow,
  DbRefreshStateRow,
  DbSearchRow,
+  DbPageInfo,
 } from './database/tables';

 function parsePagination(input?: EntityPagination): {
@@ -18,8 +18,7 @@ import { getVoidLogger, resolvePackagePath } from '@backstage/backend-common';
 import knexFactory, { Knex } from 'knex';
 import { v4 as uuid } from 'uuid';
 import { Logger } from 'winston';
-import { CommonDatabase } from '../../database/CommonDatabase';
-import { Database } from '../../database/types';
+import { CommonDatabase, Database } from '../../legacy';

 export type CreateDatabaseOptions = {
  logger: Logger;
@@ -20,17 +20,8 @@ import { Knex } from 'knex';
 import lodash from 'lodash';
 import { v4 as uuid } from 'uuid';
 import type { Logger } from 'winston';
-import { Transaction } from '../../database';
-import { DeferredEntity } from '../processing/types';
-import { RefreshIntervalFunction } from '../refresh';
-import { rethrowError, timestampToDateTime } from './conversion';
-import { initDatabaseMetrics } from './metrics';
-import {
-  DbRefreshStateReferencesRow,
-  DbRefreshStateRow,
-  DbRelationsRow,
-} from './tables';
 import {
+  Transaction,
  GetProcessableEntitiesResult,
  ProcessingDatabase,
  RefreshStateItem,
@@ -41,6 +32,16 @@ import {
  ListAncestorsResult,
  UpdateEntityCacheOptions,
 } from './types';
+import { DeferredEntity } from '../processing/types';
+import { RefreshIntervalFunction } from '../refresh';
+import { rethrowError, timestampToDateTime } from './conversion';
+import { initDatabaseMetrics } from './metrics';
+import {
+  DbRefreshStateReferencesRow,
+  DbRefreshStateRow,
+  DbRelationsRow,
+} from './tables';
+
 import { generateStableHash } from './util';

 // The number of items that are sent per batch to the database layer, when
@@ -15,9 +15,8 @@
 */

 import { Knex } from 'knex';
-import { DbLocationsRow } from '../../database/types';
 import { createGaugeMetric } from '../metrics';
-import { DbRefreshStateRow, DbRelationsRow } from './tables';
+import { DbRefreshStateRow, DbRelationsRow, DbLocationsRow } from './tables';

 export function initDatabaseMetrics(knex: Knex) {
  const seen = new Set<string>();
@@ -14,6 +14,15 @@
 * limitations under the License.
 */

+export type DbPageInfo =
+  | {
+      hasNextPage: false;
+    }
+  | {
+      hasNextPage: true;
+      endCursor: string;
+    };
+
 export type DbLocationsRow = {
  id: string;
  type: string;
@@ -17,9 +17,15 @@
 import { Entity, EntityRelationSpec } from '@backstage/catalog-model';
 import { JsonObject } from '@backstage/config';
 import { DateTime } from 'luxon';
-import { Transaction } from '../../database/types';
 import { DeferredEntity } from '../processing/types';

+/**
+ * An abstraction for transactions of the underlying database technology.
+ */
+export type Transaction = {
+  rollback(): Promise<unknown>;
+};
+
 export type AddUnprocessedEntitiesResult = {};

 export type UpdateProcessedEntityOptions = {
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import { EntitiesSearchFilter, EntityFilter } from '../../database';
+import { EntitiesSearchFilter, EntityFilter } from '../../catalog';

 /**
 * Forms a full EntityFilter based on a single key-value(s) object.
@@ -15,7 +15,7 @@
 */

 import { InputError } from '@backstage/errors';
-import { EntitiesSearchFilter, EntityFilter } from '../../database';
+import { EntitiesSearchFilter, EntityFilter } from '../../catalog';
 import { parseStringsParam } from './common';

 /**
@@ -15,7 +15,7 @@
 */

 import { InputError } from '@backstage/errors';
-import { EntityPagination } from '../../database';
+import { EntityPagination } from '../../catalog';
 import { parseIntegerParam, parseStringParam } from './common';

 /**
@@ -22,7 +22,7 @@ import {
 } from '@backstage/backend-common';
 import { Server } from 'http';
 import { Logger } from 'winston';
-import { DatabaseManager } from '../database';
+import { DatabaseManager } from '../legacy/database';
 import { CatalogBuilder } from '../legacy/service/CatalogBuilder';
 import { createRouter } from '../legacy/service';