fix(s3): address feedbacks

aws-amplify · Jun 19, 2023 · 202b62a · 202b62a
1 parent e287dfa
commit 202b62a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/packages/storage/__tests__/AwsClients/S3/cases/headObject.ts b/packages/storage/__tests__/AwsClients/S3/cases/headObject.ts
@@ -41,6 +41,7 @@ const headObjectHappyCase: ApiFunctionalTestCase<typeof headObject> = [
 			'content-type': 'text/plain',
 			etag: 'etag',
 			'last-modified': 'Sun, 1 Jan 2006 12:00:00 GMT',
+			'x-amz-version-id': 'versionId',
 		},
 		body: '',
 	},
@@ -50,6 +51,7 @@ const headObjectHappyCase: ApiFunctionalTestCase<typeof headObject> = [
 		ContentType: 'text/plain',
 		ETag: 'etag',
 		LastModified: new Date('Sun, 1 Jan 2006 12:00:00 GMT'),
+		VersionId: 'versionId',
 	},
 ];
 

diff --git a/packages/storage/src/AwsClients/S3/getObject.ts b/packages/storage/src/AwsClients/S3/getObject.ts
@@ -67,6 +67,8 @@ const getObjectDeserializer = async (
 	if (response.statusCode >= 300) {
 		const error = await parseXmlError(response);
 		throw error;
+	} else if (!response.body) {
+		throw new Error('Got empty response body.');
 	} else {
 		return {
 			...map(response.headers, {
@@ -113,7 +115,7 @@ const getObjectDeserializer = async (
 			}),
 			Metadata: deserializeMetadata(response.headers),
 			$metadata: parseMetadata(response),
-			Body: response.body!,
+			Body: response.body,
 		};
 	}
 };

diff --git a/packages/storage/src/AwsClients/S3/headObject.ts b/packages/storage/src/AwsClients/S3/headObject.ts
@@ -37,6 +37,7 @@ export type HeadObjectOutput = Pick<
 	| 'ETag'
 	| 'LastModified'
 	| 'Metadata'
+	| 'VersionId'
 >;
 
 const headObjectSerializer = (
@@ -67,6 +68,7 @@ const headObjectDeserializer = async (
 				ContentType: 'content-type',
 				ETag: 'etag',
 				LastModified: ['last-modified', deserializeTimestamp],
+				VersionId: 'x-amz-version-id',
 			}),
 			Metadata: deserializeMetadata(response.headers),
 		};

diff --git a/packages/storage/src/AwsClients/S3/utils/deserializeHelpers.ts b/packages/storage/src/AwsClients/S3/utils/deserializeHelpers.ts
@@ -125,10 +125,11 @@ export const emptyArrayGuard = <T extends Array<any>>(
 export const deserializeMetadata = (
 	headers: Headers
 ): Record<string, string> => {
+	const objectMetadataHeaderPrefix = 'x-amz-meta-';
 	const deserialized = Object.keys(headers)
-		.filter(header => header.startsWith('x-amz-meta-'))
+		.filter(header => header.startsWith(objectMetadataHeaderPrefix))
 		.reduce((acc, header) => {
-			acc[header.substring(11)] = headers[header];
+			acc[header.replace(objectMetadataHeaderPrefix, '')] = headers[header];
 			return acc;
 		}, {} as any);
 	return Object.keys(deserialized).length > 0 ? deserialized : undefined;