fix build

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

plugins/catalog-import/api-report.md

@@ -13,8 +13,8 @@ import { ConfigApi } from '@backstage/core-plugin-api';
 import { Controller } from 'react-hook-form';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { FetchApi } from '@backstage/core-plugin-api';
 import { FieldErrors } from 'react-hook-form';
-import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
 import { JSX as JSX_2 } from 'react';
 import { default as React_2 } from 'react';
@@ -102,7 +102,7 @@ export class CatalogImportClient implements CatalogImportApi {
   constructor(options: {
     discoveryApi: DiscoveryApi;
     scmAuthApi: ScmAuthApi;
-    identityApi: IdentityApi;
+    fetchApi: FetchApi;
     scmIntegrationsApi: ScmIntegrationRegistry;
     catalogApi: CatalogApi;
     configApi: ConfigApi;

plugins/catalog-import/src/alpha.tsx

@@ -18,7 +18,7 @@ import {
   configApiRef,
   createApiFactory,
   discoveryApiRef,
-  identityApiRef,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 import {
   compatWrapper,
@@ -55,7 +55,7 @@ const catalogImportApi = createApiExtension({
     deps: {
       discoveryApi: discoveryApiRef,
       scmAuthApi: scmAuthApiRef,
-      identityApi: identityApiRef,
+      fetchApi: fetchApiRef,
       scmIntegrationsApi: scmIntegrationsApiRef,
       catalogApi: catalogApiRef,
       configApi: configApiRef,
@@ -63,7 +63,7 @@ const catalogImportApi = createApiExtension({
     factory: ({
       discoveryApi,
       scmAuthApi,
-      identityApi,
+      fetchApi,
       scmIntegrationsApi,
       catalogApi,
       configApi,
@@ -72,7 +72,7 @@ const catalogImportApi = createApiExtension({
         discoveryApi,
         scmAuthApi,
         scmIntegrationsApi,
-        identityApi,
+        fetchApi,
         catalogApi,
         configApi,
       }),

plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.test.tsx

@@ -25,22 +25,8 @@ import { catalogImportApiRef, CatalogImportClient } from '../../api';
 import { DefaultImportPage } from './DefaultImportPage';
 
 describe('<DefaultImportPage />', () => {
-  const identityApi = {
-    getUserId: () => {
-      return 'user';
-    },
-    getProfile: () => {
-      return {};
-    },
-    getIdToken: () => {
-      return Promise.resolve('token');
-    },
-    signOut: () => {
-      return Promise.resolve();
-    },
-    getProfileInfo: jest.fn(),
-    getBackstageIdentity: jest.fn(),
-    getCredentials: jest.fn(),
+  const fetchApi = {
+    fetch: jest.fn(),
   };
 
   let apis: TestApiRegistry;
@@ -56,7 +42,7 @@ describe('<DefaultImportPage />', () => {
           scmAuthApi: {
             getCredentials: async () => ({ token: 'token', headers: {} }),
           },
-          identityApi,
+          fetchApi,
           scmIntegrationsApi: {} as any,
           catalogApi: {} as any,
           configApi: {} as any,

plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx

@@ -16,7 +16,7 @@
 
 import { CatalogClient } from '@backstage/catalog-client';
 import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
-import { configApiRef } from '@backstage/core-plugin-api';
+import { FetchApi, configApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
@@ -31,22 +31,8 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('<ImportPage />', () => {
-  const identityApi = {
-    getUserId: () => {
-      return 'user';
-    },
-    getProfile: () => {
-      return {};
-    },
-    getIdToken: () => {
-      return Promise.resolve('token');
-    },
-    signOut: () => {
-      return Promise.resolve();
-    },
-    getProfileInfo: jest.fn(),
-    getBackstageIdentity: jest.fn(),
-    getCredentials: jest.fn(),
+  const fetchApi: FetchApi = {
+    fetch: jest.fn(),
   };
 
   let apis: TestApiRegistry;
@@ -59,7 +45,7 @@ describe('<ImportPage />', () => {
         catalogImportApiRef,
         new CatalogImportClient({
           discoveryApi: {} as any,
-          identityApi,
+          fetchApi,
           scmAuthApi: {} as any,
           scmIntegrationsApi: {} as any,
           catalogApi: {} as any,

plugins/catalog-import/src/plugin.ts

@@ -21,7 +21,7 @@ import {
   createRoutableExtension,
   createRouteRef,
   discoveryApiRef,
-  identityApiRef,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 import {
   scmAuthApiRef,
@@ -48,7 +48,7 @@ export const catalogImportPlugin = createPlugin({
       deps: {
         discoveryApi: discoveryApiRef,
         scmAuthApi: scmAuthApiRef,
-        identityApi: identityApiRef,
+        fetchApi: fetchApiRef,
         scmIntegrationsApi: scmIntegrationsApiRef,
         catalogApi: catalogApiRef,
         configApi: configApiRef,
@@ -56,7 +56,7 @@ export const catalogImportPlugin = createPlugin({
       factory: ({
         discoveryApi,
         scmAuthApi,
-        identityApi,
+        fetchApi,
         scmIntegrationsApi,
         catalogApi,
         configApi,
@@ -65,7 +65,7 @@ export const catalogImportPlugin = createPlugin({
           discoveryApi,
           scmAuthApi,
           scmIntegrationsApi,
-          identityApi,
+          fetchApi,
           catalogApi,
           configApi,
         }),

plugins/kubernetes-react/api-report.md

@@ -16,10 +16,10 @@ import { DetectedErrorsByCluster } from '@backstage/plugin-kubernetes-common';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { Event as Event_2 } from 'kubernetes-models/v1';
+import { FetchApi } from '@backstage/core-plugin-api';
 import { GroupedResponses } from '@backstage/plugin-kubernetes-common';
 import { IContainer } from 'kubernetes-models/v1';
 import { IContainerStatus } from 'kubernetes-models/v1';
-import { IdentityApi } from '@backstage/core-plugin-api';
 import { IIoK8sApimachineryPkgApisMetaV1ObjectMeta } from '@kubernetes-models/apimachinery/apis/meta/v1/ObjectMeta';
 import { IObjectMeta } from '@kubernetes-models/apimachinery/apis/meta/v1/ObjectMeta';
 import { JsonObject } from '@backstage/types';
@@ -402,7 +402,7 @@ export const kubernetesAuthProvidersApiRef: ApiRef<KubernetesAuthProvidersApi>;
 export class KubernetesBackendClient implements KubernetesApi {
   constructor(options: {
     discoveryApi: DiscoveryApi;
-    identityApi: IdentityApi;
+    fetchApi: FetchApi;
     kubernetesAuthProvidersApi: KubernetesAuthProvidersApi;
   });
   // (undocumented)

plugins/kubernetes/src/plugin.ts

@@ -30,13 +30,13 @@ import {
   createPlugin,
   createRouteRef,
   discoveryApiRef,
-  identityApiRef,
   gitlabAuthApiRef,
   googleAuthApiRef,
   microsoftAuthApiRef,
   oktaAuthApiRef,
   oneloginAuthApiRef,
   createRoutableExtension,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 
 export const rootCatalogKubernetesRouteRef = createRouteRef({
@@ -50,13 +50,13 @@ export const kubernetesPlugin = createPlugin({
       api: kubernetesApiRef,
       deps: {
         discoveryApi: discoveryApiRef,
-        identityApi: identityApiRef,
+        fetchApi: fetchApiRef,
         kubernetesAuthProvidersApi: kubernetesAuthProvidersApiRef,
       },
-      factory: ({ discoveryApi, identityApi, kubernetesAuthProvidersApi }) =>
+      factory: ({ discoveryApi, fetchApi, kubernetesAuthProvidersApi }) =>
         new KubernetesBackendClient({
           discoveryApi,
-          identityApi,
+          fetchApi,
           kubernetesAuthProvidersApi,
         }),
     }),

plugins/search/src/alpha.tsx

@@ -32,7 +32,6 @@ import {
 import {
   useApi,
   DiscoveryApi,
-  IdentityApi,
   discoveryApiRef,
   identityApiRef,
   FetchApi,