From 8f9f2239e19715b6e064b66796f791882652bdda Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 17 Nov 2022 14:52:29 +0100 Subject: [PATCH] removed redundant line and changed handeling etag in AWS Signed-off-by: Simon --- .../src/reading/AwsS3UrlReader.test.ts | 31 +++++++++---------- .../src/reading/FetchUrlReader.test.ts | 5 ++- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts index 79892949af..4a2be1fc74 100644 --- a/packages/backend-common/src/reading/AwsS3UrlReader.test.ts +++ b/packages/backend-common/src/reading/AwsS3UrlReader.test.ts @@ -31,7 +31,6 @@ import AWSMock from 'aws-sdk-mock'; import aws from 'aws-sdk'; import path from 'path'; import { NotModifiedError } from '@backstage/errors'; -import getRawBody from 'raw-body'; const treeResponseFactory = DefaultReadTreeResponseFactory.create({ config: new ConfigReader({}), @@ -250,10 +249,8 @@ describe('AwsS3UrlReader', () => { const { buffer } = await reader.readUrl( 'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml', ); - const response = buffer(); - const fromStream = await response; - - expect(fromStream.toString().trim()).toBe('site_name: Test'); + const response = await buffer(); + expect(response.toString().trim()).toBe('site_name: Test'); }); it('rejects unknown targets', async () => { @@ -297,21 +294,21 @@ describe('AwsS3UrlReader', () => { }); it('returns contents of an object in a bucket via buffer', async () => { - const response = await reader.readUrl!( + const { buffer, etag } = await reader.readUrl( 'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml', ); - expect(response.etag).toBe('123abc'); - const buffer = await response.buffer(); - expect(buffer.toString().trim()).toBe('site_name: Test'); + expect(etag).toBe('123abc'); + const response = await buffer(); + expect(response.toString().trim()).toBe('site_name: Test'); }); it('returns contents of an object in a bucket via stream', async () => { - const response = await reader.readUrl!( + const { buffer, etag } = await reader.readUrl( 'https://test-bucket.s3.us-east-2.amazonaws.com/awsS3-mock-object.yaml', ); - expect(response.etag).toBe('123abc'); - const fromStream = await getRawBody(response.stream!()); - expect(fromStream.toString().trim()).toBe('site_name: Test'); + expect(etag).toBe('123abc'); + const response = await buffer(); + expect(response.toString().trim()).toBe('site_name: Test'); }); it('rejects unknown targets', async () => { @@ -357,12 +354,12 @@ describe('AwsS3UrlReader', () => { }); it('returns contents of an object in a bucket via buffer', async () => { - const response = await reader.readUrl!( + const { buffer, etag } = await reader.readUrl( 'http://localhost:4566/test-bucket/awsS3-mock-object.yaml', ); - expect(response.etag).toBe('123abc'); - const buffer = await response.buffer(); - expect(buffer.toString().trim()).toBe('site_name: Test'); + expect(etag).toBe('123abc'); + const response = await buffer(); + expect(response.toString().trim()).toBe('site_name: Test'); }); }); diff --git a/packages/backend-common/src/reading/FetchUrlReader.test.ts b/packages/backend-common/src/reading/FetchUrlReader.test.ts index 564ce99fb6..e45117a106 100644 --- a/packages/backend-common/src/reading/FetchUrlReader.test.ts +++ b/packages/backend-common/src/reading/FetchUrlReader.test.ts @@ -174,9 +174,8 @@ describe('FetchUrlReader', () => { const { buffer } = await fetchUrlReader.readUrl( 'https://backstage.io/some-resource', ); - const fromStream = await buffer(); - const res = await fromStream; - expect(res.toString()).toBe('content foo'); + const response = await buffer(); + expect(response.toString()).toBe('content foo'); }); it('should throw NotFound if server responds with 404', async () => {