linkerd - Removed usages and references of @backstage/backend-common (

#1965) * linkerd - Removed usages and references of `@backstage/backend-common` Signed-off-by: Andre Wanlin <[email protected]> * Added error middleware Signed-off-by: Andre Wanlin <[email protected]> --------- Signed-off-by: Andre Wanlin <[email protected]>
backstage · Nov 18, 2024 · 0555e21 · 0555e21
1 parent 179ee02
commit 0555e21
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/workspaces/linkerd/.changeset/calm-forks-join.md b/workspaces/linkerd/.changeset/calm-forks-join.md
@@ -0,0 +1,5 @@
+---
+'@backstage-community/plugin-linkerd-backend': patch
+---
+
+Removed usages and references of `@backstage/backend-common`
diff --git a/workspaces/linkerd/packages/backend/knip-report.md b/workspaces/linkerd/packages/backend/knip-report.md
@@ -9,7 +9,6 @@
 | @backstage/plugin-permission-common                   | package.json | error    |
 | @backstage/plugin-permission-node                     | package.json | error    |
 | @backstage/plugin-auth-node                           | package.json | error    |
-| @backstage/backend-common                             | package.json | error    |
 | @backstage/backend-tasks                              | package.json | error    |
 | @backstage/config                                     | package.json | error    |
 | better-sqlite3                                        | package.json | error    |

diff --git a/workspaces/linkerd/packages/backend/package.json b/workspaces/linkerd/packages/backend/package.json
@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@backstage-community/plugin-linkerd-backend": "workspace:^",
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-defaults": "^0.5.2",
     "@backstage/backend-tasks": "^0.6.1",
     "@backstage/config": "^1.2.0",

diff --git a/workspaces/linkerd/plugins/linkerd-backend/package.json b/workspaces/linkerd/plugins/linkerd-backend/package.json
@@ -32,7 +32,6 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-defaults": "^0.5.2",
     "@backstage/backend-plugin-api": "^1.0.1",
     "@backstage/config": "^1.2.0",

diff --git a/workspaces/linkerd/plugins/linkerd-backend/src/service/router.ts b/workspaces/linkerd/plugins/linkerd-backend/src/service/router.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { errorHandler } from '@backstage/backend-common';
+
 import {
   AuthService,
   DiscoveryService,
@@ -24,6 +24,7 @@ import {
 import express from 'express';
 import Router from 'express-promise-router';
 import { LinkerdVizClient } from '../lib/linkerdVizClient';
+import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
 
 export interface RouterOptions {
   logger: LoggerService;
@@ -36,7 +37,7 @@ export interface RouterOptions {
 export async function createRouter(
   opts: RouterOptions,
 ): Promise<express.Router> {
-  const { discovery, auth, httpAuth, config } = opts;
+  const { discovery, auth, httpAuth, config, logger } = opts;
 
   const linkerdVizClient = LinkerdVizClient.fromConfig({
     discovery,
@@ -98,6 +99,6 @@ export async function createRouter(
     },
   );
 
-  router.use(errorHandler());
+  router.use(MiddlewareFactory.create({ config, logger }).error());
   return router;
 }
diff --git a/workspaces/linkerd/yarn.lock b/workspaces/linkerd/yarn.lock
@@ -2861,7 +2861,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage-community/plugin-linkerd-backend@workspace:plugins/linkerd-backend"
   dependencies:
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": ^0.5.2
     "@backstage/backend-plugin-api": ^1.0.1
     "@backstage/backend-test-utils": ^1.0.2
@@ -14342,7 +14341,6 @@ __metadata:
   resolution: "backend@workspace:packages/backend"
   dependencies:
     "@backstage-community/plugin-linkerd-backend": "workspace:^"
-    "@backstage/backend-common": ^0.25.0
     "@backstage/backend-defaults": ^0.5.2
     "@backstage/backend-tasks": ^0.6.1
     "@backstage/cli": ^0.28.0