Remove backend-common dependency

Signed-off-by: Johan Haals <johan.haals@gmail.com>
This commit is contained in:
Johan Haals
2024-08-15 13:43:32 +02:00
parent 3f4998eb9f
commit d897ce63d6
5 changed files with 26 additions and 26 deletions
@@ -13,17 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import {
ReadUrlResponse,
UrlReader,
UrlReaders,
} from '@backstage/backend-common';
import { ConfigReader } from '@backstage/config';
import { Readable } from 'stream';
import { NewlineDelimitedJsonCollatorFactory } from './NewlineDelimitedJsonCollatorFactory';
import { TestPipeline } from '../test-utils';
import { mockServices } from '@backstage/backend-test-utils';
import {
UrlReaderService,
UrlReaderServiceReadUrlResponse,
} from '@backstage/backend-plugin-api';
import { UrlReaders } from '@backstage/backend-defaults/urlReader';
describe('DefaultCatalogCollatorFactory', () => {
const config = new ConfigReader({});
@@ -42,7 +41,9 @@ describe('DefaultCatalogCollatorFactory', () => {
describe('getCollator', () => {
let readable: Readable;
let reader: jest.Mocked<
UrlReader & { readUrl: jest.Mock<Promise<ReadUrlResponse>> }
UrlReaderService & {
readUrl: jest.Mock<Promise<UrlReaderServiceReadUrlResponse>>;
}
>;
let factory: NewlineDelimitedJsonCollatorFactory;
@@ -18,9 +18,8 @@ import { Config } from '@backstage/config';
import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
import { Permission } from '@backstage/plugin-permission-common';
import { Readable } from 'stream';
import { UrlReader } from '@backstage/backend-common';
import { parse as parseNdjson } from 'ndjson';
import { LoggerService } from '@backstage/backend-plugin-api';
import { LoggerService, UrlReaderService } from '@backstage/backend-plugin-api';
/**
* Options for instantiate NewlineDelimitedJsonCollatorFactory
@@ -29,7 +28,7 @@ import { LoggerService } from '@backstage/backend-plugin-api';
export type NewlineDelimitedJsonCollatorFactoryOptions = {
type: string;
searchPattern: string;
reader: UrlReader;
reader: UrlReaderService;
logger: LoggerService;
visibilityPermission?: Permission;
};
@@ -73,7 +72,7 @@ export class NewlineDelimitedJsonCollatorFactory
private constructor(
type: string,
private readonly searchPattern: string,
private readonly reader: UrlReader,
private readonly reader: UrlReaderService,
private readonly logger: LoggerService,
visibilityPermission: Permission | undefined,
) {