Merge pull request #15506 from backstage/jhaals/remove-read

backend-common: Remove read method from UrlReader

plugins/azure-devops-backend/src/utils/azure-devops-utils.test.ts

@@ -255,7 +255,6 @@ describe('replaceReadme', () => {
         }),
       readTree: jest.fn(),
       search: jest.fn(),
-      read: jest.fn(),
     };
 
     const result = await replaceReadme(

plugins/catalog-backend-module-openapi/src/OpenApiRefProcessor.ts

@@ -84,10 +84,14 @@ export class OpenApiRefProcessor implements CatalogProcessor {
 
     this.logger.debug(`Bundling OpenAPI specification from ${location.target}`);
     try {
+      const read = async (url: string) => {
+        const { buffer } = await this.reader.readUrl(url);
+        return await buffer();
+      };
       const bundledSpec = await bundleFileWithRefs(
         definition.toString(),
         location.target,
-        this.reader.read,
+        read,
         resolveUrl,
       );
 

plugins/catalog-backend/src/modules/core/PlaceholderProcessor.test.ts

@@ -32,7 +32,6 @@ const integrations = ScmIntegrations.fromConfig(new ConfigReader({}));
 
 describe('PlaceholderProcessor', () => {
   const reader: jest.Mocked<UrlReader> = {
-    read: jest.fn(),
     readTree: jest.fn(),
     search: jest.fn(),
     readUrl: jest.fn(),

plugins/catalog-backend/src/modules/core/UrlReaderProcessor.test.ts

@@ -194,7 +194,6 @@ describe('UrlReaderProcessor', () => {
     const logger = getVoidLogger();
 
     const reader: jest.Mocked<UrlReader> = {
-      read: jest.fn(),
       readUrl: jest.fn(),
       readTree: jest.fn(),
       search: jest.fn().mockImplementation(async () => []),

plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts

@@ -75,7 +75,6 @@ describe('fetch:cookiecutter', () => {
 
   const mockReader: UrlReader = {
     readUrl: jest.fn(),
-    read: jest.fn(),
     readTree: jest.fn(),
     search: jest.fn(),
   };

plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.test.ts

@@ -74,7 +74,6 @@ describe('fetch:rails', () => {
   };
 
   const mockReader: UrlReader = {
-    read: jest.fn(),
     readUrl: jest.fn(),
     readTree: jest.fn(),
     search: jest.fn(),

plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/helpers.test.ts

@@ -39,7 +39,6 @@ describe('fetchContent helper', () => {
 
   const readTree = jest.fn();
   const reader: UrlReader = {
-    read: jest.fn(),
     readUrl: jest.fn(),
     readTree,
     search: jest.fn(),

plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts

@@ -34,7 +34,6 @@ describe('fetch:plain', () => {
   );
   const reader: UrlReader = {
     readUrl: jest.fn(),
-    read: jest.fn(),
     readTree: jest.fn(),
     search: jest.fn(),
   };

plugins/search-backend-node/src/collators/NewlineDelimitedJsonCollatorFactory.test.ts

@@ -53,7 +53,6 @@ describe('DefaultCatalogCollatorFactory', () => {
       readable._read = () => {};
       reader = {
         search: jest.fn(),
-        read: jest.fn(),
         readTree: jest.fn(),
         readUrl: jest.fn(),
       };

plugins/techdocs-backend/src/service/standaloneServer.ts

@@ -53,7 +53,6 @@ export async function startStandaloneServer(
   });
   const discovery = SingleHostDiscovery.fromConfig(config);
   const mockUrlReader: jest.Mocked<UrlReader> = {
-    read: jest.fn(),
     readUrl: jest.fn(),
     readTree: jest.fn(),
     search: jest.fn(),

plugins/techdocs-node/src/stages/prepare/dir.test.ts

@@ -45,7 +45,6 @@ const createMockEntity = (annotations: {}) => {
 
 const mockConfig = new ConfigReader({});
 const mockUrlReader: jest.Mocked<UrlReader> = {
-  read: jest.fn(),
   readUrl: jest.fn(),
   readTree: jest.fn(),
   search: jest.fn(),