diff --git a/.changeset/remove-deprecated-catalog-node-alpha-exports.md b/.changeset/remove-deprecated-catalog-node-alpha-exports.md new file mode 100644 index 0000000000..31af97ca34 --- /dev/null +++ b/.changeset/remove-deprecated-catalog-node-alpha-exports.md @@ -0,0 +1,10 @@ +--- +'@backstage/plugin-catalog-node': minor +--- + +**BREAKING ALPHA**: Removed the following deprecated exports from `@backstage/plugin-catalog-node/alpha`: + +- `catalogServiceRef` — use `catalogServiceRef` from `@backstage/plugin-catalog-node` instead +- `CatalogLocationsExtensionPoint` / `catalogLocationsExtensionPoint` — use the non-alpha equivalents from `@backstage/plugin-catalog-node` instead +- `CatalogProcessingExtensionPoint` / `catalogProcessingExtensionPoint` — use the non-alpha equivalents from `@backstage/plugin-catalog-node` instead +- `CatalogAnalysisExtensionPoint` / `catalogAnalysisExtensionPoint` — use the non-alpha equivalents from `@backstage/plugin-catalog-node` instead diff --git a/plugins/catalog-node/report-alpha.api.md b/plugins/catalog-node/report-alpha.api.md index 78922b1141..5f82e164b7 100644 --- a/plugins/catalog-node/report-alpha.api.md +++ b/plugins/catalog-node/report-alpha.api.md @@ -3,10 +3,6 @@ > 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 { CatalogLocationsExtensionPoint as CatalogLocationsExtensionPoint_2 } from '@backstage/plugin-catalog-node'; -import { CatalogProcessingExtensionPoint as CatalogProcessingExtensionPoint_2 } from '@backstage/plugin-catalog-node'; import { CatalogProcessorParser } from '@backstage/plugin-catalog-node'; import { EntitiesSearchFilter } from '@backstage/plugin-catalog-node'; import { Entity } from '@backstage/catalog-model'; @@ -15,12 +11,6 @@ import { PermissionResourceRef } from '@backstage/plugin-permission-node'; import { ServiceRef } from '@backstage/backend-plugin-api'; import { Validators } from '@backstage/catalog-model'; -// @alpha @deprecated (undocumented) -export type CatalogAnalysisExtensionPoint = CatalogAnalysisExtensionPoint_2; - -// @alpha @deprecated (undocumented) -export const catalogAnalysisExtensionPoint: ExtensionPoint; - // @alpha (undocumented) export const catalogEntityPermissionResourceRef: PermissionResourceRef< Entity, @@ -29,12 +19,6 @@ export const catalogEntityPermissionResourceRef: PermissionResourceRef< 'catalog' >; -// @alpha @deprecated (undocumented) -export type CatalogLocationsExtensionPoint = CatalogLocationsExtensionPoint_2; - -// @alpha @deprecated (undocumented) -export const catalogLocationsExtensionPoint: ExtensionPoint; - // @alpha (undocumented) export interface CatalogModelExtensionPoint { setEntityDataParser(parser: CatalogProcessorParser): void; @@ -44,12 +28,6 @@ export interface CatalogModelExtensionPoint { // @alpha (undocumented) export const catalogModelExtensionPoint: ExtensionPoint; -// @alpha @deprecated (undocumented) -export type CatalogProcessingExtensionPoint = CatalogProcessingExtensionPoint_2; - -// @alpha @deprecated (undocumented) -export const catalogProcessingExtensionPoint: ExtensionPoint; - // @alpha export type CatalogScmEvent = | { @@ -121,8 +99,5 @@ export interface CatalogScmEventsServiceSubscriber { onEvents: (events: CatalogScmEvent[]) => Promise; } -// @alpha @deprecated (undocumented) -export const catalogServiceRef: ServiceRef; - // (No @packageDocumentation comment for this package) ``` diff --git a/plugins/catalog-node/src/alpha.ts b/plugins/catalog-node/src/alpha.ts index 3c835fcd97..9e35abf4d9 100644 --- a/plugins/catalog-node/src/alpha.ts +++ b/plugins/catalog-node/src/alpha.ts @@ -14,13 +14,6 @@ * limitations under the License. */ -import { - coreServices, - createServiceFactory, - createServiceRef, -} from '@backstage/backend-plugin-api'; -import { catalogServiceRef as _catalogServiceRef } from './catalogService'; -import { CatalogApi, CatalogClient } from '@backstage/catalog-client'; import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common/alpha'; import { createPermissionResourceRef } from '@backstage/plugin-permission-node'; import { Entity } from '@backstage/catalog-model'; @@ -35,69 +28,6 @@ export const catalogEntityPermissionResourceRef = createPermissionResourceRef< resourceType: RESOURCE_TYPE_CATALOG_ENTITY, }); -/** - * @alpha - * @deprecated Use {@link @backstage/plugin-catalog-node#catalogServiceRef} instead - */ -export const catalogServiceRef = createServiceRef({ - id: 'catalog-client-legacy', - defaultFactory: async service => - createServiceFactory({ - service, - deps: { - discoveryApi: coreServices.discovery, - }, - async factory({ discoveryApi }) { - return new CatalogClient({ discoveryApi }); - }, - }), -}); - -import { - CatalogLocationsExtensionPoint as _CatalogLocationsExtensionPoint, - CatalogProcessingExtensionPoint as _CatalogProcessingExtensionPoint, - CatalogAnalysisExtensionPoint as _CatalogAnalysisExtensionPoint, - catalogLocationsExtensionPoint as _catalogLocationsExtensionPoint, - catalogProcessingExtensionPoint as _catalogProcessingExtensionPoint, - catalogAnalysisExtensionPoint as _catalogAnalysisExtensionPoint, -} 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; - export type { CatalogModelExtensionPoint } from './extensions'; export { catalogModelExtensionPoint } from './extensions';