From 2ad15d5f8244f2f861a02297b73d5f508ba426cd Mon Sep 17 00:00:00 2001 From: sblausten Date: Mon, 29 May 2023 12:30:00 +0200 Subject: [PATCH] Changes Signed-off-by: sblausten --- .changeset/sweet-fans-juggle.md | 3 +-- packages/backend/package.json | 1 - plugins/catalog-backend/src/catalog/types.ts | 2 +- yarn.lock | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.changeset/sweet-fans-juggle.md b/.changeset/sweet-fans-juggle.md index af299e9cac..72df182886 100644 --- a/.changeset/sweet-fans-juggle.md +++ b/.changeset/sweet-fans-juggle.md @@ -1,6 +1,5 @@ --- -'@backstage/plugin-catalog-backend': patch -'@backstage/plugin-events-backend': patch +'@backstage/plugin-catalog-backend': minor --- Adds an optional `EventBroker` that is used for sending an event when there are conflicts, with details of the conflict so that it can be handled elsewhere. diff --git a/packages/backend/package.json b/packages/backend/package.json index 61b01a57a0..b5a82fd611 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -40,7 +40,6 @@ "@backstage/plugin-azure-sites-backend": "workspace:^", "@backstage/plugin-badges-backend": "workspace:^", "@backstage/plugin-catalog-backend": "workspace:^", - "@backstage/plugin-catalog-backend-module-github": "workspace:^", "@backstage/plugin-catalog-node": "workspace:^", "@backstage/plugin-code-coverage-backend": "workspace:^", "@backstage/plugin-devtools-backend": "workspace:^", diff --git a/plugins/catalog-backend/src/catalog/types.ts b/plugins/catalog-backend/src/catalog/types.ts index 76841af260..45a3ff6144 100644 --- a/plugins/catalog-backend/src/catalog/types.ts +++ b/plugins/catalog-backend/src/catalog/types.ts @@ -317,7 +317,7 @@ export type Cursor = { */ export type CatalogConflictEventPayload = { /** - * The new conflicting entity + * The new conflicting entity in raw, unvalidated form */ entity: Entity; /** diff --git a/yarn.lock b/yarn.lock index f9f870ce77..e2b0dabbde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5385,7 +5385,7 @@ __metadata: languageName: unknown linkType: soft -"@backstage/plugin-catalog-backend-module-github@workspace:^, @backstage/plugin-catalog-backend-module-github@workspace:plugins/catalog-backend-module-github": +"@backstage/plugin-catalog-backend-module-github@workspace:plugins/catalog-backend-module-github": version: 0.0.0-use.local resolution: "@backstage/plugin-catalog-backend-module-github@workspace:plugins/catalog-backend-module-github" dependencies: @@ -23951,7 +23951,6 @@ __metadata: "@backstage/plugin-azure-sites-backend": "workspace:^" "@backstage/plugin-badges-backend": "workspace:^" "@backstage/plugin-catalog-backend": "workspace:^" - "@backstage/plugin-catalog-backend-module-github": "workspace:^" "@backstage/plugin-catalog-node": "workspace:^" "@backstage/plugin-code-coverage-backend": "workspace:^" "@backstage/plugin-devtools-backend": "workspace:^"