fix: log requestId, extendedRequestId, cfId in $metadata (#1819)

clients/client-accessanalyzer/protocols/Aws_restJson1.ts

@@ -2782,7 +2782,9 @@ const deserializeAws_restJson1ValueList = (output: any, context: __SerdeContext)
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-acm-pca/protocols/Aws_json1_1.ts

@@ -3427,7 +3427,9 @@ const deserializeAws_json1_1TooManyTagsException = (output: any, context: __Serd
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-acm/protocols/Aws_json1_1.ts

@@ -2101,7 +2101,9 @@ const deserializeAws_json1_1ValidationEmailList = (output: any, context: __Serde
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-alexa-for-business/protocols/Aws_json1_1.ts

@@ -10652,7 +10652,9 @@ const deserializeAws_json1_1UserDataList = (output: any, context: __SerdeContext
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-amplify/protocols/Aws_restJson1.ts

@@ -5484,7 +5484,9 @@ const deserializeAws_restJson1Webhooks = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-amplifybackend/protocols/Aws_restJson1.ts

@@ -4244,7 +4244,9 @@ const deserializeAws_restJson1SocialProviderSettings = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-api-gateway/protocols/Aws_restJson1.ts

@@ -18126,7 +18126,9 @@ const deserializeAws_restJson1VpcLink = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-apigatewaymanagementapi/protocols/Aws_restJson1.ts

@@ -395,7 +395,9 @@ const deserializeAws_restJson1Identity = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-apigatewayv2/protocols/Aws_restJson1.ts

@@ -10719,7 +10719,9 @@ const deserializeAws_restJson1VpcLink = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-app-mesh/protocols/Aws_restJson1.ts

@@ -8518,7 +8518,9 @@ const deserializeAws_restJson1WeightedTargets = (output: any, context: __SerdeCo
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-appconfig/protocols/Aws_restJson1.ts

@@ -4608,7 +4608,9 @@ const deserializeAws_restJson1ValidatorTypeList = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-appflow/protocols/Aws_restJson1.ts

@@ -4746,7 +4746,9 @@ const deserializeAws_restJson1ZendeskSourceProperties = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-appintegrations/protocols/Aws_restJson1.ts

@@ -1344,7 +1344,9 @@ const deserializeAws_restJson1TagMap = (output: any, context: __SerdeContext): {
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-application-auto-scaling/protocols/Aws_json1_1.ts

@@ -1941,7 +1941,9 @@ const deserializeAws_json1_1ValidationException = (output: any, context: __Serde
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-application-discovery-service/protocols/Aws_json1_1.ts

@@ -4160,7 +4160,9 @@ const deserializeAws_json1_1UpdateApplicationResponse = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-application-insights/protocols/Aws_json1_1.ts

@@ -3616,7 +3616,9 @@ const deserializeAws_json1_1WorkloadMetaData = (output: any, context: __SerdeCon
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-appstream/protocols/Aws_json1_1.ts

@@ -6656,7 +6656,9 @@ const deserializeAws_json1_1VpcConfig = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-appsync/protocols/Aws_restJson1.ts

@@ -6126,7 +6126,9 @@ const deserializeAws_restJson1UserPoolConfig = (output: any, context: __SerdeCon
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-athena/protocols/Aws_json1_1.ts

@@ -3585,7 +3585,9 @@ const deserializeAws_json1_1WorkGroupSummary = (output: any, context: __SerdeCon
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-auditmanager/protocols/Aws_restJson1.ts

@@ -7292,7 +7292,9 @@ const deserializeAws_restJson1ValidationExceptionFieldList = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-auto-scaling-plans/protocols/Aws_json1_1.ts

@@ -1487,7 +1487,9 @@ const deserializeAws_json1_1ValidationException = (output: any, context: __Serde
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-auto-scaling/protocols/Aws_query.ts

@@ -8851,7 +8851,9 @@ const deserializeAws_queryTerminationPolicies = (output: any, context: __SerdeCo
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-backup/protocols/Aws_restJson1.ts

@@ -7250,7 +7250,9 @@ const deserializeAws_restJson1Tags = (output: any, context: __SerdeContext): { [
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-batch/protocols/Aws_restJson1.ts

@@ -3546,7 +3546,9 @@ const deserializeAws_restJson1Volumes = (output: any, context: __SerdeContext):
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-braket/protocols/Aws_restJson1.ts

@@ -1048,7 +1048,9 @@ const deserializeAws_restJson1QuantumTaskSummaryList = (output: any, context: __
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-budgets/protocols/Aws_json1_1.ts

@@ -3737,7 +3737,9 @@ const deserializeAws_json1_1Users = (output: any, context: __SerdeContext): stri
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-chime/protocols/Aws_restJson1.ts

@@ -28359,7 +28359,9 @@ const deserializeAws_restJson1VoiceConnectorSettings = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloud9/protocols/Aws_json1_1.ts

@@ -2096,7 +2096,9 @@ const deserializeAws_json1_1UpdateEnvironmentResult = (
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-clouddirectory/protocols/Aws_restJson1.ts

@@ -12718,7 +12718,9 @@ const deserializeAws_restJson1TypedLinkSpecifierList = (output: any, context: __
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudformation/protocols/Aws_query.ts

@@ -9541,7 +9541,9 @@ const deserializeAws_queryValidateTemplateOutput = (output: any, context: __Serd
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudfront/protocols/Aws_restXml.ts

@@ -17013,7 +17013,9 @@ const deserializeAws_restXmlViewerCertificate = (output: any, context: __SerdeCo
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudhsm-v2/protocols/Aws_json1_1.ts

@@ -2287,7 +2287,9 @@ const deserializeAws_json1_1UntagResourceResponse = (output: any, context: __Ser
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudhsm/protocols/Aws_json1_1.ts

@@ -2340,7 +2340,9 @@ const deserializeAws_json1_1TagList = (output: any, context: __SerdeContext): Ta
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudsearch-domain/protocols/Aws_restJson1.ts

@@ -573,7 +573,9 @@ const deserializeAws_restJson1SuggestStatus = (output: any, context: __SerdeCont
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudsearch/protocols/Aws_query.ts

@@ -4818,7 +4818,9 @@ const deserializeAws_queryValidationException = (output: any, context: __SerdeCo
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.

clients/client-cloudtrail/protocols/Aws_json1_1.ts

@@ -4479,7 +4479,9 @@ const deserializeAws_json1_1UpdateTrailResponse = (output: any, context: __Serde
 
 const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
   httpStatusCode: output.statusCode,
-  requestId: output.headers["x-amzn-requestid"],
+  requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"],
+  extendedRequestId: output.headers["x-amz-id-2"],
+  cfId: output.headers["x-amz-cf-id"],
 });
 
 // Collect low-level response body stream to Uint8Array.