From d99fd04856df4c5e16b359639c2111504e2127e3 Mon Sep 17 00:00:00 2001 From: Damon Kaswell Date: Wed, 30 Nov 2022 08:22:23 -0800 Subject: [PATCH] Use refs for removed entities Signed-off-by: Damon Kaswell --- .../IncrementalIngestionDatabaseManager.ts | 15 +++------------ .../src/engine/IncrementalIngestionEngine.ts | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts b/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts index 5cd8fce0be..c9299ec7d9 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts @@ -16,7 +16,7 @@ import { Knex } from 'knex'; import type { DeferredEntity } from '@backstage/plugin-catalog-backend'; -import { parseEntityRef, stringifyEntityRef } from '@backstage/catalog-model'; +import { stringifyEntityRef } from '@backstage/catalog-model'; import { Duration } from 'luxon'; import { v4 } from 'uuid'; import { @@ -312,17 +312,8 @@ export class IncrementalIngestionDatabaseManager { .join('ingestions', 'ingestions.id', 'ingestion_marks.ingestion_id') .where('ingestions.id', previousIngestion.id); - const removed: DeferredEntity[] = rows.map(e => { - const parsed = parseEntityRef(e.ref); - const entity = { - apiVersion: 'backstage.io/v1alpha1', - kind: parsed.kind, - metadata: { - name: parsed.name, - namespace: parsed.namespace, - }, - }; - return { entity }; + const removed: { entityRef: string }[] = rows.map(e => { + return { entityRef: e.ref }; }); const total = rows.length ?? 0; return { removed, total }; diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts index 5d82a29b5f..65deb92ad1 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts @@ -271,7 +271,7 @@ export class IncrementalIngestionEngine implements IterationEngine { }, })) ?? []; - const removed: DeferredEntity[] = []; + const removed: { entityRef: string }[] = []; if (done) { this.options.logger.info(