diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts index 91d3fa0ecc..c65dadafae 100644 --- a/plugins/catalog-backend/src/service/CatalogPlugin.ts +++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts @@ -34,7 +34,6 @@ import { } from '@backstage/plugin-catalog-node'; import { loggerToWinstonLogger } from '@backstage/backend-common'; import { PlaceholderResolver } from '../modules'; -import { defaultEntityDataParser } from '../modules/util/parse'; class CatalogProcessingExtensionPointImpl implements CatalogProcessingExtensionPoint @@ -42,7 +41,7 @@ class CatalogProcessingExtensionPointImpl #processors = new Array(); #entityProviders = new Array(); #placeholderResolvers: Record = {}; - entityDataParser?: CatalogProcessorParser; + #entityDataParser?: CatalogProcessorParser; addProcessor( ...processors: Array> @@ -65,12 +64,12 @@ class CatalogProcessingExtensionPointImpl } setEntityDataParser(parser: CatalogProcessorParser): void { - if (this.entityDataParser) { + if (this.#entityDataParser) { throw new Error( 'Attempted to install second EntityDataParser. Only one can be set.', ); } - this.entityDataParser = parser; + this.#entityDataParser = parser; } get processors() { @@ -84,6 +83,10 @@ class CatalogProcessingExtensionPointImpl get placeholderResolvers() { return this.#placeholderResolvers; } + + get entityDataParser() { + return this.#entityDataParser; + } } class CatalogAnalysisExtensionPointImpl @@ -176,9 +179,10 @@ export const catalogPlugin = createBackendPlugin({ }); builder.addProcessor(...processingExtensions.processors); builder.addEntityProvider(...processingExtensions.entityProviders); - builder.setEntityDataParser( - processingExtensions.entityDataParser ?? defaultEntityDataParser, - ); + + if (processingExtensions.entityDataParser) { + builder.setEntityDataParser(processingExtensions.entityDataParser); + } Object.entries(processingExtensions.placeholderResolvers).forEach( ([key, resolver]) => builder.setPlaceholderResolver(key, resolver),