From c94ed08d16cc10a1fb8e47ef2c3665688b1a1512 Mon Sep 17 00:00:00 2001 From: lshwayne96 Date: Thu, 16 Nov 2023 13:27:16 +0800 Subject: [PATCH] Define CatalogPermissionRuleInput type in catalog-node plugin Signed-off-by: lshwayne96 --- plugins/catalog-node/package.json | 2 ++ plugins/catalog-node/src/extensions.ts | 12 +++++++++++- yarn.lock | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json index f76fde6ecf..85ca35831c 100644 --- a/plugins/catalog-node/package.json +++ b/plugins/catalog-node/package.json @@ -47,6 +47,8 @@ "@backstage/catalog-model": "workspace:^", "@backstage/errors": "workspace:^", "@backstage/plugin-catalog-common": "workspace:^", + "@backstage/plugin-permission-common": "workspace:^", + "@backstage/plugin-permission-node": "workspace:^", "@backstage/types": "workspace:^" }, "devDependencies": { diff --git a/plugins/catalog-node/src/extensions.ts b/plugins/catalog-node/src/extensions.ts index 02a18774cd..6516653150 100644 --- a/plugins/catalog-node/src/extensions.ts +++ b/plugins/catalog-node/src/extensions.ts @@ -14,7 +14,9 @@ * limitations under the License. */ import { createExtensionPoint } from '@backstage/backend-plugin-api'; -import { CatalogPermissionRuleInput } from '@backstage/plugin-catalog-backend'; +import { Entity } from '@backstage/catalog-model'; +import { PermissionRuleParams } from '@backstage/plugin-permission-common'; +import { PermissionRule } from '@backstage/plugin-permission-node'; import { EntityProvider, CatalogProcessor, @@ -22,6 +24,14 @@ import { ScmLocationAnalyzer, } from '@backstage/plugin-catalog-node'; +type EntitiesSearchFilter = { + key: string; + values?: string[]; +}; +type CatalogPermissionRuleInput< + TParams extends PermissionRuleParams = PermissionRuleParams, +> = PermissionRule; + /** * @alpha */ diff --git a/yarn.lock b/yarn.lock index 19ca7d4edc..35345de358 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5940,6 +5940,8 @@ __metadata: "@backstage/cli": "workspace:^" "@backstage/errors": "workspace:^" "@backstage/plugin-catalog-common": "workspace:^" + "@backstage/plugin-permission-common": "workspace:^" + "@backstage/plugin-permission-node": "workspace:^" "@backstage/types": "workspace:^" languageName: unknown linkType: soft