1. Remove DiscoveryApi (frontend) and use PluginEndpointDiscovery(SingleHostDiscovery) (backend)

2. Mock class for testing
This commit is contained in:
Himanshu Mishra
2020-11-18 20:22:09 +01:00
parent 1fb08ebb44
commit 66daa47c6a
4 changed files with 28 additions and 28 deletions
-1
View File
@@ -23,7 +23,6 @@
"@backstage/backend-common": "^0.2.0",
"@backstage/catalog-model": "^0.2.0",
"@backstage/config": "^0.1.1",
"@backstage/core-api": "^0.2.1",
"@types/dockerode": "^2.5.34",
"@types/express": "^4.17.6",
"command-exists-promise": "^2.0.2",
@@ -17,8 +17,10 @@
/* eslint-disable no-restricted-syntax */
import fs from 'fs-extra';
import path from 'path';
import { getVoidLogger, SingleHostDiscovery } from '@backstage/backend-common';
import { ConfigReader } from '@backstage/config';
import {
getVoidLogger,
PluginEndpointDiscovery,
} from '@backstage/backend-common';
import { LocalPublish } from './local';
const createMockEntity = (annotations = {}) => {
@@ -38,20 +40,11 @@ const logger = getVoidLogger();
describe('local publisher', () => {
it('should publish generated documentation dir', async () => {
const testConfig = ConfigReader.fromConfigs([
{
context: '',
data: {
backend: {
baseUrl: 'http://localhost:7000',
listen: {
port: 7000,
},
},
},
},
]);
const testDiscovery = SingleHostDiscovery.fromConfig(testConfig);
const testDiscovery: jest.Mocked<PluginEndpointDiscovery> = {
getBaseUrl: jest.fn().mockResolvedValueOnce('http://localhost:7000'),
getExternalBaseUrl: jest.fn(),
};
const publisher = new LocalPublish(logger, testDiscovery);
const mockEntity = createMockEntity();
@@ -17,16 +17,18 @@ import fs from 'fs-extra';
import { Logger } from 'winston';
import { Entity } from '@backstage/catalog-model';
import { PublisherBase } from './types';
import { resolvePackagePath } from '@backstage/backend-common';
import { DiscoveryApi } from '@backstage/core-api';
import {
resolvePackagePath,
PluginEndpointDiscovery,
} from '@backstage/backend-common';
export class LocalPublish implements PublisherBase {
private readonly logger: Logger;
private readonly discoveryApi: DiscoveryApi;
private readonly discovery: PluginEndpointDiscovery;
constructor(logger: Logger, discoveryApi: DiscoveryApi) {
constructor(logger: Logger, discovery: PluginEndpointDiscovery) {
this.logger = logger;
this.discoveryApi = discoveryApi;
this.discovery = discovery;
}
publish({
@@ -66,7 +68,7 @@ export class LocalPublish implements PublisherBase {
reject(err);
}
this.discoveryApi.getBaseUrl('techdocs').then(techdocsApiUrl => {
this.discovery.getBaseUrl('techdocs').then(techdocsApiUrl => {
resolve({
remoteUrl: `${techdocsApiUrl}/static/docs/${entity.metadata.name}`,
});
+11 -5
View File
@@ -1290,34 +1290,40 @@
to-fast-properties "^2.0.0"
"@backstage/core@^0.2.0":
version "0.2.0"
resolved "https://registry.npmjs.org/@backstage/core/-/core-0.2.0.tgz#543246b2d87563c9aa4d9fb96e40fdfc7e827520"
integrity sha512-75m2u3FoUngBOvt9l65xZcYTzzB+49OXpY1A9VNFUR1+jMs3cL/0HDfByQV2H0xXaHzMngQ8C5u/sWhkQsij1w==
version "0.3.0"
dependencies:
"@backstage/config" "^0.1.1"
"@backstage/core-api" "^0.2.0"
"@backstage/theme" "^0.2.0"
"@backstage/core-api" "^0.2.1"
"@backstage/theme" "^0.2.1"
"@material-ui/core" "^4.11.0"
"@material-ui/icons" "^4.9.1"
"@material-ui/lab" "4.0.0-alpha.45"
"@types/dagre" "^0.7.44"
"@types/react" "^16.9"
"@types/react-sparklines" "^1.7.0"
classnames "^2.2.6"
clsx "^1.1.0"
d3-selection "^2.0.0"
d3-shape "^2.0.0"
d3-zoom "^2.0.0"
dagre "^0.8.5"
immer "^7.0.9"
lodash "^4.17.15"
material-table "^1.69.1"
prop-types "^15.7.2"
qs "^6.9.4"
rc-progress "^3.0.0"
react "^16.12.0"
react-dom "^16.12.0"
react-helmet "6.1.0"
react-hook-form "^6.6.0"
react-markdown "^5.0.2"
react-router "6.0.0-beta.0"
react-router-dom "6.0.0-beta.0"
react-sparklines "^1.7.0"
react-syntax-highlighter "^13.5.1"
react-use "^15.3.3"
remark-gfm "^1.0.0"
"@bcoe/v8-coverage@^0.2.3":
version "0.2.3"