@aws-amplify/storage 6.7.8 → 6.7.9-monitoring-instrument.47a7bda.0

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

@@ -7,7 +7,10 @@ import {
 	HttpResponse,
 	parseMetadata,
 } from '@aws-amplify/core/internals/aws-client-utils';
-import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
+import {
+	AmplifyUrl,
+	AmplifyUrlSearchParams,
+} from '@aws-amplify/core/internals/utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
 
 import {
@@ -68,6 +71,9 @@ const copyObjectSerializer = async (
 	const url = new AmplifyUrl(endpoint.url.toString());
 	validateS3RequiredParameter(!!input.Key, 'Key');
 	url.pathname = serializePathnameObjectKey(url, input.Key);
+	url.search = new AmplifyUrlSearchParams({
+		'x-id': 'CopyObject',
+	}).toString();
 	validateObjectUrl({
 		bucketName: input.Bucket,
 		key: input.Key,
@@ -110,8 +116,8 @@ const copyObjectDeserializer = async (
 	response: HttpResponse,
 ): Promise<CopyObjectOutput> => {
 	if (response.statusCode >= 300) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		await parseXmlBody(response);
 

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

@@ -71,8 +71,8 @@ const createMultipartUploadDeserializer = async (
 	response: HttpResponse,
 ): Promise<CreateMultipartUploadOutput> => {
 	if (response.statusCode >= 300) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		const parsed = await parseXmlBody(response);
 		const contents = map(parsed, {

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

@@ -7,7 +7,10 @@ import {
 	HttpResponse,
 	parseMetadata,
 } from '@aws-amplify/core/internals/aws-client-utils';
-import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
+import {
+	AmplifyUrl,
+	AmplifyUrlSearchParams,
+} from '@aws-amplify/core/internals/utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
 
 import {
@@ -41,6 +44,9 @@ const deleteObjectSerializer = (
 	const url = new AmplifyUrl(endpoint.url.toString());
 	validateS3RequiredParameter(!!input.Key, 'Key');
 	url.pathname = serializePathnameObjectKey(url, input.Key);
+	url.search = new AmplifyUrlSearchParams({
+		'x-id': 'DeleteObject',
+	}).toString();
 	validateObjectUrl({
 		bucketName: input.Bucket,
 		key: input.Key,
@@ -62,8 +68,8 @@ const deleteObjectDeserializer = async (
 ): Promise<DeleteObjectOutput> => {
 	if (response.statusCode >= 300) {
 		// error is always set when statusCode >= 300
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		const content = map(response.headers, {
 			DeleteMarker: ['x-amz-delete-marker', deserializeBoolean],

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

@@ -12,7 +12,10 @@ import {
 	presignUrl,
 } from '@aws-amplify/core/internals/aws-client-utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
-import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
+import {
+	AmplifyUrl,
+	AmplifyUrlSearchParams,
+} from '@aws-amplify/core/internals/utils';
 
 import {
 	CONTENT_SHA256_HEADER,
@@ -61,6 +64,9 @@ const getObjectSerializer = async (
 	const url = new AmplifyUrl(endpoint.url.toString());
 	validateS3RequiredParameter(!!input.Key, 'Key');
 	url.pathname = serializePathnameObjectKey(url, input.Key);
+	url.search = new AmplifyUrlSearchParams({
+		'x-id': 'GetObject',
+	}).toString();
 	validateObjectUrl({
 		bucketName: input.Bucket,
 		key: input.Key,
@@ -83,8 +89,8 @@ const getObjectDeserializer = async (
 	response: HttpResponse,
 ): Promise<GetObjectOutput> => {
 	if (response.statusCode >= 300) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		return {
 			...map(response.headers, {

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

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

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

@@ -69,8 +69,8 @@ const listObjectsV2Deserializer = async (
 ): Promise<ListObjectsV2Output> => {
 	if (response.statusCode >= 300) {
 		// error is always set when statusCode >= 300
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		const parsed = await parseXmlBody(response);
 		const contents = map(parsed, {

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

@@ -47,6 +47,7 @@ const listPartsSerializer = async (
 	url.pathname = serializePathnameObjectKey(url, input.Key);
 	validateS3RequiredParameter(!!input.UploadId, 'UploadId');
 	url.search = new AmplifyUrlSearchParams({
+		'x-id': 'ListParts',
 		uploadId: input.UploadId,
 	}).toString();
 
@@ -61,8 +62,8 @@ const listPartsDeserializer = async (
 	response: HttpResponse,
 ): Promise<ListPartsOutput> => {
 	if (response.statusCode >= 300) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		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,7 +7,10 @@ import {
 	HttpResponse,
 	parseMetadata,
 } from '@aws-amplify/core/internals/aws-client-utils';
-import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
+import {
+	AmplifyUrl,
+	AmplifyUrlSearchParams,
+} from '@aws-amplify/core/internals/utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
 
 import {
@@ -69,6 +72,9 @@ 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,
@@ -87,8 +93,8 @@ const putObjectDeserializer = async (
 	response: HttpResponse,
 ): Promise<PutObjectOutput> => {
 	if (response.statusCode >= 300) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		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) {
-		const error = (await parseXmlError(response)) as Error;
-		throw buildStorageServiceError(error, response.statusCode);
+		const error = await parseXmlError(response);
+		throw buildStorageServiceError(error!, response.statusCode);
 	} else {
 		return {
 			...map(response.headers, {

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

@@ -3,6 +3,7 @@
 
 import { Headers } from '@aws-amplify/core/internals/aws-client-utils';
 import { ServiceError } from '@aws-amplify/core/internals/utils';
+import { MetadataBearer } from '@aws-sdk/types';
 
 import { StorageError } from '../../../../../errors/StorageError';
 import { CompletedPart } from '../s3data';
@@ -189,12 +190,13 @@ export const deserializeMetadata = (
  * @internal
  */
 export const buildStorageServiceError = (
-	error: Error,
+	error: Error & MetadataBearer,
 	statusCode: number,
 ): ServiceError => {
 	const storageError = new StorageError({
 		name: error.name,
 		message: error.message,
+		responseMetadata: error.$metadata,
 	});
 	if (statusCode === 404) {
 		storageError.recoverySuggestion =