From 2d783af0ba84774598c2aa0ae3e3d7d76ed0ae29 Mon Sep 17 00:00:00 2001
From: Jonathan Roebuck <jroebuck@spotify.com>
Date: Wed, 12 Jul 2023 09:55:59 +0100
Subject: [PATCH] use catalogServiceRef from plugin-catalog-node for
 catalogClient

Signed-off-by: Jonathan Roebuck <jroebuck@spotify.com>
---
 plugins/lighthouse-backend/package.json                   | 1 +
 plugins/lighthouse-backend/src/plugin.ts                  | 8 ++++----
 plugins/lighthouse-backend/src/service/createScheduler.ts | 7 ++-----
 yarn.lock                                                 | 1 +
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/lighthouse-backend/package.json b/plugins/lighthouse-backend/package.json
index c6995da164..07e24f2984 100644
--- a/plugins/lighthouse-backend/package.json
+++ b/plugins/lighthouse-backend/package.json
@@ -44,6 +44,7 @@
     "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
+    "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-lighthouse-common": "workspace:^",
     "@backstage/types": "workspace:^",
     "winston": "^3.2.1"
diff --git a/plugins/lighthouse-backend/src/plugin.ts b/plugins/lighthouse-backend/src/plugin.ts
index 7ce332127e..fd75cf048a 100644
--- a/plugins/lighthouse-backend/src/plugin.ts
+++ b/plugins/lighthouse-backend/src/plugin.ts
@@ -19,7 +19,8 @@ import {
   createBackendPlugin,
   coreServices,
 } from '@backstage/backend-plugin-api';
-import { CatalogClient } from '@backstage/catalog-client';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node';
+
 import { createScheduler } from './service/createScheduler';
 
 /**
@@ -32,15 +33,14 @@ export const lighthousePlugin = createBackendPlugin({
   register(env) {
     env.registerInit({
       deps: {
+        catalogClient: catalogServiceRef,
         config: coreServices.config,
-        discovery: coreServices.discovery,
         logger: coreServices.logger,
         scheduler: coreServices.scheduler,
         tokenManager: coreServices.tokenManager,
       },
-      async init({ config, discovery, logger, scheduler, tokenManager }) {
+      async init({ catalogClient, config, logger, scheduler, tokenManager }) {
         const winstonLogger = loggerToWinstonLogger(logger);
-        const catalogClient = new CatalogClient({ discoveryApi: discovery });
 
         await createScheduler({
           catalogClient,
diff --git a/plugins/lighthouse-backend/src/service/createScheduler.ts b/plugins/lighthouse-backend/src/service/createScheduler.ts
index 089f20f4ed..498e459a09 100644
--- a/plugins/lighthouse-backend/src/service/createScheduler.ts
+++ b/plugins/lighthouse-backend/src/service/createScheduler.ts
@@ -16,10 +16,7 @@
 
 import { Logger } from 'winston';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import {
-  CATALOG_FILTER_EXISTS,
-  CatalogClient,
-} from '@backstage/catalog-client';
+import { CATALOG_FILTER_EXISTS, CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { LighthouseRestApi } from '@backstage/plugin-lighthouse-common';
 import { stringifyEntityRef } from '@backstage/catalog-model';
@@ -31,7 +28,7 @@ export interface CreateLighthouseSchedulerOptions {
   logger: Logger;
   config: Config;
   scheduler?: PluginTaskScheduler;
-  catalogClient: CatalogClient;
+  catalogClient: CatalogApi;
   tokenManager: TokenManager;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 6583ba3325..42dad513bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7694,6 +7694,7 @@ __metadata:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
+    "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/plugin-lighthouse-common": "workspace:^"
     "@backstage/types": "workspace:^"
     winston: ^3.2.1