@aws-amplify/storage 6.7.16-unstable.b383885.0 → 6.7.16

package/src/providers/s3/utils/client/s3data/listParts.ts

@@ -47,7 +47,6 @@ const listPartsSerializer = async (
 	url.pathname = serializePathnameObjectKey(url, input.Key);
 	validateS3RequiredParameter(!!input.UploadId, 'UploadId');
 	url.search = new AmplifyUrlSearchParams({
-		'x-id': 'ListParts',
 		uploadId: input.UploadId,
 	}).toString();
 
@@ -62,8 +61,8 @@ const listPartsDeserializer = async (
 	response: HttpResponse,
 ): Promise<ListPartsOutput> => {
 	if (response.statusCode >= 300) {
-		// error is always set when statusCode >= 300
-		throw buildStorageServiceError((await parseXmlError(response))!);
+		const error = (await parseXmlError(response)) as Error;
+		throw buildStorageServiceError(error, response.statusCode);
 	} else {
 		const parsed = await parseXmlBody(response);
 		const contents = map(parsed, {

package/src/providers/s3/utils/client/s3data/putObject.ts

@@ -7,10 +7,7 @@ import {
 	HttpResponse,
 	parseMetadata,
 } from '@aws-amplify/core/internals/aws-client-utils';
-import {
-	AmplifyUrl,
-	AmplifyUrlSearchParams,
-} from '@aws-amplify/core/internals/utils';
+import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
 
 import {
@@ -72,9 +69,6 @@ const putObjectSerializer = async (
 	const url = new AmplifyUrl(endpoint.url.toString());
 	validateS3RequiredParameter(!!input.Key, 'Key');
 	url.pathname = serializePathnameObjectKey(url, input.Key);
-	url.search = new AmplifyUrlSearchParams({
-		'x-id': 'PutObject',
-	}).toString();
 	validateObjectUrl({
 		bucketName: input.Bucket,
 		key: input.Key,
@@ -93,8 +87,8 @@ const putObjectDeserializer = async (
 	response: HttpResponse,
 ): Promise<PutObjectOutput> => {
 	if (response.statusCode >= 300) {
-		// error is always set when statusCode >= 300
-		throw buildStorageServiceError((await parseXmlError(response))!);
+		const error = (await parseXmlError(response)) as Error;
+		throw buildStorageServiceError(error, response.statusCode);
 	} else {
 		return {
 			...map(response.headers, {

package/src/providers/s3/utils/client/s3data/uploadPart.ts

@@ -84,8 +84,8 @@ const uploadPartDeserializer = async (
 	response: HttpResponse,
 ): Promise<UploadPartOutput> => {
 	if (response.statusCode >= 300) {
-		// error is always set when statusCode >= 300
-		throw buildStorageServiceError((await parseXmlError(response))!);
+		const error = (await parseXmlError(response)) as Error;
+		throw buildStorageServiceError(error, response.statusCode);
 	} else {
 		return {
 			...map(response.headers, {

package/src/providers/s3/utils/client/utils/deserializeHelpers.ts

@@ -1,10 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	ErrorParser,
-	Headers,
-} from '@aws-amplify/core/internals/aws-client-utils';
+import { Headers } from '@aws-amplify/core/internals/aws-client-utils';
 import { ServiceError } from '@aws-amplify/core/internals/utils';
 
 import { StorageError } from '../../../../../errors/StorageError';
@@ -186,21 +183,26 @@ export const deserializeMetadata = (
 	return Object.keys(deserialized).length > 0 ? deserialized : undefined;
 };
 
-export type ParsedError = Awaited<ReturnType<ErrorParser>> & {};
-
 /**
- * Internal-only method to create a new StorageError from a service error with AWS SDK-compatible interfaces
- * @param error - The output of a service error parser, with AWS SDK-compatible interface(e.g. $metadata)
- * @returns A new StorageError.
+ * Internal-only method to create a new StorageError from a service error.
  *
  * @internal
  */
-export const buildStorageServiceError = (error: ParsedError): ServiceError =>
-	new StorageError({
+export const buildStorageServiceError = (
+	error: Error,
+	statusCode: number,
+): ServiceError => {
+	const storageError = new StorageError({
 		name: error.name,
 		message: error.message,
-		metadata: error.$metadata,
 	});
+	if (statusCode === 404) {
+		storageError.recoverySuggestion =
+			'Please add the object with this key to the bucket as the key is not found.';
+	}
+
+	return storageError;
+};
 
 /**
  * Internal-only method used for deserializing the parts of a multipart upload.