From 89f596bb4a671659492e6c796c60292badd23709 Mon Sep 17 00:00:00 2001
From: Alec Jacobs <cajacobs5401@gmail.com>
Date: Fri, 3 Jun 2022 09:50:33 -0700
Subject: [PATCH] feat(plugins/pagerduty): refactor PagerDutyClient.fromConfig
 to accept second argument of ClientApiDependencies

Signed-off-by: Alec Jacobs <cajacobs5401@gmail.com>
---
 plugins/pagerduty/src/api/client.ts | 12 ++++--------
 plugins/pagerduty/src/plugin.ts     |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/pagerduty/src/api/client.ts b/plugins/pagerduty/src/api/client.ts
index 8ab0bcdc31..9bfd6a5594 100644
--- a/plugins/pagerduty/src/api/client.ts
+++ b/plugins/pagerduty/src/api/client.ts
@@ -22,16 +22,12 @@ import {
   ServiceResponse,
   IncidentsResponse,
   OnCallsResponse,
+  ClientApiDependencies,
   ClientApiConfig,
   RequestOptions,
   ChangeEventsResponse,
 } from './types';
-import {
-  createApiRef,
-  DiscoveryApi,
-  ConfigApi,
-  FetchApi,
-} from '@backstage/core-plugin-api';
+import { createApiRef, ConfigApi } from '@backstage/core-plugin-api';
 import { NotFoundError } from '@backstage/errors';
 
 export class UnauthorizedError extends Error {}
@@ -46,12 +42,12 @@ const commonGetServiceParams =
 export class PagerDutyClient implements PagerDutyApi {
   static fromConfig(
     configApi: ConfigApi,
-    discoveryApi: DiscoveryApi,
-    fetchApi: FetchApi,
+    { discoveryApi, fetchApi }: ClientApiDependencies,
   ) {
     const eventsBaseUrl: string =
       configApi.getOptionalString('pagerDuty.eventsBaseUrl') ??
       'https://events.pagerduty.com/v2';
+
     return new PagerDutyClient({
       eventsBaseUrl,
       discoveryApi,
diff --git a/plugins/pagerduty/src/plugin.ts b/plugins/pagerduty/src/plugin.ts
index 3baa36a50e..d49de29416 100644
--- a/plugins/pagerduty/src/plugin.ts
+++ b/plugins/pagerduty/src/plugin.ts
@@ -39,7 +39,7 @@ export const pagerDutyPlugin = createPlugin({
         fetchApi: fetchApiRef,
       },
       factory: ({ configApi, discoveryApi, fetchApi }) =>
-        PagerDutyClient.fromConfig(configApi, discoveryApi, fetchApi),
+        PagerDutyClient.fromConfig(configApi, { discoveryApi, fetchApi }),
     }),
   ],
 });