From 40b9ef23b9bc99ddc06148ae59d26697c02e2a5f Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Mon, 26 Aug 2024 12:21:07 +0200
Subject: [PATCH] refactor: apply review suggestions

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 plugins/techdocs-backend/api-report.md              | 2 +-
 plugins/techdocs-backend/package.json               | 1 -
 plugins/techdocs-backend/src/service/router.test.ts | 9 ++-------
 plugins/techdocs-backend/src/service/router.ts      | 6 ++++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md
index b993a87e07..a73647c40a 100644
--- a/plugins/techdocs-backend/api-report.md
+++ b/plugins/techdocs-backend/api-report.md
@@ -17,7 +17,7 @@ import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { Knex } from 'knex';
 import { Logger } from 'winston';
 import { Permission } from '@backstage/plugin-permission-common';
-import { PluginCacheManager } from '@backstage/backend-defaults/cache';
+import { PluginCacheManager } from '@backstage/backend-common';
 import { PreparerBuilder } from '@backstage/plugin-techdocs-node';
 import { PublisherBase } from '@backstage/plugin-techdocs-node';
 import type { TechDocsCollatorFactoryOptions as TechDocsCollatorFactoryOptions_2 } from '@backstage/plugin-search-backend-module-techdocs';
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 7d93128ded..f1312f1e05 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -59,7 +59,6 @@
   },
   "dependencies": {
     "@backstage/backend-common": "workspace:^",
-    "@backstage/backend-defaults": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/plugins/techdocs-backend/src/service/router.test.ts b/plugins/techdocs-backend/src/service/router.test.ts
index 3f50ef5788..5b5fc52741 100644
--- a/plugins/techdocs-backend/src/service/router.test.ts
+++ b/plugins/techdocs-backend/src/service/router.test.ts
@@ -28,10 +28,9 @@ import { DocsSynchronizer, DocsSynchronizerSyncOpts } from './DocsSynchronizer';
 import { CachedEntityLoader } from './CachedEntityLoader';
 import { createEventStream, createRouter, RouterOptions } from './router';
 import { TechDocsCache } from '../cache';
-import { mockServices } from '@backstage/backend-test-utils';
+import { mockErrorHandler, mockServices } from '@backstage/backend-test-utils';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { PluginCacheManager } from '@backstage/backend-defaults/cache';
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
 
 jest.mock('@backstage/catalog-client');
 jest.mock('@backstage/config');
@@ -74,11 +73,7 @@ const getMockHttpResponseFor = (content: string): Buffer => {
 const createApp = async (options: RouterOptions) => {
   const app = express();
   app.use(await createRouter(options));
-  const errorHandler = MiddlewareFactory.create({
-    config: mockServices.rootConfig(),
-    logger: mockServices.rootLogger(),
-  }).error();
-  app.use(errorHandler);
+  app.use(mockErrorHandler());
   return app;
 };
 
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index 0085ddcc5c..0123ee89f2 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createLegacyAuthAdapters } from '@backstage/backend-common';
+import {
+  createLegacyAuthAdapters,
+  PluginCacheManager,
+} from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
@@ -39,7 +42,6 @@ import {
   DiscoveryService,
   HttpAuthService,
 } from '@backstage/backend-plugin-api';
-import { PluginCacheManager } from '@backstage/backend-defaults/cache';
 
 /**
  * Required dependencies for running TechDocs in the "out-of-the-box"