fixed tests that failed from converting to readUrl

Signed-off-by: Simon <simme.jakobsson@gmail.com>

packages/backend-common/src/reading/AwsS3UrlReader.test.ts

@@ -250,7 +250,9 @@ describe('AwsS3UrlReader', () => {
       const response = await reader.readUrl(
         'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml',
       );
-      expect(response.toString().trim()).toBe('site_name: Test');
+      const fromStream = await getRawBody(response.stream!());
+
+      expect(fromStream.toString().trim()).toBe('site_name: Test');
     });
 
     it('rejects unknown targets', async () => {

packages/backend-common/src/reading/AzureUrlReader.test.ts

@@ -30,6 +30,8 @@ import { NotModifiedError } from '@backstage/errors';
 import { getVoidLogger } from '../logging';
 import { AzureUrlReader } from './AzureUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
+import getRawBody from 'raw-body';
+
 
 const logger = getVoidLogger();
 
@@ -117,7 +119,8 @@ describe('AzureUrlReader', () => {
       });
 
       const data = await reader.readUrl(url);
-      const res = await JSON.parse(data.toString('utf-8'));
+      const fromStream = await getRawBody(data.stream!());
+      const res = await JSON.parse(fromStream.toString());
       expect(res).toEqual(response);
     });
 
@@ -336,4 +339,4 @@ describe('AzureUrlReader', () => {
       ).rejects.toThrow(NotModifiedError);
     });
   });
-});
+});

packages/backend-common/src/reading/AzureUrlReader.ts

@@ -200,4 +200,4 @@ export class AzureUrlReader implements UrlReader {
     const { host, token } = this.integration.config;
     return `azure{host=${host},authed=${Boolean(token)}}`;
   }
-}
+}

packages/backend-common/src/reading/FetchUrlReader.test.ts

@@ -22,6 +22,8 @@ import { setupServer } from 'msw/node';
 import { getVoidLogger } from '../logging';
 import { FetchUrlReader } from './FetchUrlReader';
 import { DefaultReadTreeResponseFactory } from './tree';
+import getRawBody from 'raw-body';
+
 
 const fetchUrlReader = new FetchUrlReader();
 
@@ -174,7 +176,8 @@ describe('FetchUrlReader', () => {
       const buffer = await fetchUrlReader.readUrl(
         'https://backstage.io/some-resource',
       );
-      expect(buffer.toString()).toBe('content foo');
+      const fromStream = await getRawBody(buffer.stream!());
+      expect(fromStream.toString()).toBe('content foo');
     });
 
     it('should throw NotFound if server responds with 404', async () => {

packages/backend-common/src/reading/GitlabUrlReader.test.ts

@@ -151,7 +151,7 @@ describe('GitlabUrlReader', () => {
       });
 
       const data = await reader.readUrl(url);
-      const res = await JSON.parse(data.toString('utf-8'));
+      const res = await JSON.parse(data.toString());
       expect(res).toEqual(response);
     });
 

packages/backend-common/src/reading/UrlReaderPredicateMux.test.ts

@@ -42,7 +42,7 @@ describe('UrlReaderPredicateMux', () => {
     });
 
     await mux.readUrl('http://foo/1');
-    expect(fooReader.read).toHaveBeenCalledWith('http://foo/1');
+    expect(fooReader.readUrl).toHaveBeenCalledWith('http://foo/1', undefined);
     await mux.readUrl('http://foo/2');
     expect(fooReader.readUrl).toHaveBeenCalledWith('http://foo/2', undefined);
     await mux.readTree('http://foo/3');
@@ -51,7 +51,7 @@ describe('UrlReaderPredicateMux', () => {
     expect(fooReader.search).toHaveBeenCalledWith('http://foo/4', undefined);
 
     await mux.readUrl('http://bar/1');
-    expect(barReader.read).toHaveBeenCalledWith('http://bar/1');
+    expect(barReader.readUrl).toHaveBeenCalledWith('http://bar/1', undefined);
     await mux.readUrl('http://bar/2');
     expect(barReader.readUrl).toHaveBeenCalledWith('http://bar/2', undefined);
     await mux.readTree('http://bar/3');