chore(storage): update generated s3 types (#14361)

Author: AllanZhengYP

packages/storage/__tests__/providers/s3/utils/client/S3/cases/copyObject.ts

@@ -22,7 +22,7 @@ const copyObjectHappyCase: ApiFunctionalTestCase<typeof copyObject> = [
 		Key: 'key',
 		CacheControl: 'cacheControl',
 		ContentType: 'contentType',
-		ACL: 'acl',
+		ACL: 'public-read',
 		CopySourceIfMatch: 'eTag',
 		CopySourceIfUnmodifiedSince: new Date(0),
 	},
@@ -35,7 +35,7 @@ const copyObjectHappyCase: ApiFunctionalTestCase<typeof copyObject> = [
 			'x-amz-copy-source': 'sourceBucket/sourceKey',
 			'cache-control': 'cacheControl',
 			'content-type': 'contentType',
-			'x-amz-acl': 'acl',
+			'x-amz-acl': 'public-read',
 			'x-amz-copy-source-if-match': 'eTag',
 			'x-amz-copy-source-if-unmodified-since': 'Thu, 01 Jan 1970 00:00:00 GMT',
 		}),

packages/storage/__tests__/providers/s3/utils/client/S3/cases/listObjectsV2.ts

@@ -22,21 +22,21 @@ const listObjectsV2HappyCaseTruncated: ApiFunctionalTestCase<
 		Bucket: 'bucket',
 		ContinuationToken: 'ContinuationToken',
 		Delimiter: 'Delimiter',
-		EncodingType: 'EncodingType',
+		EncodingType: 'url',
 		ExpectedBucketOwner: 'ExpectedBucketOwner',
 		FetchOwner: false,
 		MaxKeys: 0,
 		Prefix: 'Prefix',
-		RequestPayer: 'RequestPayer',
+		RequestPayer: 'requester',
 		StartAfter: 'StartAfter',
 	},
 	expect.objectContaining({
 		url: expect.objectContaining({
-			href: 'https://bucket.s3.us-east-1.amazonaws.com/?list-type=2&continuation-token=ContinuationToken&delimiter=Delimiter&encoding-type=EncodingType&fetch-owner=false&max-keys=0&prefix=Prefix&start-after=StartAfter',
+			href: 'https://bucket.s3.us-east-1.amazonaws.com/?list-type=2&continuation-token=ContinuationToken&delimiter=Delimiter&encoding-type=url&fetch-owner=false&max-keys=0&prefix=Prefix&start-after=StartAfter',
 		}),
 		method: 'GET',
 		headers: expect.objectContaining({
-			'x-amz-request-payer': 'RequestPayer',
+			'x-amz-request-payer': 'requester',
 			'x-amz-expected-bucket-owner': 'ExpectedBucketOwner',
 		}),
 	}),
@@ -51,7 +51,7 @@ const listObjectsV2HappyCaseTruncated: ApiFunctionalTestCase<
 		<StartAfter>ExampleGuide.pdf</StartAfter>
 		<MaxKeys>1000</MaxKeys>
 		<IsTruncated>true</IsTruncated>
-		<EncodingType>string</EncodingType>
+		<EncodingType>url</EncodingType>
 		<ContinuationToken>1ueGcxLPRx1Tr/XYExHnhbYLgveDs2J/wm36Hy4vbOwM=</ContinuationToken>
 		<NextContinuationToken>Next1ueGcxLPRx1Tr/XYExHnhbYLgveDs2J/wm36Hy4vbOwM=</NextContinuationToken>
 		<Contents>
@@ -112,7 +112,7 @@ const listObjectsV2HappyCaseTruncated: ApiFunctionalTestCase<
 		],
 		ContinuationToken: '1ueGcxLPRx1Tr/XYExHnhbYLgveDs2J/wm36Hy4vbOwM=',
 		Delimiter: 'string',
-		EncodingType: 'string',
+		EncodingType: 'url',
 		IsTruncated: true,
 		KeyCount: 4,
 		MaxKeys: 1000,

packages/storage/__tests__/providers/s3/utils/client/S3/cases/putObject.ts

@@ -14,7 +14,7 @@ export const putObjectRequest = {
 	Bucket: 'bucket',
 	Key: 'key',
 	Body: 'body',
-	ACL: 'public-read',
+	ACL: 'public-read' as const,
 	CacheControl: 'CacheControl',
 	ContentDisposition: 'ContentDisposition',
 	ContentEncoding: 'ContentEncoding',

packages/storage/src/providers/s3/apis/internal/list.ts

@@ -86,7 +86,7 @@ export const list = async (
 		ContinuationToken: options?.listAll ? undefined : options?.nextToken,
 		Delimiter: getDelimiter(options),
 		ExpectedBucketOwner: options?.expectedBucketOwner,
-		EncodingType: 'url',
+		EncodingType: 'url' as const,
 	};
 	logger.debug(`listing items from "${listParams.Prefix}"`);
 

packages/storage/src/providers/s3/utils/client/s3data/deleteObject.ts

@@ -23,10 +23,12 @@ import {
 	validateS3RequiredParameter,
 } from '../utils';
 import { validateObjectUrl } from '../../validateObjectUrl';
+import { deserializeStringTag } from '../utils/deserializeHelpers';
 
 import type {
 	DeleteObjectCommandInput,
 	DeleteObjectCommandOutput,
+	RequestPayer,
 } from './types';
 import { defaultConfig, parseXmlError } from './base';
 
@@ -73,7 +75,10 @@ const deleteObjectDeserializer = async (
 		const content = map(response.headers, {
 			DeleteMarker: ['x-amz-delete-marker', deserializeBoolean],
 			VersionId: 'x-amz-version-id',
-			RequestCharged: 'x-amz-request-charged',
+			RequestCharged: [
+				'x-amz-request-charged',
+				deserializeStringTag<RequestPayer>,
+			],
 		});
 
 		return {

packages/storage/src/providers/s3/utils/client/s3data/listObjectsV2.ts

@@ -25,10 +25,13 @@ import {
 	s3TransferHandler,
 } from '../utils';
 import { IntegrityError } from '../../../../../errors/IntegrityError';
+import { deserializeStringTag } from '../utils/deserializeHelpers';
 
 import type {
+	ChecksumAlgorithm,
 	ListObjectsV2CommandInput,
 	ListObjectsV2CommandOutput,
+	StorageClass,
 } from './types';
 import { defaultConfig, parseXmlError } from './base';
 
@@ -83,7 +86,7 @@ const listObjectsV2Deserializer = async (
 			],
 			ContinuationToken: 'ContinuationToken',
 			Delimiter: 'Delimiter',
-			EncodingType: 'EncodingType',
+			EncodingType: ['EncodingType', deserializeStringTag<'url'>],
 			IsTruncated: ['IsTruncated', deserializeBoolean],
 			KeyCount: ['KeyCount', deserializeNumber],
 			MaxKeys: ['MaxKeys', deserializeNumber],
@@ -124,12 +127,12 @@ const deserializeObject = (output: any) =>
 			value => emptyArrayGuard(value, deserializeChecksumAlgorithmList),
 		],
 		Size: ['Size', deserializeNumber],
-		StorageClass: 'StorageClass',
+		StorageClass: ['StorageClass', deserializeStringTag<StorageClass>],
 		Owner: ['Owner', deserializeOwner],
 	});
 
 const deserializeChecksumAlgorithmList = (output: any[]) =>
-	output.map(entry => String(entry));
+	output.map(deserializeStringTag<ChecksumAlgorithm>);
 
 const deserializeOwner = (output: any) =>
 	map(output, { DisplayName: 'DisplayName', ID: 'ID' });