diff --git a/.changeset/tricky-emus-wave.md b/.changeset/tricky-emus-wave.md index 45099d5fb2..69512381f3 100644 --- a/.changeset/tricky-emus-wave.md +++ b/.changeset/tricky-emus-wave.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-catalog-backend': minor +'@backstage/plugin-catalog-backend': patch --- Add Bitbucket Server discovery processor. diff --git a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts index 15e51b6f9f..6c13a40770 100644 --- a/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/BitbucketDiscoveryProcessor.ts @@ -63,7 +63,6 @@ export class BitbucketDiscoveryProcessor implements CatalogProcessor { const client = new BitbucketClient({ config: bitbucketConfig, - logger: this.logger, }); const startTimestamp = Date.now(); this.logger.info(`Reading Bitbucket repositories from ${location.target}`); diff --git a/plugins/catalog-backend/src/ingestion/processors/bitbucket/client.ts b/plugins/catalog-backend/src/ingestion/processors/bitbucket/client.ts index 4eb70cf3ff..b03dcd02bf 100644 --- a/plugins/catalog-backend/src/ingestion/processors/bitbucket/client.ts +++ b/plugins/catalog-backend/src/ingestion/processors/bitbucket/client.ts @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Logger } from 'winston'; import fetch from 'cross-fetch'; import { @@ -23,11 +22,9 @@ import { export class BitbucketClient { private readonly config: BitbucketIntegrationConfig; - private readonly logger: Logger; - constructor(options: { config: BitbucketIntegrationConfig; logger: Logger }) { + constructor(options: { config: BitbucketIntegrationConfig }) { this.config = options.config; - this.logger = options.logger; } async listProjects(options?: ListOptions): Promise> { diff --git a/plugins/catalog-backend/src/ingestion/processors/index.ts b/plugins/catalog-backend/src/ingestion/processors/index.ts index fe4fe1c1dd..8aedc8889b 100644 --- a/plugins/catalog-backend/src/ingestion/processors/index.ts +++ b/plugins/catalog-backend/src/ingestion/processors/index.ts @@ -19,6 +19,7 @@ import * as results from './results'; export { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor'; export { AnnotateScmSlugEntityProcessor } from './AnnotateScmSlugEntityProcessor'; export { AwsOrganizationCloudAccountProcessor } from './AwsOrganizationCloudAccountProcessor'; +export { BitbucketDiscoveryProcessor } from './BitbucketDiscoveryProcessor'; export { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor'; export { CodeOwnersProcessor } from './CodeOwnersProcessor'; export { FileReaderProcessor } from './FileReaderProcessor'; diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts index e0b447c686..b8d8b3ee61 100644 --- a/plugins/catalog-backend/src/service/CatalogBuilder.ts +++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts @@ -38,6 +38,7 @@ import { import { DatabaseManager } from '../database'; import { AnnotateLocationEntityProcessor, + BitbucketDiscoveryProcessor, BuiltinKindsEntityProcessor, CatalogProcessor, CatalogProcessorParser, @@ -304,6 +305,7 @@ export class CatalogBuilder { if (!this.processorsReplace) { processors.push( new FileReaderProcessor(), + BitbucketDiscoveryProcessor.fromConfig(config, { logger }), GithubDiscoveryProcessor.fromConfig(config, { logger }), GithubOrgReaderProcessor.fromConfig(config, { logger }), LdapOrgReaderProcessor.fromConfig(config, { logger }),