paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 53 Packages Projects Releases Wiki Activity

removed redundant line and changed handeling etag in AWS

Browse Source 
Signed-off-by: Simon <simme.jakobsson@gmail.com>
This commit is contained in:
Simon
2022-11-17 14:52:29 +01:00
parent e0caa78a72
commit 8f9f2239e1
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend-common/src/reading/AwsS3UrlReader.test.ts
+14 -17
View File
@@ -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');
});
});
packages/backend-common/src/reading/FetchUrlReader.test.ts
+2 -3
View File
@@ -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 () => {