From cfd8103e63ac4fe8581424fe0f11e8e042e8759d Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 27 Jan 2026 00:24:44 +0100 Subject: [PATCH] catalog-node: promote extension points Signed-off-by: Patrik Oldsberg --- ...catalog-modules-update-extension-points.md | 23 ++++++ ...catalog-node-extension-points-to-stable.md | 14 ++++ .../cli-template-catalog-node-stable.md | 5 ++ contrib/catalog/ImmediateEntityProvider.ts | 2 +- .../building-backends/08-migrating.md | 2 +- .../extending-the-model--old.md | 2 +- .../software-catalog/extending-the-model.md | 4 +- .../software-catalog/external-integrations.md | 6 +- docs/integrations/gitlab/org.md | 2 +- docs/permissions/custom-rules.md | 2 +- docs/releases/v1.23.0-changelog.md | 4 +- docs/releases/v1.24.0.md | 2 +- .../catalog-provider-module/src/module.ts.hbs | 2 +- .../catalogModuleAwsS3EntityProvider.test.ts | 2 +- .../catalogModuleAwsS3EntityProvider.ts | 2 +- ...logModuleAzureDevOpsEntityProvider.test.ts | 2 +- .../catalogModuleAzureDevOpsEntityProvider.ts | 2 +- .../src/index.ts | 2 +- ...ModuleBitbucketCloudEntityProvider.test.ts | 2 +- ...talogModuleBitbucketCloudEntityProvider.ts | 2 +- ...oduleBitbucketServerEntityProvider.test.ts | 2 +- ...alogModuleBitbucketServerEntityProvider.ts | 2 +- .../catalogModuleGcpGkeEntityProvider.ts | 2 +- .../catalogModuleGerritEntityProvider.test.ts | 2 +- .../catalogModuleGerritEntityProvider.ts | 2 +- .../src/module.test.ts | 2 +- .../src/module.ts | 2 +- .../src/module.test.ts | 2 +- .../src/module.ts | 2 +- .../src/module/githubCatalogModule.test.ts | 2 +- .../src/module/githubCatalogModule.ts | 2 +- ...leGitlabOrgDiscoveryEntityProvider.test.ts | 2 +- ...gModuleGitlabOrgDiscoveryEntityProvider.ts | 2 +- ...oduleGitlabDiscoveryEntityProvider.test.ts | 2 +- ...alogModuleGitlabDiscoveryEntityProvider.ts | 2 +- ...IncrementalIngestionEntityProvider.test.ts | 2 +- ...oduleIncrementalIngestionEntityProvider.ts | 2 +- .../catalog-backend-module-ldap/src/module.ts | 2 +- ...uleMicrosoftGraphOrgEntityProvider.test.ts | 2 +- ...ogModuleMicrosoftGraphOrgEntityProvider.ts | 2 +- ...leJsonSchemaRefPlaceholderResolver.test.ts | 2 +- ...gModuleJsonSchemaRefPlaceholderResolver.ts | 2 +- ...atalogModulePuppetDbEntityProvider.test.ts | 2 +- .../catalogModulePuppetDbEntityProvider.ts | 2 +- .../src/module.test.ts | 2 +- .../src/module.ts | 2 +- .../src/service/CatalogPlugin.ts | 4 +- .../getEntitiesPerformance.test.ts | 2 +- .../performance/stitchingPerformance.test.ts | 2 +- plugins/catalog-node/report-alpha.api.md | 72 ++++++------------- plugins/catalog-node/report.api.md | 63 ++++++++++++++++ plugins/catalog-node/src/alpha.ts | 67 ++++++++++++++--- plugins/catalog-node/src/extensions.ts | 16 ++--- plugins/catalog-node/src/index.ts | 12 ++++ 54 files changed, 256 insertions(+), 118 deletions(-) create mode 100644 .changeset/catalog-modules-update-extension-points.md create mode 100644 .changeset/catalog-node-extension-points-to-stable.md create mode 100644 .changeset/cli-template-catalog-node-stable.md diff --git a/.changeset/catalog-modules-update-extension-points.md b/.changeset/catalog-modules-update-extension-points.md new file mode 100644 index 0000000000..dba229482f --- /dev/null +++ b/.changeset/catalog-modules-update-extension-points.md @@ -0,0 +1,23 @@ +--- +'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-catalog-backend-module-aws': patch +'@backstage/plugin-catalog-backend-module-azure': patch +'@backstage/plugin-catalog-backend-module-backstage-openapi': patch +'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch +'@backstage/plugin-catalog-backend-module-bitbucket-server': patch +'@backstage/plugin-catalog-backend-module-gcp': patch +'@backstage/plugin-catalog-backend-module-gerrit': patch +'@backstage/plugin-catalog-backend-module-gitea': patch +'@backstage/plugin-catalog-backend-module-github': patch +'@backstage/plugin-catalog-backend-module-github-org': patch +'@backstage/plugin-catalog-backend-module-gitlab': patch +'@backstage/plugin-catalog-backend-module-gitlab-org': patch +'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch +'@backstage/plugin-catalog-backend-module-ldap': patch +'@backstage/plugin-catalog-backend-module-msgraph': patch +'@backstage/plugin-catalog-backend-module-openapi': patch +'@backstage/plugin-catalog-backend-module-puppetdb': patch +'@backstage/plugin-catalog-backend-module-scaffolder-entity-model': patch +--- + +Updated imports to use stable catalog extension points from `@backstage/plugin-catalog-node` instead of the deprecated alpha exports. diff --git a/.changeset/catalog-node-extension-points-to-stable.md b/.changeset/catalog-node-extension-points-to-stable.md new file mode 100644 index 0000000000..b901007053 --- /dev/null +++ b/.changeset/catalog-node-extension-points-to-stable.md @@ -0,0 +1,14 @@ +--- +'@backstage/plugin-catalog-node': minor +--- + +Promoted stable catalog extension points from alpha to main export. The following extension points are now exported from `@backstage/plugin-catalog-node` instead of `@backstage/plugin-catalog-node/alpha`: + +- `catalogLocationsExtensionPoint` and `CatalogLocationsExtensionPoint` +- `catalogProcessingExtensionPoint` and `CatalogProcessingExtensionPoint` +- `catalogAnalysisExtensionPoint` and `CatalogAnalysisExtensionPoint` +- `catalogModelExtensionPoint` and `CatalogModelExtensionPoint` + +The old alpha exports for these extension points are now deprecated with `@deprecated` markers pointing to the new stable exports. Please update your imports from `@backstage/plugin-catalog-node/alpha` to `@backstage/plugin-catalog-node`. + +Note: The `catalogPermissionExtensionPoint`, `CatalogPermissionExtensionPoint`, and `CatalogPermissionRuleInput` remain in alpha as they are deprecated in favor of `coreServices.permissionsRegistry`. diff --git a/.changeset/cli-template-catalog-node-stable.md b/.changeset/cli-template-catalog-node-stable.md new file mode 100644 index 0000000000..77b06dc8f1 --- /dev/null +++ b/.changeset/cli-template-catalog-node-stable.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Updated catalog provider module template to use stable catalog extension points from `@backstage/plugin-catalog-node` instead of alpha exports. diff --git a/contrib/catalog/ImmediateEntityProvider.ts b/contrib/catalog/ImmediateEntityProvider.ts index 9f9f986567..ba17f19c9d 100644 --- a/contrib/catalog/ImmediateEntityProvider.ts +++ b/contrib/catalog/ImmediateEntityProvider.ts @@ -16,7 +16,7 @@ import { EntityProviderConnection, } from '@backstage/plugin-catalog-node'; import { parseEntityYaml } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import bodyParser from 'body-parser'; import express from 'express'; import Router from 'express-promise-router'; diff --git a/docs/backend-system/building-backends/08-migrating.md b/docs/backend-system/building-backends/08-migrating.md index a638516165..3a6cf1baee 100644 --- a/docs/backend-system/building-backends/08-migrating.md +++ b/docs/backend-system/building-backends/08-migrating.md @@ -660,7 +660,7 @@ depends on the appropriate extension point and interacts with it. ```ts title="packages/backend/src/index.ts" /* highlight-add-start */ -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { createBackendModule } from '@backstage/backend-plugin-api'; /* highlight-add-end */ diff --git a/docs/features/software-catalog/extending-the-model--old.md b/docs/features/software-catalog/extending-the-model--old.md index c39561d11b..c5f301c694 100644 --- a/docs/features/software-catalog/extending-the-model--old.md +++ b/docs/features/software-catalog/extending-the-model--old.md @@ -166,7 +166,7 @@ This is an example of relaxing the format rules of the `metadata.name` field: ```ts import { createBackend } from '@backstage/backend-defaults'; import { createBackendModule } from '@backstage/backend-plugin-api'; -import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node'; const myCatalogCustomizations = createBackendModule({ pluginId: 'catalog', diff --git a/docs/features/software-catalog/extending-the-model.md b/docs/features/software-catalog/extending-the-model.md index 7300f4f969..1737d42d5a 100644 --- a/docs/features/software-catalog/extending-the-model.md +++ b/docs/features/software-catalog/extending-the-model.md @@ -166,7 +166,7 @@ This is an example of relaxing the format rules of the `metadata.name` field: ```ts import { createBackend } from '@backstage/backend-defaults'; import { createBackendModule } from '@backstage/backend-plugin-api'; -import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node'; const myCatalogCustomizations = createBackendModule({ pluginId: 'catalog', @@ -596,7 +596,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; /* highlight-add-next-line */ import { FoobarEntitiesProcessor } from './providers'; diff --git a/docs/features/software-catalog/external-integrations.md b/docs/features/software-catalog/external-integrations.md index 298c686bea..68ca746e4f 100644 --- a/docs/features/software-catalog/external-integrations.md +++ b/docs/features/software-catalog/external-integrations.md @@ -294,7 +294,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { FrobsProvider } from './path/to/class'; export const catalogModuleFrobsProvider = createBackendModule({ @@ -737,7 +737,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { SystemXReaderProcessor } from '../path/to/class'; export const catalogModuleSystemXReaderProcessor = createBackendModule({ @@ -998,7 +998,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogModelExtensionPoint } from '@backstage/plugin-catalog-node'; import { customEntityDataParser } from '../lib/customEntityDataParser'; export const catalogModuleCustomDataParser = createBackendModule({ diff --git a/docs/integrations/gitlab/org.md b/docs/integrations/gitlab/org.md index 2908bb7c09..bddd1c13a1 100644 --- a/docs/integrations/gitlab/org.md +++ b/docs/integrations/gitlab/org.md @@ -285,7 +285,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { GitlabOrgDiscoveryEntityProvider, diff --git a/docs/permissions/custom-rules.md b/docs/permissions/custom-rules.md index d90f36e59d..cab9e73a6f 100644 --- a/docs/permissions/custom-rules.md +++ b/docs/permissions/custom-rules.md @@ -158,7 +158,7 @@ To install custom rules in a plugin, we need to use the [`PermissionsRegistrySer ```typescript title="packages/backend/src/modules/catalogPermissionRules.ts" import { createBackendModule } from '@backstage/backend-plugin-api'; - import { catalogPermissionExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; + import { catalogPermissionExtensionPoint } from '@backstage/plugin-catalog-node'; import { isInSystemRule } from './permissionsPolicyExtension'; export default createBackendModule({ diff --git a/docs/releases/v1.23.0-changelog.md b/docs/releases/v1.23.0-changelog.md index ef87a5955a..73dcebf2c2 100644 --- a/docs/releases/v1.23.0-changelog.md +++ b/docs/releases/v1.23.0-changelog.md @@ -663,7 +663,7 @@ import { catalogProcessingExtensionPoint, catalogModelExtensionPoint, - } from '@backstage/plugin-catalog-node/alpha'; + } from '@backstage/plugin-catalog-node'; import {myPolicy} from './my-policy'; export const catalogModulePolicyProvider = createBackendModule({ @@ -814,7 +814,7 @@ import { catalogProcessingExtensionPoint, catalogModelExtensionPoint, - } from '@backstage/plugin-catalog-node/alpha'; + } from '@backstage/plugin-catalog-node'; import {myPolicy} from './my-policy'; export const catalogModulePolicyProvider = createBackendModule({ diff --git a/docs/releases/v1.24.0.md b/docs/releases/v1.24.0.md index 7bb8b174e1..497eb181e2 100644 --- a/docs/releases/v1.24.0.md +++ b/docs/releases/v1.24.0.md @@ -58,7 +58,7 @@ We encourage you to migrate existing tests to use this new utility, in order to ### New backend plugin extension points -The `catalogModelExtensionPoint` from `@backstage/plugin-catalog-node/alpha` can now be used to replace the default entity data parser and field validation rules in the new backend system. +The `catalogModelExtensionPoint` from `@backstage/plugin-catalog-node` can now be used to replace the default entity data parser and field validation rules in the new backend system. The `techdocsGeneratorExtensionPoint` from `@backstage/plugin-techdocs-node` can now be used to set a custom TechDocs generator. diff --git a/packages/cli/templates/catalog-provider-module/src/module.ts.hbs b/packages/cli/templates/catalog-provider-module/src/module.ts.hbs index d84e876b5d..cc5a0a5e14 100644 --- a/packages/cli/templates/catalog-provider-module/src/module.ts.hbs +++ b/packages/cli/templates/catalog-provider-module/src/module.ts.hbs @@ -2,7 +2,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { {{providerClass}} } from './provider/{{providerClass}}'; export const {{moduleVar}} = createBackendModule({ diff --git a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts index b8a4256092..14994e559c 100644 --- a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts +++ b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleAwsS3EntityProvider } from './catalogModuleAwsS3EntityProvider'; import { AwsS3EntityProvider } from '../providers'; diff --git a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts index 2c99f2a44a..4779caff36 100644 --- a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts +++ b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { AwsS3EntityProvider } from '../providers'; /** diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts index 9c5d1baef7..bd0f5d991b 100644 --- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts +++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleAzureEntityProvider } from './catalogModuleAzureDevOpsEntityProvider'; import { AzureBlobStorageEntityProvider, diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts index cc808292f3..fff597c165 100644 --- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts +++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { AzureBlobStorageEntityProvider, AzureDevOpsEntityProvider, diff --git a/plugins/catalog-backend-module-backstage-openapi/src/index.ts b/plugins/catalog-backend-module-backstage-openapi/src/index.ts index 16810a9cfa..9e39680066 100644 --- a/plugins/catalog-backend-module-backstage-openapi/src/index.ts +++ b/plugins/catalog-backend-module-backstage-openapi/src/index.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { InternalOpenApiDocumentationProvider } from './InternalOpenApiDocumentationProvider'; /** diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts index 12c747d090..50fa5796ac 100644 --- a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts +++ b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts @@ -20,7 +20,7 @@ import { } from '@backstage/backend-plugin-api'; import { startTestBackend, mockServices } from '@backstage/backend-test-utils'; import { EntityProviderConnection } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { catalogModuleBitbucketCloudEntityProvider } from './catalogModuleBitbucketCloudEntityProvider'; diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts index 3ff6556d40..7cd839bb63 100644 --- a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts +++ b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogServiceRef } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { BitbucketCloudEntityProvider } from '../providers/BitbucketCloudEntityProvider'; diff --git a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts index f9345170ed..fa75c6bdf9 100644 --- a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts +++ b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts @@ -18,7 +18,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugi import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; import { createServiceFactory } from '@backstage/backend-plugin-api'; import { EntityProviderConnection } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { catalogModuleBitbucketServerEntityProvider } from './catalogModuleBitbucketServerEntityProvider'; diff --git a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts index d66ef4e2a2..bf897fa8e0 100644 --- a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts +++ b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts @@ -19,7 +19,7 @@ import { createBackendModule, } from '@backstage/backend-plugin-api'; import { catalogServiceRef } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { BitbucketServerEntityProvider } from '../providers/BitbucketServerEntityProvider'; diff --git a/plugins/catalog-backend-module-gcp/src/module/catalogModuleGcpGkeEntityProvider.ts b/plugins/catalog-backend-module-gcp/src/module/catalogModuleGcpGkeEntityProvider.ts index 03359139d5..8cf437b847 100644 --- a/plugins/catalog-backend-module-gcp/src/module/catalogModuleGcpGkeEntityProvider.ts +++ b/plugins/catalog-backend-module-gcp/src/module/catalogModuleGcpGkeEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GkeEntityProvider } from '../providers/GkeEntityProvider'; /** diff --git a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts index 503b2a41d0..c4585bb09b 100644 --- a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts +++ b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleGerritEntityProvider } from './catalogModuleGerritEntityProvider'; import { GerritEntityProvider } from '../providers/GerritEntityProvider'; diff --git a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts index a1aaac7b5c..1504eba4c1 100644 --- a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts +++ b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GerritEntityProvider } from '../providers/GerritEntityProvider'; /** diff --git a/plugins/catalog-backend-module-gitea/src/module.test.ts b/plugins/catalog-backend-module-gitea/src/module.test.ts index 0ce2d4319a..aac1144336 100644 --- a/plugins/catalog-backend-module-gitea/src/module.test.ts +++ b/plugins/catalog-backend-module-gitea/src/module.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleGitea } from './module'; import { GiteaEntityProvider } from './providers/GiteaEntityProvider'; diff --git a/plugins/catalog-backend-module-gitea/src/module.ts b/plugins/catalog-backend-module-gitea/src/module.ts index 91e019c6fb..ec473a0b21 100644 --- a/plugins/catalog-backend-module-gitea/src/module.ts +++ b/plugins/catalog-backend-module-gitea/src/module.ts @@ -17,7 +17,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GiteaEntityProvider } from './providers/GiteaEntityProvider'; /** diff --git a/plugins/catalog-backend-module-github-org/src/module.test.ts b/plugins/catalog-backend-module-github-org/src/module.test.ts index 1fcff306fe..9079997a5d 100644 --- a/plugins/catalog-backend-module-github-org/src/module.test.ts +++ b/plugins/catalog-backend-module-github-org/src/module.test.ts @@ -17,7 +17,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; import { EntityProvider } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleGithubOrgEntityProvider } from './module'; describe('catalogModuleGithubOrgEntityProvider', () => { diff --git a/plugins/catalog-backend-module-github-org/src/module.ts b/plugins/catalog-backend-module-github-org/src/module.ts index 26abede133..137bd84ef7 100644 --- a/plugins/catalog-backend-module-github-org/src/module.ts +++ b/plugins/catalog-backend-module-github-org/src/module.ts @@ -27,7 +27,7 @@ import { TeamTransformer, UserTransformer, } from '@backstage/plugin-catalog-backend-module-github'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { GithubOrgEntityCleanerProvider } from './GithubOrgEntityCleanerProvider'; diff --git a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.test.ts b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.test.ts index 3509823819..ae4ad95a14 100644 --- a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.test.ts +++ b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.test.ts @@ -20,7 +20,7 @@ import { EntityProvider } from '@backstage/plugin-catalog-node'; import { catalogAnalysisExtensionPoint, catalogProcessingExtensionPoint, -} from '@backstage/plugin-catalog-node/alpha'; +} from '@backstage/plugin-catalog-node'; import { githubCatalogModule } from './githubCatalogModule'; import { GithubLocationAnalyzer } from '../analyzers/GithubLocationAnalyzer'; diff --git a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts index 4ae5adbb31..d09b2c2066 100644 --- a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts +++ b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts @@ -21,7 +21,7 @@ import { import { catalogAnalysisExtensionPoint, catalogProcessingExtensionPoint, -} from '@backstage/plugin-catalog-node/alpha'; +} from '@backstage/plugin-catalog-node'; import { catalogServiceRef } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { GithubEntityProvider } from '../providers/GithubEntityProvider'; diff --git a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.test.ts index 107de6b7b3..b4fecc8cb1 100644 --- a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.test.ts +++ b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.test.ts @@ -21,7 +21,7 @@ import { import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; import { GitlabOrgDiscoveryEntityProvider } from '@backstage/plugin-catalog-backend-module-gitlab'; import { EntityProviderConnection } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { catalogModuleGitlabOrgDiscoveryEntityProvider } from './catalogModuleGitlabOrgDiscoveryEntityProvider'; diff --git a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts index e175ce50fb..ef7444b747 100644 --- a/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts +++ b/plugins/catalog-backend-module-gitlab-org/src/catalogModuleGitlabOrgDiscoveryEntityProvider.ts @@ -24,7 +24,7 @@ import { UserTransformer, GroupTransformer, } from '@backstage/plugin-catalog-backend-module-gitlab'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; /** diff --git a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts index 7c9fc068a0..b99fc6e2da 100644 --- a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts +++ b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts @@ -20,7 +20,7 @@ import { } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; import { EntityProviderConnection } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { TestEventsService } from '@backstage/plugin-events-backend-test-utils'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { GitlabDiscoveryEntityProvider } from '../providers'; diff --git a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts index bbcbae0763..4f9626a130 100644 --- a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts +++ b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { GitlabDiscoveryEntityProvider } from '../providers'; diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts index e35b671634..3b8df0305a 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts @@ -16,7 +16,7 @@ import { createBackendModule } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { IncrementalEntityProvider } from '../types'; import { catalogModuleIncrementalIngestionEntityProvider, diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts index 8c18f09798..7366f66ca7 100644 --- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts +++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts @@ -19,7 +19,7 @@ import { createBackendModule, createExtensionPoint, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { WrapperProviders } from './WrapperProviders'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { diff --git a/plugins/catalog-backend-module-ldap/src/module.ts b/plugins/catalog-backend-module-ldap/src/module.ts index dd47bf48da..9f579146fc 100644 --- a/plugins/catalog-backend-module-ldap/src/module.ts +++ b/plugins/catalog-backend-module-ldap/src/module.ts @@ -19,7 +19,7 @@ import { createBackendModule, createExtensionPoint, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { LdapOrgEntityProvider } from './processors'; import { GroupTransformer, UserTransformer } from './ldap/types'; diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts index 9f4c616c09..32fe75935e 100644 --- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts +++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleMicrosoftGraphOrgEntityProvider } from './catalogModuleMicrosoftGraphOrgEntityProvider'; import { MicrosoftGraphOrgEntityProvider } from '../processors'; diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts index a11748f021..573b2a405a 100644 --- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts +++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts @@ -19,7 +19,7 @@ import { createBackendModule, createExtensionPoint, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { GroupTransformer, OrganizationTransformer, diff --git a/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.test.ts b/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.test.ts index 6de50af048..25c42d41d8 100644 --- a/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.test.ts +++ b/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.test.ts @@ -16,7 +16,7 @@ import { startTestBackend } from '@backstage/backend-test-utils'; import { PlaceholderResolver } from '@backstage/plugin-catalog-node'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModuleJsonSchemaRefPlaceholderResolver } from './catalogModuleJsonSchemaRefPlaceholderResolver'; import { jsonSchemaRefPlaceholderResolver } from '../jsonSchemaRefPlaceholderResolver'; diff --git a/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.ts b/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.ts index 053951866a..934e905cf8 100644 --- a/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.ts +++ b/plugins/catalog-backend-module-openapi/src/module/catalogModuleJsonSchemaRefPlaceholderResolver.ts @@ -15,7 +15,7 @@ */ import { createBackendModule } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { jsonSchemaRefPlaceholderResolver } from '../jsonSchemaRefPlaceholderResolver'; /** diff --git a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts index 68f8b08a3b..50cc3d9b55 100644 --- a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts +++ b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.test.ts @@ -16,7 +16,7 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api'; import { mockServices, startTestBackend } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { catalogModulePuppetDbEntityProvider } from './catalogModulePuppetDbEntityProvider'; import { PuppetDbEntityProvider } from '../providers/PuppetDbEntityProvider'; diff --git a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.ts b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.ts index 1ab95c90d8..5b3706d470 100644 --- a/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.ts +++ b/plugins/catalog-backend-module-puppetdb/src/module/catalogModulePuppetDbEntityProvider.ts @@ -18,7 +18,7 @@ import { coreServices, createBackendModule, } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { PuppetDbEntityProvider } from '../providers/PuppetDbEntityProvider'; /** diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/src/module.test.ts b/plugins/catalog-backend-module-scaffolder-entity-model/src/module.test.ts index 3b0a41a8f9..0ad4582b37 100644 --- a/plugins/catalog-backend-module-scaffolder-entity-model/src/module.test.ts +++ b/plugins/catalog-backend-module-scaffolder-entity-model/src/module.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { ScaffolderEntitiesProcessor } from './processor'; import { catalogModuleScaffolderEntityModel } from './module'; import { startTestBackend } from '@backstage/backend-test-utils'; diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/src/module.ts b/plugins/catalog-backend-module-scaffolder-entity-model/src/module.ts index c11bc7f7d2..a76fa14b34 100644 --- a/plugins/catalog-backend-module-scaffolder-entity-model/src/module.ts +++ b/plugins/catalog-backend-module-scaffolder-entity-model/src/module.ts @@ -15,7 +15,7 @@ */ import { createBackendModule } from '@backstage/backend-plugin-api'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { ScaffolderEntitiesProcessor } from './processor'; /** diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts index 311897780d..54b87470ef 100644 --- a/plugins/catalog-backend/src/service/CatalogPlugin.ts +++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts @@ -33,10 +33,12 @@ import { catalogLocationsExtensionPoint, CatalogModelExtensionPoint, catalogModelExtensionPoint, + catalogProcessingExtensionPoint, +} from '@backstage/plugin-catalog-node'; +import { CatalogPermissionExtensionPoint, catalogPermissionExtensionPoint, CatalogPermissionRuleInput, - catalogProcessingExtensionPoint, } from '@backstage/plugin-catalog-node/alpha'; import { eventsServiceRef } from '@backstage/plugin-events-node'; import { Permission } from '@backstage/plugin-permission-common'; diff --git a/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts index d7e94e5d5b..be0105e47a 100644 --- a/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts +++ b/plugins/catalog-backend/src/tests/performance/getEntitiesPerformance.test.ts @@ -25,7 +25,7 @@ import { CatalogClient, GetEntitiesResponse, } from '@backstage/catalog-client'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { Knex } from 'knex'; import { default as catalogPlugin } from '../..'; import { diff --git a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts index 50e6f8c2a6..6ac16f28f3 100644 --- a/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts +++ b/plugins/catalog-backend/src/tests/performance/stitchingPerformance.test.ts @@ -20,7 +20,7 @@ import { mockServices, startTestBackend, } from '@backstage/backend-test-utils'; -import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha'; +import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node'; import { createDeferred } from '@backstage/types'; import { Knex } from 'knex'; import { default as catalogPlugin } from '../..'; diff --git a/plugins/catalog-node/report-alpha.api.md b/plugins/catalog-node/report-alpha.api.md index 660b18521a..6027204fe5 100644 --- a/plugins/catalog-node/report-alpha.api.md +++ b/plugins/catalog-node/report-alpha.api.md @@ -3,37 +3,25 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts +import { CatalogAnalysisExtensionPoint as CatalogAnalysisExtensionPoint_2 } from '@backstage/plugin-catalog-node'; import { CatalogApi } from '@backstage/catalog-client'; -import { CatalogProcessor } from '@backstage/plugin-catalog-node'; -import { CatalogProcessorParser } from '@backstage/plugin-catalog-node'; +import { CatalogLocationsExtensionPoint as CatalogLocationsExtensionPoint_2 } from '@backstage/plugin-catalog-node'; +import { CatalogModelExtensionPoint as CatalogModelExtensionPoint_2 } from '@backstage/plugin-catalog-node'; +import { CatalogProcessingExtensionPoint as CatalogProcessingExtensionPoint_2 } from '@backstage/plugin-catalog-node'; import { EntitiesSearchFilter } from '@backstage/plugin-catalog-node'; import { Entity } from '@backstage/catalog-model'; -import { EntityProvider } from '@backstage/plugin-catalog-node'; import { ExtensionPoint } from '@backstage/backend-plugin-api'; -import { LocationAnalyzer } from '@backstage/plugin-catalog-node'; import { Permission } from '@backstage/plugin-permission-common'; import { PermissionResourceRef } from '@backstage/plugin-permission-node'; import { PermissionRule } from '@backstage/plugin-permission-node'; import { PermissionRuleParams } from '@backstage/plugin-permission-common'; -import { PlaceholderResolver } from '@backstage/plugin-catalog-node'; -import { ScmLocationAnalyzer } from '@backstage/plugin-catalog-node'; import { ServiceRef } from '@backstage/backend-plugin-api'; -import { Validators } from '@backstage/catalog-model'; -// @alpha (undocumented) -export interface CatalogAnalysisExtensionPoint { - addScmLocationAnalyzer(analyzer: ScmLocationAnalyzer): void; - setLocationAnalyzer( - analyzerOrFactory: - | LocationAnalyzer - | ((options: { scmLocationAnalyzers: ScmLocationAnalyzer[] }) => Promise<{ - locationAnalyzer: LocationAnalyzer; - }>), - ): void; -} +// @alpha @deprecated (undocumented) +export type CatalogAnalysisExtensionPoint = CatalogAnalysisExtensionPoint_2; -// @alpha (undocumented) -export const catalogAnalysisExtensionPoint: ExtensionPoint; +// @alpha @deprecated (undocumented) +export const catalogAnalysisExtensionPoint: ExtensionPoint; // @alpha (undocumented) export const catalogEntityPermissionResourceRef: PermissionResourceRef< @@ -43,22 +31,17 @@ export const catalogEntityPermissionResourceRef: PermissionResourceRef< 'catalog' >; -// @alpha (undocumented) -export interface CatalogLocationsExtensionPoint { - setAllowedLocationTypes(locationTypes: Array): void; -} +// @alpha @deprecated (undocumented) +export type CatalogLocationsExtensionPoint = CatalogLocationsExtensionPoint_2; -// @alpha (undocumented) -export const catalogLocationsExtensionPoint: ExtensionPoint; +// @alpha @deprecated (undocumented) +export const catalogLocationsExtensionPoint: ExtensionPoint; -// @alpha (undocumented) -export interface CatalogModelExtensionPoint { - setEntityDataParser(parser: CatalogProcessorParser): void; - setFieldValidators(validators: Partial): void; -} +// @alpha @deprecated (undocumented) +export type CatalogModelExtensionPoint = CatalogModelExtensionPoint_2; -// @alpha (undocumented) -export const catalogModelExtensionPoint: ExtensionPoint; +// @alpha @deprecated (undocumented) +export const catalogModelExtensionPoint: ExtensionPoint; // @alpha @deprecated (undocumented) export interface CatalogPermissionExtensionPoint { @@ -80,26 +63,11 @@ export type CatalogPermissionRuleInput< TParams extends PermissionRuleParams = PermissionRuleParams, > = PermissionRule; -// @alpha (undocumented) -export interface CatalogProcessingExtensionPoint { - addEntityProvider( - ...providers: Array> - ): void; - addPlaceholderResolver(key: string, resolver: PlaceholderResolver): void; - addProcessor( - ...processors: Array> - ): void; - // (undocumented) - setOnProcessingErrorHandler( - handler: (event: { - unprocessedEntity: Entity; - errors: Error[]; - }) => Promise | void, - ): void; -} +// @alpha @deprecated (undocumented) +export type CatalogProcessingExtensionPoint = CatalogProcessingExtensionPoint_2; -// @alpha (undocumented) -export const catalogProcessingExtensionPoint: ExtensionPoint; +// @alpha @deprecated (undocumented) +export const catalogProcessingExtensionPoint: ExtensionPoint; // @alpha @deprecated (undocumented) export const catalogServiceRef: ServiceRef; diff --git a/plugins/catalog-node/report.api.md b/plugins/catalog-node/report.api.md index d544bc6757..68040c2e61 100644 --- a/plugins/catalog-node/report.api.md +++ b/plugins/catalog-node/report.api.md @@ -9,8 +9,12 @@ import { AnalyzeLocationExistingEntity } from '@backstage/plugin-catalog-common' import { AnalyzeLocationRequest } from '@backstage/plugin-catalog-common'; import { AnalyzeLocationResponse } from '@backstage/plugin-catalog-common'; import { BackstageCredentials } from '@backstage/backend-plugin-api'; +import { CatalogProcessor as CatalogProcessor_2 } from '@backstage/plugin-catalog-node'; +import { CatalogProcessorParser as CatalogProcessorParser_2 } from '@backstage/plugin-catalog-node'; import { CompoundEntityRef } from '@backstage/catalog-model'; import { Entity } from '@backstage/catalog-model'; +import { EntityProvider as EntityProvider_2 } from '@backstage/plugin-catalog-node'; +import { ExtensionPoint } from '@backstage/backend-plugin-api'; import { GetEntitiesByRefsRequest } from '@backstage/catalog-client'; import { GetEntitiesByRefsResponse } from '@backstage/catalog-client'; import { GetEntitiesRequest } from '@backstage/catalog-client'; @@ -22,13 +26,17 @@ import { GetEntityFacetsResponse } from '@backstage/catalog-client'; import { GetLocationsResponse } from '@backstage/catalog-client'; import { JsonValue } from '@backstage/types'; import { Location as Location_2 } from '@backstage/catalog-client'; +import { LocationAnalyzer as LocationAnalyzer_2 } from '@backstage/plugin-catalog-node'; import { LocationEntityV1alpha1 } from '@backstage/catalog-model'; import { LocationSpec as LocationSpec_2 } from '@backstage/plugin-catalog-common'; +import { PlaceholderResolver as PlaceholderResolver_2 } from '@backstage/plugin-catalog-node'; import { QueryEntitiesRequest } from '@backstage/catalog-client'; import { QueryEntitiesResponse } from '@backstage/catalog-client'; +import { ScmLocationAnalyzer as ScmLocationAnalyzer_2 } from '@backstage/plugin-catalog-node'; import { ServiceRef } from '@backstage/backend-plugin-api'; import { StreamEntitiesRequest } from '@backstage/catalog-client'; import { ValidateEntityResponse } from '@backstage/catalog-client'; +import { Validators } from '@backstage/catalog-model'; // @public (undocumented) export type AnalyzeOptions = { @@ -36,6 +44,61 @@ export type AnalyzeOptions = { catalogFilename?: string; }; +// @public (undocumented) +export interface CatalogAnalysisExtensionPoint { + addScmLocationAnalyzer(analyzer: ScmLocationAnalyzer_2): void; + setLocationAnalyzer( + analyzerOrFactory: + | LocationAnalyzer_2 + | ((options: { + scmLocationAnalyzers: ScmLocationAnalyzer_2[]; + }) => Promise<{ + locationAnalyzer: LocationAnalyzer_2; + }>), + ): void; +} + +// @public (undocumented) +export const catalogAnalysisExtensionPoint: ExtensionPoint; + +// @public (undocumented) +export interface CatalogLocationsExtensionPoint { + setAllowedLocationTypes(locationTypes: Array): void; +} + +// @public (undocumented) +export const catalogLocationsExtensionPoint: ExtensionPoint; + +// @public (undocumented) +export interface CatalogModelExtensionPoint { + setEntityDataParser(parser: CatalogProcessorParser_2): void; + setFieldValidators(validators: Partial): void; +} + +// @public (undocumented) +export const catalogModelExtensionPoint: ExtensionPoint; + +// @public (undocumented) +export interface CatalogProcessingExtensionPoint { + addEntityProvider( + ...providers: Array> + ): void; + addPlaceholderResolver(key: string, resolver: PlaceholderResolver_2): void; + addProcessor( + ...processors: Array> + ): void; + // (undocumented) + setOnProcessingErrorHandler( + handler: (event: { + unprocessedEntity: Entity; + errors: Error[]; + }) => Promise | void, + ): void; +} + +// @public (undocumented) +export const catalogProcessingExtensionPoint: ExtensionPoint; + // @public (undocumented) export type CatalogProcessor = { getProcessorName(): string; diff --git a/plugins/catalog-node/src/alpha.ts b/plugins/catalog-node/src/alpha.ts index 71bf7bfca7..5041d74fdb 100644 --- a/plugins/catalog-node/src/alpha.ts +++ b/plugins/catalog-node/src/alpha.ts @@ -53,14 +53,65 @@ export const catalogServiceRef = createServiceRef({ }), }); -export type { CatalogLocationsExtensionPoint } from './extensions'; -export { catalogLocationsExtensionPoint } from './extensions'; -export type { CatalogProcessingExtensionPoint } from './extensions'; -export { catalogProcessingExtensionPoint } from './extensions'; -export type { CatalogAnalysisExtensionPoint } from './extensions'; -export { catalogAnalysisExtensionPoint } from './extensions'; +import { + CatalogLocationsExtensionPoint as _CatalogLocationsExtensionPoint, + CatalogProcessingExtensionPoint as _CatalogProcessingExtensionPoint, + CatalogAnalysisExtensionPoint as _CatalogAnalysisExtensionPoint, + CatalogModelExtensionPoint as _CatalogModelExtensionPoint, + catalogLocationsExtensionPoint as _catalogLocationsExtensionPoint, + catalogProcessingExtensionPoint as _catalogProcessingExtensionPoint, + catalogAnalysisExtensionPoint as _catalogAnalysisExtensionPoint, + catalogModelExtensionPoint as _catalogModelExtensionPoint, +} from '@backstage/plugin-catalog-node'; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#CatalogLocationsExtensionPoint} instead + */ +export type CatalogLocationsExtensionPoint = _CatalogLocationsExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#catalogLocationsExtensionPoint} instead + */ +export const catalogLocationsExtensionPoint = _catalogLocationsExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#CatalogProcessingExtensionPoint} instead + */ +export type CatalogProcessingExtensionPoint = _CatalogProcessingExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#catalogProcessingExtensionPoint} instead + */ +export const catalogProcessingExtensionPoint = _catalogProcessingExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#CatalogAnalysisExtensionPoint} instead + */ +export type CatalogAnalysisExtensionPoint = _CatalogAnalysisExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#catalogAnalysisExtensionPoint} instead + */ +export const catalogAnalysisExtensionPoint = _catalogAnalysisExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#CatalogModelExtensionPoint} instead + */ +export type CatalogModelExtensionPoint = _CatalogModelExtensionPoint; + +/** + * @alpha + * @deprecated Use {@link @backstage/plugin-catalog-node#catalogModelExtensionPoint} instead + */ +export const catalogModelExtensionPoint = _catalogModelExtensionPoint; + export type { CatalogPermissionRuleInput } from './extensions'; export type { CatalogPermissionExtensionPoint } from './extensions'; export { catalogPermissionExtensionPoint } from './extensions'; -export type { CatalogModelExtensionPoint } from './extensions'; -export { catalogModelExtensionPoint } from './extensions'; diff --git a/plugins/catalog-node/src/extensions.ts b/plugins/catalog-node/src/extensions.ts index ad11000339..9d5002ccd1 100644 --- a/plugins/catalog-node/src/extensions.ts +++ b/plugins/catalog-node/src/extensions.ts @@ -32,7 +32,7 @@ import { import { PermissionRule } from '@backstage/plugin-permission-node'; /** - * @alpha + * @public */ export interface CatalogLocationsExtensionPoint { /** @@ -43,7 +43,7 @@ export interface CatalogLocationsExtensionPoint { } /** - * @alpha + * @public */ export const catalogLocationsExtensionPoint = createExtensionPoint({ @@ -51,7 +51,7 @@ export const catalogLocationsExtensionPoint = }); /** - * @alpha + * @public */ export interface CatalogProcessingExtensionPoint { /** @@ -97,7 +97,7 @@ export interface CatalogProcessingExtensionPoint { ): void; } -/** @alpha */ +/** @public */ export interface CatalogModelExtensionPoint { /** * Sets the validator function to use for one or more special fields of an @@ -116,7 +116,7 @@ export interface CatalogModelExtensionPoint { } /** - * @alpha + * @public */ export const catalogProcessingExtensionPoint = createExtensionPoint({ @@ -124,7 +124,7 @@ export const catalogProcessingExtensionPoint = }); /** - * @alpha + * @public */ export interface CatalogAnalysisExtensionPoint { /** @@ -151,14 +151,14 @@ export interface CatalogAnalysisExtensionPoint { } /** - * @alpha + * @public */ export const catalogAnalysisExtensionPoint = createExtensionPoint({ id: 'catalog.analysis', }); -/** @alpha */ +/** @public */ export const catalogModelExtensionPoint = createExtensionPoint({ id: 'catalog.model', diff --git a/plugins/catalog-node/src/index.ts b/plugins/catalog-node/src/index.ts index 9a95b708ba..33464607d2 100644 --- a/plugins/catalog-node/src/index.ts +++ b/plugins/catalog-node/src/index.ts @@ -28,3 +28,15 @@ export { type CatalogService, type CatalogServiceRequestOptions, } from './catalogService'; +export type { + CatalogLocationsExtensionPoint, + CatalogProcessingExtensionPoint, + CatalogAnalysisExtensionPoint, + CatalogModelExtensionPoint, +} from './extensions'; +export { + catalogLocationsExtensionPoint, + catalogProcessingExtensionPoint, + catalogAnalysisExtensionPoint, + catalogModelExtensionPoint, +} from './extensions';