From 71c0954ab417cd91cd1ab5e811410c7ddc28c75a Mon Sep 17 00:00:00 2001
From: David Lilienfeld <davidlilienfeld4@gmail.com>
Date: Mon, 26 Aug 2024 14:04:46 -0400
Subject: [PATCH] Remove tokenmanager from module

Signed-off-by: David Lilienfeld <davidlilienfeld4@gmail.com>
---
 ...atalogModuleBitbucketServerEntityProvider.test.ts |  2 +-
 .../catalogModuleBitbucketServerEntityProvider.ts    | 12 +-----------
 .../api-report-alpha.md                              |  4 ++--
 .../eventsModuleBitbucketServerRouter.test.ts        |  5 +----
 4 files changed, 5 insertions(+), 18 deletions(-)

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 4ae6ff3aae..f9345170ed 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
@@ -56,7 +56,7 @@ describe('catalogModuleBitbucketServerEntityProvider', () => {
         [catalogProcessingExtensionPoint, catalogExtensionPointImpl],
       ],
       features: [
-        eventsServiceFactory(),
+        eventsServiceFactory,
         catalogModuleBitbucketServerEntityProvider,
         mockServices.rootConfig.factory({
           data: {
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 615bbb3477..a829428296 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts
@@ -40,23 +40,13 @@ export const catalogModuleBitbucketServerEntityProvider = createBackendModule({
         events: eventsServiceRef,
         logger: coreServices.logger,
         scheduler: coreServices.scheduler,
-        tokenManager: coreServices.tokenManager,
       },
-      async init({
-        catalog,
-        catalogApi,
-        config,
-        events,
-        logger,
-        scheduler,
-        tokenManager,
-      }) {
+      async init({ catalog, catalogApi, config, events, logger, scheduler }) {
         const providers = BitbucketServerEntityProvider.fromConfig(config, {
           catalogApi,
           events,
           logger,
           scheduler,
-          tokenManager,
         });
 
         catalog.addEntityProvider(providers);
diff --git a/plugins/events-backend-module-bitbucket-server/api-report-alpha.md b/plugins/events-backend-module-bitbucket-server/api-report-alpha.md
index 2eb8fc6075..3c4ce45a1f 100644
--- a/plugins/events-backend-module-bitbucket-server/api-report-alpha.md
+++ b/plugins/events-backend-module-bitbucket-server/api-report-alpha.md
@@ -3,10 +3,10 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { BackendFeatureCompat } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-const eventsModuleBitbucketServerEventRouter: BackendFeatureCompat;
+const eventsModuleBitbucketServerEventRouter: BackendFeature;
 export default eventsModuleBitbucketServerEventRouter;
 export { eventsModuleBitbucketServerEventRouter };
 
diff --git a/plugins/events-backend-module-bitbucket-server/src/service/eventsModuleBitbucketServerRouter.test.ts b/plugins/events-backend-module-bitbucket-server/src/service/eventsModuleBitbucketServerRouter.test.ts
index 56e158b8ab..a66c000089 100644
--- a/plugins/events-backend-module-bitbucket-server/src/service/eventsModuleBitbucketServerRouter.test.ts
+++ b/plugins/events-backend-module-bitbucket-server/src/service/eventsModuleBitbucketServerRouter.test.ts
@@ -32,10 +32,7 @@ describe('eventsModuleBitbucketServerEventRouter', () => {
     });
 
     await startTestBackend({
-      features: [
-        eventsServiceFactory(),
-        eventsModuleBitbucketServerEventRouter(),
-      ],
+      features: [eventsServiceFactory, eventsModuleBitbucketServerEventRouter],
     });
 
     expect(events.subscribed).toHaveLength(1);