Merge pull request #17290 from leboncoin/plugin-adr-fetchapi

feat(plugin-adr): use fetchApi instead of raw fetch
This commit is contained in:
Phil Kuang
2023-04-13 10:55:35 -04:00
committed by GitHub
4 changed files with 17 additions and 4 deletions
+3
View File
@@ -10,6 +10,7 @@ import { AdrFilePathFilterFn } from '@backstage/plugin-adr-common';
import { ApiRef } from '@backstage/core-plugin-api';
import { BackstagePlugin } from '@backstage/core-plugin-api';
import { DiscoveryApi } from '@backstage/core-plugin-api';
import { FetchApi } from '@backstage/core-plugin-api';
import { isAdrAvailable } from '@backstage/plugin-adr-common';
import { ReactNode } from 'react';
import { ResultHighlight } from '@backstage/plugin-search-common';
@@ -37,6 +38,8 @@ export class AdrClient implements AdrApi {
export interface AdrClientOptions {
// (undocumented)
discoveryApi: DiscoveryApi;
// (undocumented)
fetchApi: FetchApi;
}
// @public
+5 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
import { DiscoveryApi } from '@backstage/core-plugin-api';
import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
import { AdrApi, AdrListResult, AdrReadResult } from './types';
/**
@@ -24,6 +24,7 @@ import { AdrApi, AdrListResult, AdrReadResult } from './types';
*/
export interface AdrClientOptions {
discoveryApi: DiscoveryApi;
fetchApi: FetchApi;
}
const readEndpoint = 'file';
@@ -36,9 +37,11 @@ const listEndpoint = 'list';
*/
export class AdrClient implements AdrApi {
private readonly discoveryApi: DiscoveryApi;
private readonly fetchApi: FetchApi;
constructor(options: AdrClientOptions) {
this.discoveryApi = options.discoveryApi;
this.fetchApi = options.fetchApi;
}
private async fetchAdrApi<T>(endpoint: string, fileUrl: string): Promise<T> {
@@ -47,7 +50,7 @@ export class AdrClient implements AdrApi {
fileUrl,
)}`;
const result = await fetch(targetUrl);
const result = await this.fetchApi.fetch(targetUrl);
const data = await result.json();
if (!result.ok) {
+4 -2
View File
@@ -20,6 +20,7 @@ import {
createPlugin,
createRoutableExtension,
discoveryApiRef,
fetchApiRef,
} from '@backstage/core-plugin-api';
import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
import { rootRouteRef } from './routes';
@@ -36,9 +37,10 @@ export const adrPlugin = createPlugin({
api: adrApiRef,
deps: {
discoveryApi: discoveryApiRef,
fetchApi: fetchApiRef,
},
factory({ discoveryApi }) {
return new AdrClient({ discoveryApi });
factory({ discoveryApi, fetchApi }) {
return new AdrClient({ discoveryApi, fetchApi });
},
}),
],