From e04dcef5a0f903fdf0b439918845ecea1a53e439 Mon Sep 17 00:00:00 2001 From: Damon Kaswell Date: Tue, 10 Jan 2023 08:54:07 -0800 Subject: [PATCH 1/2] Do not try to commit empty array of entity records Signed-off-by: Damon Kaswell --- .../IncrementalIngestionDatabaseManager.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 9eb52c4558..e837f2b259 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts @@ -577,13 +577,15 @@ export class IncrementalIngestionDatabaseManager { .update('ingestion_mark_id', markId) .whereIn('ref', existingRefsArray); - await tx('ingestion_mark_entities').insert( - newRefs.map(ref => ({ - id: v4(), - ingestion_mark_id: markId, - ref, - })), - ); + if (newRefs.length > 0) { + await tx('ingestion_mark_entities').insert( + newRefs.map(ref => ({ + id: v4(), + ingestion_mark_id: markId, + ref, + })), + ); + } }); } From 045b66ce02169c8eb099e23190c41d53f0a90e1c Mon Sep 17 00:00:00 2001 From: Damon Kaswell Date: Tue, 10 Jan 2023 09:01:24 -0800 Subject: [PATCH 2/2] Add changeset Signed-off-by: Damon Kaswell --- .changeset/six-crabs-sell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/six-crabs-sell.md diff --git a/.changeset/six-crabs-sell.md b/.changeset/six-crabs-sell.md new file mode 100644 index 0000000000..59c527d921 --- /dev/null +++ b/.changeset/six-crabs-sell.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch +--- + +Fixed issue with sometimes trying to commit an empty array of references