From a94d181d22f75c9dec307130bdaa99232332725a Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Mon, 21 Dec 2020 20:25:25 +0000
Subject: [PATCH 1/2] fix: log requestId, extendedRequestId, cfId in $metadata
---
.../protocols/Aws_restJson1.ts | 4 +-
.../client-acm-pca/protocols/Aws_json1_1.ts | 4 +-
clients/client-acm/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-amplify/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-appflow/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-appstream/protocols/Aws_json1_1.ts | 4 +-
.../client-appsync/protocols/Aws_restJson1.ts | 4 +-
.../client-athena/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_query.ts | 4 +-
.../client-backup/protocols/Aws_restJson1.ts | 4 +-
.../client-batch/protocols/Aws_restJson1.ts | 4 +-
.../client-braket/protocols/Aws_restJson1.ts | 4 +-
.../client-budgets/protocols/Aws_json1_1.ts | 4 +-
.../client-chime/protocols/Aws_restJson1.ts | 4 +-
.../client-cloud9/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_query.ts | 4 +-
.../protocols/Aws_restXml.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-cloudhsm/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-cloudsearch/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-cloudwatch/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-codebuild/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-codestar/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-connect/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-datasync/protocols/Aws_json1_1.ts | 4 +-
clients/client-dax/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-dlm/protocols/Aws_restJson1.ts | 4 +-
clients/client-docdb/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../client-dynamodb/protocols/Aws_json1_0.ts | 4 +-
clients/client-ebs/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-ec2/protocols/Aws_ec2.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-ecr/protocols/Aws_json1_1.ts | 4 +-
clients/client-ecs/protocols/Aws_json1_1.ts | 4 +-
clients/client-efs/protocols/Aws_restJson1.ts | 4 +-
clients/client-eks/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_query.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_query.ts | 4 +-
.../protocols/Aws_query.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-elasticache/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-emr/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-firehose/protocols/Aws_json1_1.ts | 4 +-
clients/client-fms/protocols/Aws_json1_1.ts | 4 +-
.../client-forecast/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-fsx/protocols/Aws_json1_1.ts | 4 +-
.../client-gamelift/protocols/Aws_json1_1.ts | 4 +-
.../client-glacier/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-glue/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-health/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-iam/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-inspector/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-iot/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-ivs/protocols/Aws_restJson1.ts | 4 +-
.../client-kafka/protocols/Aws_restJson1.ts | 4 +-
.../client-kendra/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-kinesis/protocols/Aws_json1_1.ts | 4 +-
clients/client-kms/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-lambda/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-lightsail/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-macie/protocols/Aws_json1_1.ts | 4 +-
.../client-macie2/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-mobile/protocols/Aws_restJson1.ts | 4 +-
clients/client-mq/protocols/Aws_restJson1.ts | 4 +-
clients/client-mturk/protocols/Aws_json1_1.ts | 4 +-
clients/client-neptune/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-opsworks/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-pi/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-polly/protocols/Aws_restJson1.ts | 4 +-
.../client-pricing/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../client-qldb/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-ram/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-rds/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-redshift/protocols/Aws_query.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-route-53/protocols/Aws_restXml.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restXml.ts | 4 +-
clients/client-s3/protocols/Aws_restXml.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-sagemaker/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-schemas/protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-ses/protocols/Aws_query.ts | 4 +-
.../client-sesv2/protocols/Aws_restJson1.ts | 4 +-
clients/client-sfn/protocols/Aws_json1_0.ts | 4 +-
.../client-shield/protocols/Aws_json1_1.ts | 4 +-
.../client-signer/protocols/Aws_restJson1.ts | 4 +-
clients/client-sms/protocols/Aws_json1_1.ts | 4 +-
.../client-snowball/protocols/Aws_json1_1.ts | 4 +-
clients/client-sns/protocols/Aws_query.ts | 4 +-
clients/client-sqs/protocols/Aws_query.ts | 4 +-
clients/client-ssm/protocols/Aws_json1_1.ts | 4 +-
.../client-sso-admin/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
clients/client-sso/models/models_0.ts | 90 +++++++++----------
clients/client-sso/protocols/Aws_restJson1.ts | 8 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-sts/protocols/Aws_query.ts | 4 +-
.../client-support/protocols/Aws_json1_1.ts | 4 +-
clients/client-swf/protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-textract/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_json1_0.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-transfer/protocols/Aws_json1_1.ts | 4 +-
.../client-translate/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
clients/client-waf/protocols/Aws_json1_1.ts | 4 +-
clients/client-wafv2/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../client-workmail/protocols/Aws_json1_1.ts | 4 +-
.../protocols/Aws_restJson1.ts | 4 +-
.../protocols/Aws_json1_1.ts | 4 +-
.../client-xray/protocols/Aws_restJson1.ts | 4 +-
protocol_tests/aws-ec2/protocols/Aws_ec2.ts | 4 +-
.../aws-json/protocols/Aws_json1_1.ts | 4 +-
.../aws-query/protocols/Aws_query.ts | 4 +-
.../aws-restjson/protocols/Aws_restJson1.ts | 4 +-
.../aws-restxml/protocols/Aws_restXml.ts | 4 +-
253 files changed, 803 insertions(+), 299 deletions(-)
diff --git a/clients/client-accessanalyzer/protocols/Aws_restJson1.ts b/clients/client-accessanalyzer/protocols/Aws_restJson1.ts
index 291c1ebf777a..4b5d41fd6afb 100644
--- a/clients/client-accessanalyzer/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-acm-pca/protocols/Aws_json1_1.ts b/clients/client-acm-pca/protocols/Aws_json1_1.ts
index ee1b5ad46abb..61281a9f0cdb 100644
--- a/clients/client-acm-pca/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-acm/protocols/Aws_json1_1.ts b/clients/client-acm/protocols/Aws_json1_1.ts
index 3a169ceeecbb..1d90b1f05a31 100644
--- a/clients/client-acm/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-alexa-for-business/protocols/Aws_json1_1.ts b/clients/client-alexa-for-business/protocols/Aws_json1_1.ts
index 66383bcf71cf..809db28bea13 100644
--- a/clients/client-alexa-for-business/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-amplify/protocols/Aws_restJson1.ts b/clients/client-amplify/protocols/Aws_restJson1.ts
index 9cbe34572811..3b2bc2f51fdd 100644
--- a/clients/client-amplify/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-amplifybackend/protocols/Aws_restJson1.ts b/clients/client-amplifybackend/protocols/Aws_restJson1.ts
index 3f0e2537d267..7faf8622a3a1 100644
--- a/clients/client-amplifybackend/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-api-gateway/protocols/Aws_restJson1.ts b/clients/client-api-gateway/protocols/Aws_restJson1.ts
index b79d4fd07516..918f82d94136 100644
--- a/clients/client-api-gateway/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-apigatewaymanagementapi/protocols/Aws_restJson1.ts b/clients/client-apigatewaymanagementapi/protocols/Aws_restJson1.ts
index 93757fad5bf9..f365fc65f43c 100644
--- a/clients/client-apigatewaymanagementapi/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-apigatewayv2/protocols/Aws_restJson1.ts b/clients/client-apigatewayv2/protocols/Aws_restJson1.ts
index d77b53d8e6e3..d0c250ba85d4 100644
--- a/clients/client-apigatewayv2/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-app-mesh/protocols/Aws_restJson1.ts b/clients/client-app-mesh/protocols/Aws_restJson1.ts
index bc5ee3daf2f0..2062fb4b866e 100644
--- a/clients/client-app-mesh/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-appconfig/protocols/Aws_restJson1.ts b/clients/client-appconfig/protocols/Aws_restJson1.ts
index e19c7bb1f031..139c31353cae 100644
--- a/clients/client-appconfig/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-appflow/protocols/Aws_restJson1.ts b/clients/client-appflow/protocols/Aws_restJson1.ts
index 466811d8e5d2..d0e57c96e408 100644
--- a/clients/client-appflow/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-appintegrations/protocols/Aws_restJson1.ts b/clients/client-appintegrations/protocols/Aws_restJson1.ts
index e3735144f01e..82e5dbad9b6d 100644
--- a/clients/client-appintegrations/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-application-auto-scaling/protocols/Aws_json1_1.ts b/clients/client-application-auto-scaling/protocols/Aws_json1_1.ts
index 996d7ee8fe4a..9e7b0a49ab05 100644
--- a/clients/client-application-auto-scaling/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-application-discovery-service/protocols/Aws_json1_1.ts b/clients/client-application-discovery-service/protocols/Aws_json1_1.ts
index f59820cb46fe..92ad4038fa30 100644
--- a/clients/client-application-discovery-service/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-application-insights/protocols/Aws_json1_1.ts b/clients/client-application-insights/protocols/Aws_json1_1.ts
index 54838f967780..36986e7a55c3 100644
--- a/clients/client-application-insights/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-appstream/protocols/Aws_json1_1.ts b/clients/client-appstream/protocols/Aws_json1_1.ts
index 8af8e8aaaeed..666fdec0211b 100644
--- a/clients/client-appstream/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-appsync/protocols/Aws_restJson1.ts b/clients/client-appsync/protocols/Aws_restJson1.ts
index 3806bba9e67e..c754d7006611 100644
--- a/clients/client-appsync/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-athena/protocols/Aws_json1_1.ts b/clients/client-athena/protocols/Aws_json1_1.ts
index 16d5a790a7f4..0519c2feb6fc 100644
--- a/clients/client-athena/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-auditmanager/protocols/Aws_restJson1.ts b/clients/client-auditmanager/protocols/Aws_restJson1.ts
index 99c4665501f2..b9cf18e22ac1 100644
--- a/clients/client-auditmanager/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-auto-scaling-plans/protocols/Aws_json1_1.ts b/clients/client-auto-scaling-plans/protocols/Aws_json1_1.ts
index 95dc362c84a4..cf010fab5bf5 100644
--- a/clients/client-auto-scaling-plans/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-auto-scaling/protocols/Aws_query.ts b/clients/client-auto-scaling/protocols/Aws_query.ts
index 2e9d4b0e8b94..4f8fc78deb49 100644
--- a/clients/client-auto-scaling/protocols/Aws_query.ts
+++ b/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.
diff --git a/clients/client-backup/protocols/Aws_restJson1.ts b/clients/client-backup/protocols/Aws_restJson1.ts
index b7dd6c5c6672..9f40f4e6cbf6 100644
--- a/clients/client-backup/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-batch/protocols/Aws_restJson1.ts b/clients/client-batch/protocols/Aws_restJson1.ts
index a6e881e46084..07abf8a89ef6 100644
--- a/clients/client-batch/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-braket/protocols/Aws_restJson1.ts b/clients/client-braket/protocols/Aws_restJson1.ts
index 21bf212cb4b0..fb4dd968dc3e 100644
--- a/clients/client-braket/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-budgets/protocols/Aws_json1_1.ts b/clients/client-budgets/protocols/Aws_json1_1.ts
index 58cd17470696..dbd8cfb37cba 100644
--- a/clients/client-budgets/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-chime/protocols/Aws_restJson1.ts b/clients/client-chime/protocols/Aws_restJson1.ts
index 55b727529938..6a6dae31bf4c 100644
--- a/clients/client-chime/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-cloud9/protocols/Aws_json1_1.ts b/clients/client-cloud9/protocols/Aws_json1_1.ts
index 523c05b5de6a..d671c228ff20 100644
--- a/clients/client-cloud9/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-clouddirectory/protocols/Aws_restJson1.ts b/clients/client-clouddirectory/protocols/Aws_restJson1.ts
index f2143f12469d..c7df9930735b 100644
--- a/clients/client-clouddirectory/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-cloudformation/protocols/Aws_query.ts b/clients/client-cloudformation/protocols/Aws_query.ts
index 52a9098cd9be..b1f33715a737 100644
--- a/clients/client-cloudformation/protocols/Aws_query.ts
+++ b/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.
diff --git a/clients/client-cloudfront/protocols/Aws_restXml.ts b/clients/client-cloudfront/protocols/Aws_restXml.ts
index aded35feeb3a..2eab81107a34 100644
--- a/clients/client-cloudfront/protocols/Aws_restXml.ts
+++ b/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.
diff --git a/clients/client-cloudhsm-v2/protocols/Aws_json1_1.ts b/clients/client-cloudhsm-v2/protocols/Aws_json1_1.ts
index 776324413061..116267673549 100644
--- a/clients/client-cloudhsm-v2/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-cloudhsm/protocols/Aws_json1_1.ts b/clients/client-cloudhsm/protocols/Aws_json1_1.ts
index 3d91909ca8bd..47c66d54581a 100644
--- a/clients/client-cloudhsm/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-cloudsearch-domain/protocols/Aws_restJson1.ts b/clients/client-cloudsearch-domain/protocols/Aws_restJson1.ts
index 37a9f31697ac..c09f6975ad53 100644
--- a/clients/client-cloudsearch-domain/protocols/Aws_restJson1.ts
+++ b/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.
diff --git a/clients/client-cloudsearch/protocols/Aws_query.ts b/clients/client-cloudsearch/protocols/Aws_query.ts
index 4a9730c959f3..098fbfd66f5d 100644
--- a/clients/client-cloudsearch/protocols/Aws_query.ts
+++ b/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.
diff --git a/clients/client-cloudtrail/protocols/Aws_json1_1.ts b/clients/client-cloudtrail/protocols/Aws_json1_1.ts
index 7dd1c1edfac1..bf833a93217d 100644
--- a/clients/client-cloudtrail/protocols/Aws_json1_1.ts
+++ b/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.
diff --git a/clients/client-cloudwatch-events/protocols/Aws_json1_1.ts b/clients/client-cloudwatch-events/protocols/Aws_json1_1.ts
index d5715590c6bb..f2122527e39f 100644
--- a/clients/client-cloudwatch-events/protocols/Aws_json1_1.ts
+++ b/clients/client-cloudwatch-events/protocols/Aws_json1_1.ts
@@ -5643,7 +5643,9 @@ const deserializeAws_json1_1UpdateArchiveResponse = (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.
diff --git a/clients/client-cloudwatch-logs/protocols/Aws_json1_1.ts b/clients/client-cloudwatch-logs/protocols/Aws_json1_1.ts
index 4b88617fa375..6bf49d4b2217 100644
--- a/clients/client-cloudwatch-logs/protocols/Aws_json1_1.ts
+++ b/clients/client-cloudwatch-logs/protocols/Aws_json1_1.ts
@@ -5354,7 +5354,9 @@ const deserializeAws_json1_1UnrecognizedClientException = (
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.
diff --git a/clients/client-cloudwatch/protocols/Aws_query.ts b/clients/client-cloudwatch/protocols/Aws_query.ts
index f8180bce7878..33879d13affd 100644
--- a/clients/client-cloudwatch/protocols/Aws_query.ts
+++ b/clients/client-cloudwatch/protocols/Aws_query.ts
@@ -5416,7 +5416,9 @@ const deserializeAws_queryUntagResourceOutput = (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.
diff --git a/clients/client-codeartifact/protocols/Aws_restJson1.ts b/clients/client-codeartifact/protocols/Aws_restJson1.ts
index 08a04ce69298..fd8b899b523e 100644
--- a/clients/client-codeartifact/protocols/Aws_restJson1.ts
+++ b/clients/client-codeartifact/protocols/Aws_restJson1.ts
@@ -4984,7 +4984,9 @@ const deserializeAws_restJson1UpstreamRepositoryInfoList = (
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.
diff --git a/clients/client-codebuild/protocols/Aws_json1_1.ts b/clients/client-codebuild/protocols/Aws_json1_1.ts
index a7a543837a56..331129571821 100644
--- a/clients/client-codebuild/protocols/Aws_json1_1.ts
+++ b/clients/client-codebuild/protocols/Aws_json1_1.ts
@@ -6537,7 +6537,9 @@ const deserializeAws_json1_1WebhookFilter = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-codecommit/protocols/Aws_json1_1.ts b/clients/client-codecommit/protocols/Aws_json1_1.ts
index d001d9eda1b6..80c1d7731081 100644
--- a/clients/client-codecommit/protocols/Aws_json1_1.ts
+++ b/clients/client-codecommit/protocols/Aws_json1_1.ts
@@ -21428,7 +21428,9 @@ const deserializeAws_json1_1UserInfo = (output: any, context: __SerdeContext): U
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.
diff --git a/clients/client-codedeploy/protocols/Aws_json1_1.ts b/clients/client-codedeploy/protocols/Aws_json1_1.ts
index ee705ccd620b..bf1eabb88c9b 100644
--- a/clients/client-codedeploy/protocols/Aws_json1_1.ts
+++ b/clients/client-codedeploy/protocols/Aws_json1_1.ts
@@ -11347,7 +11347,9 @@ const deserializeAws_json1_1UpdateDeploymentGroupOutput = (
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.
diff --git a/clients/client-codeguru-reviewer/protocols/Aws_restJson1.ts b/clients/client-codeguru-reviewer/protocols/Aws_restJson1.ts
index 574a1cc9300e..64942c623650 100644
--- a/clients/client-codeguru-reviewer/protocols/Aws_restJson1.ts
+++ b/clients/client-codeguru-reviewer/protocols/Aws_restJson1.ts
@@ -2189,7 +2189,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.
diff --git a/clients/client-codeguruprofiler/protocols/Aws_restJson1.ts b/clients/client-codeguruprofiler/protocols/Aws_restJson1.ts
index edd3bc22d6cf..b0ca3df11e7e 100644
--- a/clients/client-codeguruprofiler/protocols/Aws_restJson1.ts
+++ b/clients/client-codeguruprofiler/protocols/Aws_restJson1.ts
@@ -1967,7 +1967,9 @@ const deserializeAws_restJson1UnprocessedEndTimeMap = (
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.
diff --git a/clients/client-codepipeline/protocols/Aws_json1_1.ts b/clients/client-codepipeline/protocols/Aws_json1_1.ts
index 8851d9cce218..e602b10524d4 100644
--- a/clients/client-codepipeline/protocols/Aws_json1_1.ts
+++ b/clients/client-codepipeline/protocols/Aws_json1_1.ts
@@ -6490,7 +6490,9 @@ const deserializeAws_json1_1WebhookNotFoundException = (
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.
diff --git a/clients/client-codestar-connections/protocols/Aws_json1_0.ts b/clients/client-codestar-connections/protocols/Aws_json1_0.ts
index d68f4046b099..504413ff9338 100644
--- a/clients/client-codestar-connections/protocols/Aws_json1_0.ts
+++ b/clients/client-codestar-connections/protocols/Aws_json1_0.ts
@@ -1401,7 +1401,9 @@ const deserializeAws_json1_0VpcConfiguration = (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.
diff --git a/clients/client-codestar-notifications/protocols/Aws_restJson1.ts b/clients/client-codestar-notifications/protocols/Aws_restJson1.ts
index 14dbb05c9385..5e343ab84033 100644
--- a/clients/client-codestar-notifications/protocols/Aws_restJson1.ts
+++ b/clients/client-codestar-notifications/protocols/Aws_restJson1.ts
@@ -1631,7 +1631,9 @@ const deserializeAws_restJson1TargetSummary = (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.
diff --git a/clients/client-codestar/protocols/Aws_json1_1.ts b/clients/client-codestar/protocols/Aws_json1_1.ts
index 4b3a2eb3752d..13ec29b3ce9f 100644
--- a/clients/client-codestar/protocols/Aws_json1_1.ts
+++ b/clients/client-codestar/protocols/Aws_json1_1.ts
@@ -2571,7 +2571,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.
diff --git a/clients/client-cognito-identity-provider/protocols/Aws_json1_1.ts b/clients/client-cognito-identity-provider/protocols/Aws_json1_1.ts
index 7b442e230c81..2e4c5e821d31 100644
--- a/clients/client-cognito-identity-provider/protocols/Aws_json1_1.ts
+++ b/clients/client-cognito-identity-provider/protocols/Aws_json1_1.ts
@@ -18211,7 +18211,9 @@ const deserializeAws_json1_1VerifyUserAttributeResponse = (
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.
diff --git a/clients/client-cognito-identity/protocols/Aws_json1_1.ts b/clients/client-cognito-identity/protocols/Aws_json1_1.ts
index 3faa5008d8a7..0a43ccb725b2 100644
--- a/clients/client-cognito-identity/protocols/Aws_json1_1.ts
+++ b/clients/client-cognito-identity/protocols/Aws_json1_1.ts
@@ -3477,7 +3477,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.
diff --git a/clients/client-cognito-sync/protocols/Aws_restJson1.ts b/clients/client-cognito-sync/protocols/Aws_restJson1.ts
index 8fe3e6eb4a0e..977b928ef4f3 100644
--- a/clients/client-cognito-sync/protocols/Aws_restJson1.ts
+++ b/clients/client-cognito-sync/protocols/Aws_restJson1.ts
@@ -2814,7 +2814,9 @@ const deserializeAws_restJson1RecordList = (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.
diff --git a/clients/client-comprehend/protocols/Aws_json1_1.ts b/clients/client-comprehend/protocols/Aws_json1_1.ts
index 177b7272fb91..690e8ca9d590 100644
--- a/clients/client-comprehend/protocols/Aws_json1_1.ts
+++ b/clients/client-comprehend/protocols/Aws_json1_1.ts
@@ -9513,7 +9513,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.
diff --git a/clients/client-comprehendmedical/protocols/Aws_json1_1.ts b/clients/client-comprehendmedical/protocols/Aws_json1_1.ts
index 9a2fe76d24a8..c96e29fa322f 100644
--- a/clients/client-comprehendmedical/protocols/Aws_json1_1.ts
+++ b/clients/client-comprehendmedical/protocols/Aws_json1_1.ts
@@ -3195,7 +3195,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.
diff --git a/clients/client-compute-optimizer/protocols/Aws_json1_0.ts b/clients/client-compute-optimizer/protocols/Aws_json1_0.ts
index 35fea89f9a40..1ebd28edf12a 100644
--- a/clients/client-compute-optimizer/protocols/Aws_json1_0.ts
+++ b/clients/client-compute-optimizer/protocols/Aws_json1_0.ts
@@ -2494,7 +2494,9 @@ const deserializeAws_json1_0VolumeRecommendations = (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.
diff --git a/clients/client-config-service/protocols/Aws_json1_1.ts b/clients/client-config-service/protocols/Aws_json1_1.ts
index 54195069e32e..3ff04a0a1ca2 100644
--- a/clients/client-config-service/protocols/Aws_json1_1.ts
+++ b/clients/client-config-service/protocols/Aws_json1_1.ts
@@ -13121,7 +13121,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.
diff --git a/clients/client-connect-contact-lens/protocols/Aws_restJson1.ts b/clients/client-connect-contact-lens/protocols/Aws_restJson1.ts
index 88d9acf62ab3..0939a813e8d5 100644
--- a/clients/client-connect-contact-lens/protocols/Aws_restJson1.ts
+++ b/clients/client-connect-contact-lens/protocols/Aws_restJson1.ts
@@ -381,7 +381,9 @@ const deserializeAws_restJson1Transcript = (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.
diff --git a/clients/client-connect/protocols/Aws_restJson1.ts b/clients/client-connect/protocols/Aws_restJson1.ts
index 6b508bd69bec..dbbc9dc60361 100644
--- a/clients/client-connect/protocols/Aws_restJson1.ts
+++ b/clients/client-connect/protocols/Aws_restJson1.ts
@@ -12091,7 +12091,9 @@ const deserializeAws_restJson1UserSummaryList = (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.
diff --git a/clients/client-connectparticipant/protocols/Aws_restJson1.ts b/clients/client-connectparticipant/protocols/Aws_restJson1.ts
index 326ce7482815..b3271703765a 100644
--- a/clients/client-connectparticipant/protocols/Aws_restJson1.ts
+++ b/clients/client-connectparticipant/protocols/Aws_restJson1.ts
@@ -710,7 +710,9 @@ const deserializeAws_restJson1Websocket = (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.
diff --git a/clients/client-cost-and-usage-report-service/protocols/Aws_json1_1.ts b/clients/client-cost-and-usage-report-service/protocols/Aws_json1_1.ts
index 882237b3bd20..74ca5036b994 100644
--- a/clients/client-cost-and-usage-report-service/protocols/Aws_json1_1.ts
+++ b/clients/client-cost-and-usage-report-service/protocols/Aws_json1_1.ts
@@ -633,7 +633,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.
diff --git a/clients/client-cost-explorer/protocols/Aws_json1_1.ts b/clients/client-cost-explorer/protocols/Aws_json1_1.ts
index 20b0e92c94fc..63087eef3769 100644
--- a/clients/client-cost-explorer/protocols/Aws_json1_1.ts
+++ b/clients/client-cost-explorer/protocols/Aws_json1_1.ts
@@ -5589,7 +5589,9 @@ const deserializeAws_json1_1Values = (output: any, context: __SerdeContext): str
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.
diff --git a/clients/client-customer-profiles/protocols/Aws_restJson1.ts b/clients/client-customer-profiles/protocols/Aws_restJson1.ts
index 6fe71cb7220c..74a211358eea 100644
--- a/clients/client-customer-profiles/protocols/Aws_restJson1.ts
+++ b/clients/client-customer-profiles/protocols/Aws_restJson1.ts
@@ -4341,7 +4341,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.
diff --git a/clients/client-data-pipeline/protocols/Aws_json1_1.ts b/clients/client-data-pipeline/protocols/Aws_json1_1.ts
index 1fdc80f96fa3..12d0d2719dd5 100644
--- a/clients/client-data-pipeline/protocols/Aws_json1_1.ts
+++ b/clients/client-data-pipeline/protocols/Aws_json1_1.ts
@@ -2687,7 +2687,9 @@ const deserializeAws_json1_1ValidationWarnings = (output: any, context: __SerdeC
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.
diff --git a/clients/client-database-migration-service/protocols/Aws_json1_1.ts b/clients/client-database-migration-service/protocols/Aws_json1_1.ts
index 9155dcf53318..b11c300586c7 100644
--- a/clients/client-database-migration-service/protocols/Aws_json1_1.ts
+++ b/clients/client-database-migration-service/protocols/Aws_json1_1.ts
@@ -9010,7 +9010,9 @@ const deserializeAws_json1_1VpcSecurityGroupMembershipList = (
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.
diff --git a/clients/client-databrew/protocols/Aws_restJson1.ts b/clients/client-databrew/protocols/Aws_restJson1.ts
index 209cd2979a45..ee84df529aab 100644
--- a/clients/client-databrew/protocols/Aws_restJson1.ts
+++ b/clients/client-databrew/protocols/Aws_restJson1.ts
@@ -4855,7 +4855,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.
diff --git a/clients/client-dataexchange/protocols/Aws_restJson1.ts b/clients/client-dataexchange/protocols/Aws_restJson1.ts
index 6d2addc3b64c..abb2ade5e69b 100644
--- a/clients/client-dataexchange/protocols/Aws_restJson1.ts
+++ b/clients/client-dataexchange/protocols/Aws_restJson1.ts
@@ -3537,7 +3537,9 @@ const deserializeAws_restJson1S3SnapshotAsset = (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.
diff --git a/clients/client-datasync/protocols/Aws_json1_1.ts b/clients/client-datasync/protocols/Aws_json1_1.ts
index a50798140032..77a573f5ae0e 100644
--- a/clients/client-datasync/protocols/Aws_json1_1.ts
+++ b/clients/client-datasync/protocols/Aws_json1_1.ts
@@ -3890,7 +3890,9 @@ const deserializeAws_json1_1UpdateTaskResponse = (output: any, context: __SerdeC
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.
diff --git a/clients/client-dax/protocols/Aws_json1_1.ts b/clients/client-dax/protocols/Aws_json1_1.ts
index d7a3eed3845e..112dde6b1eb4 100644
--- a/clients/client-dax/protocols/Aws_json1_1.ts
+++ b/clients/client-dax/protocols/Aws_json1_1.ts
@@ -3866,7 +3866,9 @@ const deserializeAws_json1_1UpdateSubnetGroupResponse = (
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.
diff --git a/clients/client-detective/protocols/Aws_restJson1.ts b/clients/client-detective/protocols/Aws_restJson1.ts
index 9edd1198883a..cd3f99451962 100644
--- a/clients/client-detective/protocols/Aws_restJson1.ts
+++ b/clients/client-detective/protocols/Aws_restJson1.ts
@@ -1433,7 +1433,9 @@ const deserializeAws_restJson1UnprocessedAccountList = (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.
diff --git a/clients/client-device-farm/protocols/Aws_json1_1.ts b/clients/client-device-farm/protocols/Aws_json1_1.ts
index 86ee80b3c08a..c2ade52dfeff 100644
--- a/clients/client-device-farm/protocols/Aws_json1_1.ts
+++ b/clients/client-device-farm/protocols/Aws_json1_1.ts
@@ -10611,7 +10611,9 @@ const deserializeAws_json1_1VPCEConfigurations = (output: any, context: __SerdeC
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.
diff --git a/clients/client-devops-guru/protocols/Aws_restJson1.ts b/clients/client-devops-guru/protocols/Aws_restJson1.ts
index ceeb4b883f0c..be14bec566b8 100644
--- a/clients/client-devops-guru/protocols/Aws_restJson1.ts
+++ b/clients/client-devops-guru/protocols/Aws_restJson1.ts
@@ -3391,7 +3391,9 @@ const deserializeAws_restJson1ValidationExceptionField = (
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.
diff --git a/clients/client-direct-connect/protocols/Aws_json1_1.ts b/clients/client-direct-connect/protocols/Aws_json1_1.ts
index a47f62d9cf0b..818d7553c1a7 100644
--- a/clients/client-direct-connect/protocols/Aws_json1_1.ts
+++ b/clients/client-direct-connect/protocols/Aws_json1_1.ts
@@ -6688,7 +6688,9 @@ const deserializeAws_json1_1VirtualInterfaceTestHistoryList = (
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.
diff --git a/clients/client-directory-service/protocols/Aws_json1_1.ts b/clients/client-directory-service/protocols/Aws_json1_1.ts
index 8a71ee01bfee..8540bc2383be 100644
--- a/clients/client-directory-service/protocols/Aws_json1_1.ts
+++ b/clients/client-directory-service/protocols/Aws_json1_1.ts
@@ -9668,7 +9668,9 @@ const deserializeAws_json1_1VerifyTrustResult = (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.
diff --git a/clients/client-dlm/protocols/Aws_restJson1.ts b/clients/client-dlm/protocols/Aws_restJson1.ts
index a949fe27fa47..eb221b088688 100644
--- a/clients/client-dlm/protocols/Aws_restJson1.ts
+++ b/clients/client-dlm/protocols/Aws_restJson1.ts
@@ -1495,7 +1495,9 @@ const deserializeAws_restJson1VariableTagsList = (output: any, context: __SerdeC
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.
diff --git a/clients/client-docdb/protocols/Aws_query.ts b/clients/client-docdb/protocols/Aws_query.ts
index fda961eefae8..0b2e05ed1b69 100644
--- a/clients/client-docdb/protocols/Aws_query.ts
+++ b/clients/client-docdb/protocols/Aws_query.ts
@@ -8655,7 +8655,9 @@ const deserializeAws_queryVpcSecurityGroupMembershipList = (
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.
diff --git a/clients/client-dynamodb-streams/protocols/Aws_json1_0.ts b/clients/client-dynamodb-streams/protocols/Aws_json1_0.ts
index 20953f349690..6b642fc51bba 100644
--- a/clients/client-dynamodb-streams/protocols/Aws_json1_0.ts
+++ b/clients/client-dynamodb-streams/protocols/Aws_json1_0.ts
@@ -853,7 +853,9 @@ const deserializeAws_json1_0TrimmedDataAccessException = (
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.
diff --git a/clients/client-dynamodb/protocols/Aws_json1_0.ts b/clients/client-dynamodb/protocols/Aws_json1_0.ts
index edb04ed3938b..6a6b9dcafd2f 100644
--- a/clients/client-dynamodb/protocols/Aws_json1_0.ts
+++ b/clients/client-dynamodb/protocols/Aws_json1_0.ts
@@ -10098,7 +10098,9 @@ const deserializeAws_json1_0WriteRequests = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-ebs/protocols/Aws_restJson1.ts b/clients/client-ebs/protocols/Aws_restJson1.ts
index 5b241e651d4e..c2c9656c21df 100644
--- a/clients/client-ebs/protocols/Aws_restJson1.ts
+++ b/clients/client-ebs/protocols/Aws_restJson1.ts
@@ -1157,7 +1157,9 @@ const deserializeAws_restJson1Tags = (output: any, context: __SerdeContext): Tag
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.
diff --git a/clients/client-ec2-instance-connect/protocols/Aws_json1_1.ts b/clients/client-ec2-instance-connect/protocols/Aws_json1_1.ts
index 0f04a0570515..8ea6a4547f80 100644
--- a/clients/client-ec2-instance-connect/protocols/Aws_json1_1.ts
+++ b/clients/client-ec2-instance-connect/protocols/Aws_json1_1.ts
@@ -248,7 +248,9 @@ const deserializeAws_json1_1ThrottlingException = (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.
diff --git a/clients/client-ec2/protocols/Aws_ec2.ts b/clients/client-ec2/protocols/Aws_ec2.ts
index 56a9db6bc6bd..25b9fff93835 100644
--- a/clients/client-ec2/protocols/Aws_ec2.ts
+++ b/clients/client-ec2/protocols/Aws_ec2.ts
@@ -70438,7 +70438,9 @@ const deserializeAws_ec2WithdrawByoipCidrResult = (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.
diff --git a/clients/client-ecr-public/protocols/Aws_json1_1.ts b/clients/client-ecr-public/protocols/Aws_json1_1.ts
index 674417921de2..2c1c67b4536e 100644
--- a/clients/client-ecr-public/protocols/Aws_json1_1.ts
+++ b/clients/client-ecr-public/protocols/Aws_json1_1.ts
@@ -3421,7 +3421,9 @@ const deserializeAws_json1_1UploadNotFoundException = (
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.
diff --git a/clients/client-ecr/protocols/Aws_json1_1.ts b/clients/client-ecr/protocols/Aws_json1_1.ts
index dbfbb0f9ee9a..ea598d21e7ca 100644
--- a/clients/client-ecr/protocols/Aws_json1_1.ts
+++ b/clients/client-ecr/protocols/Aws_json1_1.ts
@@ -5612,7 +5612,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.
diff --git a/clients/client-ecs/protocols/Aws_json1_1.ts b/clients/client-ecs/protocols/Aws_json1_1.ts
index ae55a7b6d495..2fd94d9759cc 100644
--- a/clients/client-ecs/protocols/Aws_json1_1.ts
+++ b/clients/client-ecs/protocols/Aws_json1_1.ts
@@ -10131,7 +10131,9 @@ const deserializeAws_json1_1VolumeList = (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.
diff --git a/clients/client-efs/protocols/Aws_restJson1.ts b/clients/client-efs/protocols/Aws_restJson1.ts
index d097bc43b2e3..5e2cdb2e4868 100644
--- a/clients/client-efs/protocols/Aws_restJson1.ts
+++ b/clients/client-efs/protocols/Aws_restJson1.ts
@@ -4075,7 +4075,9 @@ const deserializeAws_restJson1Tags = (output: any, context: __SerdeContext): Tag
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.
diff --git a/clients/client-eks/protocols/Aws_restJson1.ts b/clients/client-eks/protocols/Aws_restJson1.ts
index f347c25ba0aa..b8c4e40ad0f5 100644
--- a/clients/client-eks/protocols/Aws_restJson1.ts
+++ b/clients/client-eks/protocols/Aws_restJson1.ts
@@ -4581,7 +4581,9 @@ const deserializeAws_restJson1VpcConfigResponse = (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.
diff --git a/clients/client-elastic-beanstalk/protocols/Aws_query.ts b/clients/client-elastic-beanstalk/protocols/Aws_query.ts
index a2215243ab29..9cee1a9a9bde 100644
--- a/clients/client-elastic-beanstalk/protocols/Aws_query.ts
+++ b/clients/client-elastic-beanstalk/protocols/Aws_query.ts
@@ -8152,7 +8152,9 @@ const deserializeAws_queryVersionLabelsList = (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.
diff --git a/clients/client-elastic-inference/protocols/Aws_restJson1.ts b/clients/client-elastic-inference/protocols/Aws_restJson1.ts
index eb8bf09a4a4e..761d40e6f555 100644
--- a/clients/client-elastic-inference/protocols/Aws_restJson1.ts
+++ b/clients/client-elastic-inference/protocols/Aws_restJson1.ts
@@ -871,7 +871,9 @@ const deserializeAws_restJson1ThroughputInfoList = (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.
diff --git a/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts b/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts
index d4f92f1c46a6..8ca4c57039ab 100644
--- a/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts
+++ b/clients/client-elastic-load-balancing-v2/protocols/Aws_query.ts
@@ -7808,7 +7808,9 @@ const deserializeAws_queryUnsupportedProtocolException = (
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.
diff --git a/clients/client-elastic-load-balancing/protocols/Aws_query.ts b/clients/client-elastic-load-balancing/protocols/Aws_query.ts
index 369e650b9055..ebdbf1c05c7e 100644
--- a/clients/client-elastic-load-balancing/protocols/Aws_query.ts
+++ b/clients/client-elastic-load-balancing/protocols/Aws_query.ts
@@ -5357,7 +5357,9 @@ const deserializeAws_queryUnsupportedProtocolException = (
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.
diff --git a/clients/client-elastic-transcoder/protocols/Aws_restJson1.ts b/clients/client-elastic-transcoder/protocols/Aws_restJson1.ts
index b021887d7727..b7b9336848b9 100644
--- a/clients/client-elastic-transcoder/protocols/Aws_restJson1.ts
+++ b/clients/client-elastic-transcoder/protocols/Aws_restJson1.ts
@@ -3445,7 +3445,9 @@ const deserializeAws_restJson1Warnings = (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.
diff --git a/clients/client-elasticache/protocols/Aws_query.ts b/clients/client-elasticache/protocols/Aws_query.ts
index abe2076dc141..8de06291ccec 100644
--- a/clients/client-elasticache/protocols/Aws_query.ts
+++ b/clients/client-elasticache/protocols/Aws_query.ts
@@ -14327,7 +14327,9 @@ const deserializeAws_queryUserQuotaExceededFault = (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.
diff --git a/clients/client-elasticsearch-service/protocols/Aws_restJson1.ts b/clients/client-elasticsearch-service/protocols/Aws_restJson1.ts
index 6f3e761b59c4..894bda4b577c 100644
--- a/clients/client-elasticsearch-service/protocols/Aws_restJson1.ts
+++ b/clients/client-elasticsearch-service/protocols/Aws_restJson1.ts
@@ -6451,7 +6451,9 @@ const deserializeAws_restJson1ZoneAwarenessConfig = (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.
diff --git a/clients/client-emr-containers/protocols/Aws_restJson1.ts b/clients/client-emr-containers/protocols/Aws_restJson1.ts
index cd1c1192ff34..b893adb7be35 100644
--- a/clients/client-emr-containers/protocols/Aws_restJson1.ts
+++ b/clients/client-emr-containers/protocols/Aws_restJson1.ts
@@ -2189,7 +2189,9 @@ const deserializeAws_restJson1VirtualClusters = (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.
diff --git a/clients/client-emr/protocols/Aws_json1_1.ts b/clients/client-emr/protocols/Aws_json1_1.ts
index 83b83bb161ca..c6f4917ec89a 100644
--- a/clients/client-emr/protocols/Aws_json1_1.ts
+++ b/clients/client-emr/protocols/Aws_json1_1.ts
@@ -7319,7 +7319,9 @@ const deserializeAws_json1_1XmlStringMaxLen256List = (output: any, context: __Se
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.
diff --git a/clients/client-eventbridge/protocols/Aws_json1_1.ts b/clients/client-eventbridge/protocols/Aws_json1_1.ts
index 4f6bf87c7b34..2865966453f4 100644
--- a/clients/client-eventbridge/protocols/Aws_json1_1.ts
+++ b/clients/client-eventbridge/protocols/Aws_json1_1.ts
@@ -5643,7 +5643,9 @@ const deserializeAws_json1_1UpdateArchiveResponse = (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.
diff --git a/clients/client-firehose/protocols/Aws_json1_1.ts b/clients/client-firehose/protocols/Aws_json1_1.ts
index b6ac93b03d19..397de247c468 100644
--- a/clients/client-firehose/protocols/Aws_json1_1.ts
+++ b/clients/client-firehose/protocols/Aws_json1_1.ts
@@ -3460,7 +3460,9 @@ const deserializeAws_json1_1VpcConfigurationDescription = (
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.
diff --git a/clients/client-fms/protocols/Aws_json1_1.ts b/clients/client-fms/protocols/Aws_json1_1.ts
index 3de9808e88a2..4d5bbae578a7 100644
--- a/clients/client-fms/protocols/Aws_json1_1.ts
+++ b/clients/client-fms/protocols/Aws_json1_1.ts
@@ -4043,7 +4043,9 @@ const deserializeAws_json1_1ViolationDetail = (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.
diff --git a/clients/client-forecast/protocols/Aws_json1_1.ts b/clients/client-forecast/protocols/Aws_json1_1.ts
index 8a96361b4635..f75dba6aba55 100644
--- a/clients/client-forecast/protocols/Aws_json1_1.ts
+++ b/clients/client-forecast/protocols/Aws_json1_1.ts
@@ -4981,7 +4981,9 @@ const deserializeAws_json1_1WindowSummary = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-forecastquery/protocols/Aws_json1_1.ts b/clients/client-forecastquery/protocols/Aws_json1_1.ts
index 7388f08c2a14..0af924a1bfe7 100644
--- a/clients/client-forecastquery/protocols/Aws_json1_1.ts
+++ b/clients/client-forecastquery/protocols/Aws_json1_1.ts
@@ -303,7 +303,9 @@ const deserializeAws_json1_1TimeSeries = (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.
diff --git a/clients/client-frauddetector/protocols/Aws_json1_1.ts b/clients/client-frauddetector/protocols/Aws_json1_1.ts
index 0c2ccad11d96..e7213a940f1f 100644
--- a/clients/client-frauddetector/protocols/Aws_json1_1.ts
+++ b/clients/client-frauddetector/protocols/Aws_json1_1.ts
@@ -7308,7 +7308,9 @@ const deserializeAws_json1_1VariableList = (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.
diff --git a/clients/client-fsx/protocols/Aws_json1_1.ts b/clients/client-fsx/protocols/Aws_json1_1.ts
index 12fa560ac1af..64a5e181401d 100644
--- a/clients/client-fsx/protocols/Aws_json1_1.ts
+++ b/clients/client-fsx/protocols/Aws_json1_1.ts
@@ -3685,7 +3685,9 @@ const deserializeAws_json1_1WindowsFileSystemConfiguration = (
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.
diff --git a/clients/client-gamelift/protocols/Aws_json1_1.ts b/clients/client-gamelift/protocols/Aws_json1_1.ts
index 1d913fd56673..0b40471196d5 100644
--- a/clients/client-gamelift/protocols/Aws_json1_1.ts
+++ b/clients/client-gamelift/protocols/Aws_json1_1.ts
@@ -13231,7 +13231,9 @@ const deserializeAws_json1_1VpcPeeringConnectionStatus = (
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.
diff --git a/clients/client-glacier/protocols/Aws_restJson1.ts b/clients/client-glacier/protocols/Aws_restJson1.ts
index 315b54001a76..19479bca8ac0 100644
--- a/clients/client-glacier/protocols/Aws_restJson1.ts
+++ b/clients/client-glacier/protocols/Aws_restJson1.ts
@@ -5108,7 +5108,9 @@ const deserializeAws_restJson1VaultNotificationConfig = (
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.
diff --git a/clients/client-global-accelerator/protocols/Aws_json1_1.ts b/clients/client-global-accelerator/protocols/Aws_json1_1.ts
index 8c38d6beffb3..c7b72ed7693c 100644
--- a/clients/client-global-accelerator/protocols/Aws_json1_1.ts
+++ b/clients/client-global-accelerator/protocols/Aws_json1_1.ts
@@ -6741,7 +6741,9 @@ const deserializeAws_json1_1WithdrawByoipCidrResponse = (
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.
diff --git a/clients/client-glue/protocols/Aws_json1_1.ts b/clients/client-glue/protocols/Aws_json1_1.ts
index 66354ec65298..d846df1e43f4 100644
--- a/clients/client-glue/protocols/Aws_json1_1.ts
+++ b/clients/client-glue/protocols/Aws_json1_1.ts
@@ -24256,7 +24256,9 @@ const deserializeAws_json1_1XMLClassifier = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-greengrass/protocols/Aws_restJson1.ts b/clients/client-greengrass/protocols/Aws_restJson1.ts
index 95199bd5887f..b48b9cb65ddd 100644
--- a/clients/client-greengrass/protocols/Aws_restJson1.ts
+++ b/clients/client-greengrass/protocols/Aws_restJson1.ts
@@ -10535,7 +10535,9 @@ const deserializeAws_restJson1VersionInformation = (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.
diff --git a/clients/client-groundstation/protocols/Aws_restJson1.ts b/clients/client-groundstation/protocols/Aws_restJson1.ts
index c53803421a20..5d961c5f9a7c 100644
--- a/clients/client-groundstation/protocols/Aws_restJson1.ts
+++ b/clients/client-groundstation/protocols/Aws_restJson1.ts
@@ -3655,7 +3655,9 @@ const deserializeAws_restJson1UplinkSpectrumConfig = (output: any, context: __Se
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.
diff --git a/clients/client-guardduty/protocols/Aws_restJson1.ts b/clients/client-guardduty/protocols/Aws_restJson1.ts
index 3b51e19b4d7a..493b7cd0c8a0 100644
--- a/clients/client-guardduty/protocols/Aws_restJson1.ts
+++ b/clients/client-guardduty/protocols/Aws_restJson1.ts
@@ -7381,7 +7381,9 @@ const deserializeAws_restJson1UsageStatistics = (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.
diff --git a/clients/client-health/protocols/Aws_json1_1.ts b/clients/client-health/protocols/Aws_json1_1.ts
index 2d8bd435f2aa..c0d0e2c94271 100644
--- a/clients/client-health/protocols/Aws_json1_1.ts
+++ b/clients/client-health/protocols/Aws_json1_1.ts
@@ -2039,7 +2039,9 @@ const deserializeAws_json1_1UnsupportedLocale = (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.
diff --git a/clients/client-healthlake/protocols/Aws_json1_0.ts b/clients/client-healthlake/protocols/Aws_json1_0.ts
index cd810a91e989..3acc91d941f4 100644
--- a/clients/client-healthlake/protocols/Aws_json1_0.ts
+++ b/clients/client-healthlake/protocols/Aws_json1_0.ts
@@ -997,7 +997,9 @@ const deserializeAws_json1_0ValidationException = (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.
diff --git a/clients/client-honeycode/protocols/Aws_restJson1.ts b/clients/client-honeycode/protocols/Aws_restJson1.ts
index 54e1919035e9..b0948f69a406 100644
--- a/clients/client-honeycode/protocols/Aws_restJson1.ts
+++ b/clients/client-honeycode/protocols/Aws_restJson1.ts
@@ -2687,7 +2687,9 @@ const deserializeAws_restJson1UpsertRowsResultMap = (
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.
diff --git a/clients/client-iam/protocols/Aws_query.ts b/clients/client-iam/protocols/Aws_query.ts
index 6822a56067c5..1d8b86e954a0 100644
--- a/clients/client-iam/protocols/Aws_query.ts
+++ b/clients/client-iam/protocols/Aws_query.ts
@@ -19051,7 +19051,9 @@ const deserializeAws_queryvirtualMFADeviceListType = (output: any, context: __Se
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.
diff --git a/clients/client-identitystore/protocols/Aws_json1_1.ts b/clients/client-identitystore/protocols/Aws_json1_1.ts
index 5c99818fdf34..67774f0321b0 100644
--- a/clients/client-identitystore/protocols/Aws_json1_1.ts
+++ b/clients/client-identitystore/protocols/Aws_json1_1.ts
@@ -673,7 +673,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.
diff --git a/clients/client-imagebuilder/protocols/Aws_restJson1.ts b/clients/client-imagebuilder/protocols/Aws_restJson1.ts
index 00910d2efdb2..a3df6a191d2f 100644
--- a/clients/client-imagebuilder/protocols/Aws_restJson1.ts
+++ b/clients/client-imagebuilder/protocols/Aws_restJson1.ts
@@ -7404,7 +7404,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.
diff --git a/clients/client-inspector/protocols/Aws_json1_1.ts b/clients/client-inspector/protocols/Aws_json1_1.ts
index 9e202af5e8c6..c4e2f3ac844d 100644
--- a/clients/client-inspector/protocols/Aws_json1_1.ts
+++ b/clients/client-inspector/protocols/Aws_json1_1.ts
@@ -5894,7 +5894,9 @@ const deserializeAws_json1_1UserAttributeList = (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.
diff --git a/clients/client-iot-1click-devices-service/protocols/Aws_restJson1.ts b/clients/client-iot-1click-devices-service/protocols/Aws_restJson1.ts
index a405f07ba4d9..00c910f8e58b 100644
--- a/clients/client-iot-1click-devices-service/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-1click-devices-service/protocols/Aws_restJson1.ts
@@ -1700,7 +1700,9 @@ const deserializeAws_restJson1DeviceMethod = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-iot-1click-projects/protocols/Aws_restJson1.ts b/clients/client-iot-1click-projects/protocols/Aws_restJson1.ts
index 3e748f24a3ac..b4771ca54f33 100644
--- a/clients/client-iot-1click-projects/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-1click-projects/protocols/Aws_restJson1.ts
@@ -2176,7 +2176,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.
diff --git a/clients/client-iot-data-plane/protocols/Aws_restJson1.ts b/clients/client-iot-data-plane/protocols/Aws_restJson1.ts
index 8f6fc975e270..5537fad1030c 100644
--- a/clients/client-iot-data-plane/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-data-plane/protocols/Aws_restJson1.ts
@@ -905,7 +905,9 @@ const deserializeAws_restJson1NamedShadowList = (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.
diff --git a/clients/client-iot-events-data/protocols/Aws_restJson1.ts b/clients/client-iot-events-data/protocols/Aws_restJson1.ts
index 8f4815c0da04..b52ad4d8c515 100644
--- a/clients/client-iot-events-data/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-events-data/protocols/Aws_restJson1.ts
@@ -846,7 +846,9 @@ const deserializeAws_restJson1Variables = (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.
diff --git a/clients/client-iot-events/protocols/Aws_restJson1.ts b/clients/client-iot-events/protocols/Aws_restJson1.ts
index c7b4f6a27922..971b96c822dd 100644
--- a/clients/client-iot-events/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-events/protocols/Aws_restJson1.ts
@@ -3179,7 +3179,9 @@ const deserializeAws_restJson1TransitionEvents = (output: any, context: __SerdeC
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.
diff --git a/clients/client-iot-jobs-data-plane/protocols/Aws_restJson1.ts b/clients/client-iot-jobs-data-plane/protocols/Aws_restJson1.ts
index 749fa45e7c38..3993ad61b825 100644
--- a/clients/client-iot-jobs-data-plane/protocols/Aws_restJson1.ts
+++ b/clients/client-iot-jobs-data-plane/protocols/Aws_restJson1.ts
@@ -785,7 +785,9 @@ const deserializeAws_restJson1JobExecutionSummaryList = (
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.
diff --git a/clients/client-iot/protocols/Aws_restJson1.ts b/clients/client-iot/protocols/Aws_restJson1.ts
index 6ebca1500944..a518bef438cf 100644
--- a/clients/client-iot/protocols/Aws_restJson1.ts
+++ b/clients/client-iot/protocols/Aws_restJson1.ts
@@ -32702,7 +32702,9 @@ const deserializeAws_restJson1ViolationEvents = (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.
diff --git a/clients/client-iotanalytics/protocols/Aws_restJson1.ts b/clients/client-iotanalytics/protocols/Aws_restJson1.ts
index 37c0f1388d03..22c5f0ba3748 100644
--- a/clients/client-iotanalytics/protocols/Aws_restJson1.ts
+++ b/clients/client-iotanalytics/protocols/Aws_restJson1.ts
@@ -5997,7 +5997,9 @@ const deserializeAws_restJson1VersioningConfiguration = (
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.
diff --git a/clients/client-iotsecuretunneling/protocols/Aws_json1_1.ts b/clients/client-iotsecuretunneling/protocols/Aws_json1_1.ts
index 3f9e3b4ffb37..a3ca2431c718 100644
--- a/clients/client-iotsecuretunneling/protocols/Aws_json1_1.ts
+++ b/clients/client-iotsecuretunneling/protocols/Aws_json1_1.ts
@@ -846,7 +846,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.
diff --git a/clients/client-iotsitewise/protocols/Aws_restJson1.ts b/clients/client-iotsitewise/protocols/Aws_restJson1.ts
index fccee6c072b5..6181378ea20a 100644
--- a/clients/client-iotsitewise/protocols/Aws_restJson1.ts
+++ b/clients/client-iotsitewise/protocols/Aws_restJson1.ts
@@ -9044,7 +9044,9 @@ const deserializeAws_restJson1Variant = (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.
diff --git a/clients/client-iotthingsgraph/protocols/Aws_json1_1.ts b/clients/client-iotthingsgraph/protocols/Aws_json1_1.ts
index 63c4a04827b2..b9eab67f48af 100644
--- a/clients/client-iotthingsgraph/protocols/Aws_json1_1.ts
+++ b/clients/client-iotthingsgraph/protocols/Aws_json1_1.ts
@@ -4800,7 +4800,9 @@ const deserializeAws_json1_1UploadEntityDefinitionsResponse = (
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.
diff --git a/clients/client-ivs/protocols/Aws_restJson1.ts b/clients/client-ivs/protocols/Aws_restJson1.ts
index 55a3255bb379..70f62e8a2917 100644
--- a/clients/client-ivs/protocols/Aws_restJson1.ts
+++ b/clients/client-ivs/protocols/Aws_restJson1.ts
@@ -2667,7 +2667,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.
diff --git a/clients/client-kafka/protocols/Aws_restJson1.ts b/clients/client-kafka/protocols/Aws_restJson1.ts
index 4706721a6698..6444ceb98b76 100644
--- a/clients/client-kafka/protocols/Aws_restJson1.ts
+++ b/clients/client-kafka/protocols/Aws_restJson1.ts
@@ -4859,7 +4859,9 @@ const deserializeAws_restJson1ZookeeperNodeInfo = (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.
diff --git a/clients/client-kendra/protocols/Aws_json1_1.ts b/clients/client-kendra/protocols/Aws_json1_1.ts
index fc957c568829..0ade7d13db6c 100644
--- a/clients/client-kendra/protocols/Aws_json1_1.ts
+++ b/clients/client-kendra/protocols/Aws_json1_1.ts
@@ -7116,7 +7116,9 @@ const deserializeAws_json1_1ValueImportanceMap = (output: any, context: __SerdeC
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.
diff --git a/clients/client-kinesis-analytics-v2/protocols/Aws_json1_1.ts b/clients/client-kinesis-analytics-v2/protocols/Aws_json1_1.ts
index 09ae4b5f90c2..93189e2db49c 100644
--- a/clients/client-kinesis-analytics-v2/protocols/Aws_json1_1.ts
+++ b/clients/client-kinesis-analytics-v2/protocols/Aws_json1_1.ts
@@ -5915,7 +5915,9 @@ const deserializeAws_json1_1VpcConfigurationDescriptions = (
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.
diff --git a/clients/client-kinesis-analytics/protocols/Aws_json1_1.ts b/clients/client-kinesis-analytics/protocols/Aws_json1_1.ts
index 9515394df768..f603265c8170 100644
--- a/clients/client-kinesis-analytics/protocols/Aws_json1_1.ts
+++ b/clients/client-kinesis-analytics/protocols/Aws_json1_1.ts
@@ -3886,7 +3886,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.
diff --git a/clients/client-kinesis-video-archived-media/protocols/Aws_restJson1.ts b/clients/client-kinesis-video-archived-media/protocols/Aws_restJson1.ts
index 3de2a9d9ca31..45c5c4ea9a34 100644
--- a/clients/client-kinesis-video-archived-media/protocols/Aws_restJson1.ts
+++ b/clients/client-kinesis-video-archived-media/protocols/Aws_restJson1.ts
@@ -991,7 +991,9 @@ const deserializeAws_restJson1FragmentList = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-kinesis-video-media/protocols/Aws_restJson1.ts b/clients/client-kinesis-video-media/protocols/Aws_restJson1.ts
index d77a4bca92b9..9c9db4c7fdf5 100644
--- a/clients/client-kinesis-video-media/protocols/Aws_restJson1.ts
+++ b/clients/client-kinesis-video-media/protocols/Aws_restJson1.ts
@@ -260,7 +260,9 @@ const serializeAws_restJson1StartSelector = (input: StartSelector, context: __Se
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.
diff --git a/clients/client-kinesis-video-signaling/protocols/Aws_restJson1.ts b/clients/client-kinesis-video-signaling/protocols/Aws_restJson1.ts
index 7cf1335d2fa3..eaba95f078b3 100644
--- a/clients/client-kinesis-video-signaling/protocols/Aws_restJson1.ts
+++ b/clients/client-kinesis-video-signaling/protocols/Aws_restJson1.ts
@@ -388,7 +388,9 @@ const deserializeAws_restJson1Uris = (output: any, context: __SerdeContext): str
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.
diff --git a/clients/client-kinesis-video/protocols/Aws_restJson1.ts b/clients/client-kinesis-video/protocols/Aws_restJson1.ts
index e1c11fd02017..b28b4286e173 100644
--- a/clients/client-kinesis-video/protocols/Aws_restJson1.ts
+++ b/clients/client-kinesis-video/protocols/Aws_restJson1.ts
@@ -2665,7 +2665,9 @@ const deserializeAws_restJson1StreamInfoList = (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.
diff --git a/clients/client-kinesis/protocols/Aws_json1_1.ts b/clients/client-kinesis/protocols/Aws_json1_1.ts
index 9039bf492527..f0973924060e 100644
--- a/clients/client-kinesis/protocols/Aws_json1_1.ts
+++ b/clients/client-kinesis/protocols/Aws_json1_1.ts
@@ -3972,7 +3972,9 @@ const deserializeAws_json1_1UpdateShardCountOutput = (output: any, context: __Se
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.
diff --git a/clients/client-kms/protocols/Aws_json1_1.ts b/clients/client-kms/protocols/Aws_json1_1.ts
index 7131561c5c6a..1e59641b6778 100644
--- a/clients/client-kms/protocols/Aws_json1_1.ts
+++ b/clients/client-kms/protocols/Aws_json1_1.ts
@@ -7221,7 +7221,9 @@ const deserializeAws_json1_1VerifyResponse = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-lakeformation/protocols/Aws_json1_1.ts b/clients/client-lakeformation/protocols/Aws_json1_1.ts
index 68b47b4dc1bd..708039e04695 100644
--- a/clients/client-lakeformation/protocols/Aws_json1_1.ts
+++ b/clients/client-lakeformation/protocols/Aws_json1_1.ts
@@ -2175,7 +2175,9 @@ const deserializeAws_json1_1UpdateResourceResponse = (output: any, context: __Se
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.
diff --git a/clients/client-lambda/protocols/Aws_restJson1.ts b/clients/client-lambda/protocols/Aws_restJson1.ts
index 1b2d309ceea2..41cdb97ac5b2 100644
--- a/clients/client-lambda/protocols/Aws_restJson1.ts
+++ b/clients/client-lambda/protocols/Aws_restJson1.ts
@@ -10319,7 +10319,9 @@ const deserializeAws_restJson1VpcConfigResponse = (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.
diff --git a/clients/client-lex-model-building-service/protocols/Aws_restJson1.ts b/clients/client-lex-model-building-service/protocols/Aws_restJson1.ts
index 3bd205600b0f..980929656c4a 100644
--- a/clients/client-lex-model-building-service/protocols/Aws_restJson1.ts
+++ b/clients/client-lex-model-building-service/protocols/Aws_restJson1.ts
@@ -6583,7 +6583,9 @@ const deserializeAws_restJson1UtteranceList = (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.
diff --git a/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts b/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts
index 2761a94a37f6..fa812e7c13f6 100644
--- a/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts
+++ b/clients/client-lex-runtime-service/protocols/Aws_restJson1.ts
@@ -1549,7 +1549,9 @@ const deserializeAws_restJson1StringMap = (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.
diff --git a/clients/client-license-manager/protocols/Aws_json1_1.ts b/clients/client-license-manager/protocols/Aws_json1_1.ts
index 30adefe28262..de8ad37158b4 100644
--- a/clients/client-license-manager/protocols/Aws_json1_1.ts
+++ b/clients/client-license-manager/protocols/Aws_json1_1.ts
@@ -7087,7 +7087,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.
diff --git a/clients/client-lightsail/protocols/Aws_json1_1.ts b/clients/client-lightsail/protocols/Aws_json1_1.ts
index 661989839f17..d4086f19421d 100644
--- a/clients/client-lightsail/protocols/Aws_json1_1.ts
+++ b/clients/client-lightsail/protocols/Aws_json1_1.ts
@@ -22766,7 +22766,9 @@ const deserializeAws_json1_1UpdateRelationalDatabaseResult = (
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.
diff --git a/clients/client-lookoutvision/protocols/Aws_restJson1.ts b/clients/client-lookoutvision/protocols/Aws_restJson1.ts
index b05e6afd6aa4..457c55e3b11d 100644
--- a/clients/client-lookoutvision/protocols/Aws_restJson1.ts
+++ b/clients/client-lookoutvision/protocols/Aws_restJson1.ts
@@ -2678,7 +2678,9 @@ const deserializeAws_restJson1S3Location = (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.
diff --git a/clients/client-machine-learning/protocols/Aws_json1_1.ts b/clients/client-machine-learning/protocols/Aws_json1_1.ts
index 6997ba7c24a0..e152c3947469 100644
--- a/clients/client-machine-learning/protocols/Aws_json1_1.ts
+++ b/clients/client-machine-learning/protocols/Aws_json1_1.ts
@@ -3967,7 +3967,9 @@ const deserializeAws_json1_1UpdateMLModelOutput = (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.
diff --git a/clients/client-macie/protocols/Aws_json1_1.ts b/clients/client-macie/protocols/Aws_json1_1.ts
index ed10d548d9a1..b0d11fbc7e46 100644
--- a/clients/client-macie/protocols/Aws_json1_1.ts
+++ b/clients/client-macie/protocols/Aws_json1_1.ts
@@ -1023,7 +1023,9 @@ const deserializeAws_json1_1UpdateS3ResourcesResult = (
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.
diff --git a/clients/client-macie2/protocols/Aws_restJson1.ts b/clients/client-macie2/protocols/Aws_restJson1.ts
index f15da3216a51..1e55a457492e 100644
--- a/clients/client-macie2/protocols/Aws_restJson1.ts
+++ b/clients/client-macie2/protocols/Aws_restJson1.ts
@@ -8953,7 +8953,9 @@ const deserializeAws_restJson1WeeklySchedule = (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.
diff --git a/clients/client-managedblockchain/protocols/Aws_restJson1.ts b/clients/client-managedblockchain/protocols/Aws_restJson1.ts
index e404319312c6..964adb2f81d7 100644
--- a/clients/client-managedblockchain/protocols/Aws_restJson1.ts
+++ b/clients/client-managedblockchain/protocols/Aws_restJson1.ts
@@ -3480,7 +3480,9 @@ const deserializeAws_restJson1VotingPolicy = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-marketplace-catalog/protocols/Aws_restJson1.ts b/clients/client-marketplace-catalog/protocols/Aws_restJson1.ts
index 1bee446b11a8..faa455989c6a 100644
--- a/clients/client-marketplace-catalog/protocols/Aws_restJson1.ts
+++ b/clients/client-marketplace-catalog/protocols/Aws_restJson1.ts
@@ -1125,7 +1125,9 @@ const deserializeAws_restJson1ResourceIdList = (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.
diff --git a/clients/client-marketplace-commerce-analytics/protocols/Aws_json1_1.ts b/clients/client-marketplace-commerce-analytics/protocols/Aws_json1_1.ts
index c794d1701816..20f57816058f 100644
--- a/clients/client-marketplace-commerce-analytics/protocols/Aws_json1_1.ts
+++ b/clients/client-marketplace-commerce-analytics/protocols/Aws_json1_1.ts
@@ -250,7 +250,9 @@ const deserializeAws_json1_1StartSupportDataExportResult = (
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.
diff --git a/clients/client-marketplace-entitlement-service/protocols/Aws_json1_1.ts b/clients/client-marketplace-entitlement-service/protocols/Aws_json1_1.ts
index 6155bcf85c0b..1ad6534d355e 100644
--- a/clients/client-marketplace-entitlement-service/protocols/Aws_json1_1.ts
+++ b/clients/client-marketplace-entitlement-service/protocols/Aws_json1_1.ts
@@ -276,7 +276,9 @@ const deserializeAws_json1_1ThrottlingException = (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.
diff --git a/clients/client-marketplace-metering/protocols/Aws_json1_1.ts b/clients/client-marketplace-metering/protocols/Aws_json1_1.ts
index 40b8746a1d91..b7c7084d2110 100644
--- a/clients/client-marketplace-metering/protocols/Aws_json1_1.ts
+++ b/clients/client-marketplace-metering/protocols/Aws_json1_1.ts
@@ -1167,7 +1167,9 @@ const deserializeAws_json1_1UsageRecordResultList = (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.
diff --git a/clients/client-mediaconnect/protocols/Aws_restJson1.ts b/clients/client-mediaconnect/protocols/Aws_restJson1.ts
index 9eb45e8139cb..433e9fcd4785 100644
--- a/clients/client-mediaconnect/protocols/Aws_restJson1.ts
+++ b/clients/client-mediaconnect/protocols/Aws_restJson1.ts
@@ -4274,7 +4274,9 @@ const deserializeAws_restJson1VpcInterfaceAttachment = (
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.
diff --git a/clients/client-mediaconvert/protocols/Aws_restJson1.ts b/clients/client-mediaconvert/protocols/Aws_restJson1.ts
index 87da0e43b521..7c71f7c83b9a 100644
--- a/clients/client-mediaconvert/protocols/Aws_restJson1.ts
+++ b/clients/client-mediaconvert/protocols/Aws_restJson1.ts
@@ -9853,7 +9853,9 @@ const deserializeAws_restJson1WavSettings = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-medialive/protocols/Aws_restJson1.ts b/clients/client-medialive/protocols/Aws_restJson1.ts
index d07d7f10f07b..19457e3bd120 100644
--- a/clients/client-medialive/protocols/Aws_restJson1.ts
+++ b/clients/client-medialive/protocols/Aws_restJson1.ts
@@ -15787,7 +15787,9 @@ const deserializeAws_restJson1WebvttDestinationSettings = (
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.
diff --git a/clients/client-mediapackage-vod/protocols/Aws_restJson1.ts b/clients/client-mediapackage-vod/protocols/Aws_restJson1.ts
index feafdc81d307..10d22e053321 100644
--- a/clients/client-mediapackage-vod/protocols/Aws_restJson1.ts
+++ b/clients/client-mediapackage-vod/protocols/Aws_restJson1.ts
@@ -2858,7 +2858,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.
diff --git a/clients/client-mediapackage/protocols/Aws_restJson1.ts b/clients/client-mediapackage/protocols/Aws_restJson1.ts
index 952dc9bc51db..c6f3613a96b3 100644
--- a/clients/client-mediapackage/protocols/Aws_restJson1.ts
+++ b/clients/client-mediapackage/protocols/Aws_restJson1.ts
@@ -3643,7 +3643,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.
diff --git a/clients/client-mediastore-data/protocols/Aws_restJson1.ts b/clients/client-mediastore-data/protocols/Aws_restJson1.ts
index 2c3951be5329..a0588099df75 100644
--- a/clients/client-mediastore-data/protocols/Aws_restJson1.ts
+++ b/clients/client-mediastore-data/protocols/Aws_restJson1.ts
@@ -684,7 +684,9 @@ const deserializeAws_restJson1ItemList = (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.
diff --git a/clients/client-mediastore/protocols/Aws_json1_1.ts b/clients/client-mediastore/protocols/Aws_json1_1.ts
index 07f5fceccd7a..cdf72e3d3ab1 100644
--- a/clients/client-mediastore/protocols/Aws_json1_1.ts
+++ b/clients/client-mediastore/protocols/Aws_json1_1.ts
@@ -2609,7 +2609,9 @@ const deserializeAws_json1_1UntagResourceOutput = (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.
diff --git a/clients/client-mediatailor/protocols/Aws_restJson1.ts b/clients/client-mediatailor/protocols/Aws_restJson1.ts
index 10685fbb50cc..9deb9f1e857f 100644
--- a/clients/client-mediatailor/protocols/Aws_restJson1.ts
+++ b/clients/client-mediatailor/protocols/Aws_restJson1.ts
@@ -1034,7 +1034,9 @@ const deserializeAws_restJson1PlaybackConfiguration = (output: any, context: __S
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.
diff --git a/clients/client-migration-hub/protocols/Aws_json1_1.ts b/clients/client-migration-hub/protocols/Aws_json1_1.ts
index b2e41d70cbd0..995a4e7c69a3 100644
--- a/clients/client-migration-hub/protocols/Aws_json1_1.ts
+++ b/clients/client-migration-hub/protocols/Aws_json1_1.ts
@@ -3099,7 +3099,9 @@ const deserializeAws_json1_1UnauthorizedOperation = (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.
diff --git a/clients/client-migrationhub-config/protocols/Aws_json1_1.ts b/clients/client-migrationhub-config/protocols/Aws_json1_1.ts
index 21ac21c214ea..95b23671648c 100644
--- a/clients/client-migrationhub-config/protocols/Aws_json1_1.ts
+++ b/clients/client-migrationhub-config/protocols/Aws_json1_1.ts
@@ -574,7 +574,9 @@ const deserializeAws_json1_1ThrottlingException = (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.
diff --git a/clients/client-mobile/protocols/Aws_restJson1.ts b/clients/client-mobile/protocols/Aws_restJson1.ts
index 3c09b0080ae1..757c6ceed9a1 100644
--- a/clients/client-mobile/protocols/Aws_restJson1.ts
+++ b/clients/client-mobile/protocols/Aws_restJson1.ts
@@ -1418,7 +1418,9 @@ const deserializeAws_restJson1Resources = (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.
diff --git a/clients/client-mq/protocols/Aws_restJson1.ts b/clients/client-mq/protocols/Aws_restJson1.ts
index 11ca851ff396..8be71d148f86 100644
--- a/clients/client-mq/protocols/Aws_restJson1.ts
+++ b/clients/client-mq/protocols/Aws_restJson1.ts
@@ -3501,7 +3501,9 @@ const deserializeAws_restJson1WeeklyStartTime = (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.
diff --git a/clients/client-mturk/protocols/Aws_json1_1.ts b/clients/client-mturk/protocols/Aws_json1_1.ts
index e2ea647c7738..789f2ee25693 100644
--- a/clients/client-mturk/protocols/Aws_json1_1.ts
+++ b/clients/client-mturk/protocols/Aws_json1_1.ts
@@ -4774,7 +4774,9 @@ const deserializeAws_json1_1WorkerBlockList = (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.
diff --git a/clients/client-neptune/protocols/Aws_query.ts b/clients/client-neptune/protocols/Aws_query.ts
index be0b9ee40654..bf2e09fe54c3 100644
--- a/clients/client-neptune/protocols/Aws_query.ts
+++ b/clients/client-neptune/protocols/Aws_query.ts
@@ -13121,7 +13121,9 @@ const deserializeAws_queryVpcSecurityGroupMembershipList = (
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.
diff --git a/clients/client-network-firewall/protocols/Aws_json1_0.ts b/clients/client-network-firewall/protocols/Aws_json1_0.ts
index eb55771842cf..3b3ad9060d4e 100644
--- a/clients/client-network-firewall/protocols/Aws_json1_0.ts
+++ b/clients/client-network-firewall/protocols/Aws_json1_0.ts
@@ -5314,7 +5314,9 @@ const deserializeAws_json1_0VariableDefinitionList = (output: any, context: __Se
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.
diff --git a/clients/client-networkmanager/protocols/Aws_restJson1.ts b/clients/client-networkmanager/protocols/Aws_restJson1.ts
index 1e7509671670..25286dd8a8d7 100644
--- a/clients/client-networkmanager/protocols/Aws_restJson1.ts
+++ b/clients/client-networkmanager/protocols/Aws_restJson1.ts
@@ -5354,7 +5354,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.
diff --git a/clients/client-opsworks/protocols/Aws_json1_1.ts b/clients/client-opsworks/protocols/Aws_json1_1.ts
index 4f7073f53294..4b8bc5d16c15 100644
--- a/clients/client-opsworks/protocols/Aws_json1_1.ts
+++ b/clients/client-opsworks/protocols/Aws_json1_1.ts
@@ -8635,7 +8635,9 @@ const deserializeAws_json1_1WeeklyAutoScalingSchedule = (
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.
diff --git a/clients/client-opsworkscm/protocols/Aws_json1_1.ts b/clients/client-opsworkscm/protocols/Aws_json1_1.ts
index db6c218a0350..b499fdfd44a9 100644
--- a/clients/client-opsworkscm/protocols/Aws_json1_1.ts
+++ b/clients/client-opsworkscm/protocols/Aws_json1_1.ts
@@ -2467,7 +2467,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.
diff --git a/clients/client-organizations/protocols/Aws_json1_1.ts b/clients/client-organizations/protocols/Aws_json1_1.ts
index 09e40969be83..7db7d60a15b9 100644
--- a/clients/client-organizations/protocols/Aws_json1_1.ts
+++ b/clients/client-organizations/protocols/Aws_json1_1.ts
@@ -8916,7 +8916,9 @@ const deserializeAws_json1_1UpdatePolicyResponse = (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.
diff --git a/clients/client-outposts/protocols/Aws_restJson1.ts b/clients/client-outposts/protocols/Aws_restJson1.ts
index 4d89608e254d..3d3aaaf95318 100644
--- a/clients/client-outposts/protocols/Aws_restJson1.ts
+++ b/clients/client-outposts/protocols/Aws_restJson1.ts
@@ -972,7 +972,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.
diff --git a/clients/client-personalize-events/protocols/Aws_restJson1.ts b/clients/client-personalize-events/protocols/Aws_restJson1.ts
index 38efcd686832..37cb89b311d7 100644
--- a/clients/client-personalize-events/protocols/Aws_restJson1.ts
+++ b/clients/client-personalize-events/protocols/Aws_restJson1.ts
@@ -372,7 +372,9 @@ const serializeAws_restJson1UserList = (input: User[], 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.
diff --git a/clients/client-personalize-runtime/protocols/Aws_restJson1.ts b/clients/client-personalize-runtime/protocols/Aws_restJson1.ts
index f3079990bf82..60ca173293eb 100644
--- a/clients/client-personalize-runtime/protocols/Aws_restJson1.ts
+++ b/clients/client-personalize-runtime/protocols/Aws_restJson1.ts
@@ -300,7 +300,9 @@ const deserializeAws_restJson1PredictedItem = (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.
diff --git a/clients/client-personalize/protocols/Aws_json1_1.ts b/clients/client-personalize/protocols/Aws_json1_1.ts
index 181897bd3b34..32dcf842dc56 100644
--- a/clients/client-personalize/protocols/Aws_json1_1.ts
+++ b/clients/client-personalize/protocols/Aws_json1_1.ts
@@ -6012,7 +6012,9 @@ const deserializeAws_json1_1UpdateCampaignResponse = (output: any, context: __Se
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.
diff --git a/clients/client-pi/protocols/Aws_json1_1.ts b/clients/client-pi/protocols/Aws_json1_1.ts
index 1ace846d5f84..65493bce1454 100644
--- a/clients/client-pi/protocols/Aws_json1_1.ts
+++ b/clients/client-pi/protocols/Aws_json1_1.ts
@@ -545,7 +545,9 @@ const deserializeAws_json1_1ResponseResourceMetricKey = (
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.
diff --git a/clients/client-pinpoint-email/protocols/Aws_restJson1.ts b/clients/client-pinpoint-email/protocols/Aws_restJson1.ts
index dbb64d483a90..8c3828ed8ca9 100644
--- a/clients/client-pinpoint-email/protocols/Aws_restJson1.ts
+++ b/clients/client-pinpoint-email/protocols/Aws_restJson1.ts
@@ -5733,7 +5733,9 @@ const deserializeAws_restJson1VolumeStatistics = (output: any, context: __SerdeC
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.
diff --git a/clients/client-pinpoint-sms-voice/protocols/Aws_restJson1.ts b/clients/client-pinpoint-sms-voice/protocols/Aws_restJson1.ts
index 21c4fb2b2f3c..b7b5db00a3c8 100644
--- a/clients/client-pinpoint-sms-voice/protocols/Aws_restJson1.ts
+++ b/clients/client-pinpoint-sms-voice/protocols/Aws_restJson1.ts
@@ -1241,7 +1241,9 @@ const deserializeAws_restJson1SnsDestination = (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.
diff --git a/clients/client-pinpoint/protocols/Aws_restJson1.ts b/clients/client-pinpoint/protocols/Aws_restJson1.ts
index 80615bbbef0a..f0ee98062491 100644
--- a/clients/client-pinpoint/protocols/Aws_restJson1.ts
+++ b/clients/client-pinpoint/protocols/Aws_restJson1.ts
@@ -19955,7 +19955,9 @@ const deserializeAws_restJson1WaitTime = (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.
diff --git a/clients/client-polly/protocols/Aws_restJson1.ts b/clients/client-polly/protocols/Aws_restJson1.ts
index ef4f2545275b..0d2c5e8bb422 100644
--- a/clients/client-polly/protocols/Aws_restJson1.ts
+++ b/clients/client-polly/protocols/Aws_restJson1.ts
@@ -1641,7 +1641,9 @@ const deserializeAws_restJson1VoiceList = (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.
diff --git a/clients/client-pricing/protocols/Aws_json1_1.ts b/clients/client-pricing/protocols/Aws_json1_1.ts
index be9a3754e9bf..5c0c9e2c0b4e 100644
--- a/clients/client-pricing/protocols/Aws_json1_1.ts
+++ b/clients/client-pricing/protocols/Aws_json1_1.ts
@@ -591,7 +591,9 @@ const deserializeAws_json1_1ServiceList = (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.
diff --git a/clients/client-qldb-session/protocols/Aws_json1_0.ts b/clients/client-qldb-session/protocols/Aws_json1_0.ts
index cab894f90091..cdfc2d2db196 100644
--- a/clients/client-qldb-session/protocols/Aws_json1_0.ts
+++ b/clients/client-qldb-session/protocols/Aws_json1_0.ts
@@ -453,7 +453,9 @@ const deserializeAws_json1_0ValueHolders = (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.
diff --git a/clients/client-qldb/protocols/Aws_restJson1.ts b/clients/client-qldb/protocols/Aws_restJson1.ts
index d1e2a1924616..ce32aae41f80 100644
--- a/clients/client-qldb/protocols/Aws_restJson1.ts
+++ b/clients/client-qldb/protocols/Aws_restJson1.ts
@@ -2347,7 +2347,9 @@ const deserializeAws_restJson1ValueHolder = (output: any, context: __SerdeContex
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.
diff --git a/clients/client-quicksight/protocols/Aws_restJson1.ts b/clients/client-quicksight/protocols/Aws_restJson1.ts
index 92f412b2bf99..f5c91bb519fe 100644
--- a/clients/client-quicksight/protocols/Aws_restJson1.ts
+++ b/clients/client-quicksight/protocols/Aws_restJson1.ts
@@ -19379,7 +19379,9 @@ const deserializeAws_restJson1VpcConnectionProperties = (
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.
diff --git a/clients/client-ram/protocols/Aws_restJson1.ts b/clients/client-ram/protocols/Aws_restJson1.ts
index 13c30663c11d..f9304ebd2384 100644
--- a/clients/client-ram/protocols/Aws_restJson1.ts
+++ b/clients/client-ram/protocols/Aws_restJson1.ts
@@ -4220,7 +4220,9 @@ const deserializeAws_restJson1TagList = (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.
diff --git a/clients/client-rds-data/protocols/Aws_restJson1.ts b/clients/client-rds-data/protocols/Aws_restJson1.ts
index 29b1a0c2e23d..89cef1b5a325 100644
--- a/clients/client-rds-data/protocols/Aws_restJson1.ts
+++ b/clients/client-rds-data/protocols/Aws_restJson1.ts
@@ -1331,7 +1331,9 @@ const deserializeAws_restJson1Value = (output: any, context: __SerdeContext): Va
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.
diff --git a/clients/client-rds/protocols/Aws_query.ts b/clients/client-rds/protocols/Aws_query.ts
index 59227ae68afd..a858f84abdc5 100644
--- a/clients/client-rds/protocols/Aws_query.ts
+++ b/clients/client-rds/protocols/Aws_query.ts
@@ -27030,7 +27030,9 @@ const deserializeAws_queryVpnDetails = (output: any, context: __SerdeContext): V
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.
diff --git a/clients/client-redshift-data/protocols/Aws_json1_1.ts b/clients/client-redshift-data/protocols/Aws_json1_1.ts
index 254e799aaf82..e9b225bafef3 100644
--- a/clients/client-redshift-data/protocols/Aws_json1_1.ts
+++ b/clients/client-redshift-data/protocols/Aws_json1_1.ts
@@ -1230,7 +1230,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.
diff --git a/clients/client-redshift/protocols/Aws_query.ts b/clients/client-redshift/protocols/Aws_query.ts
index ac36d9ef774b..ffa7c2def201 100644
--- a/clients/client-redshift/protocols/Aws_query.ts
+++ b/clients/client-redshift/protocols/Aws_query.ts
@@ -18525,7 +18525,9 @@ const deserializeAws_queryVpcSecurityGroupMembershipList = (
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.
diff --git a/clients/client-rekognition/protocols/Aws_json1_1.ts b/clients/client-rekognition/protocols/Aws_json1_1.ts
index acf0297e4cb5..a6cb0d9d002b 100644
--- a/clients/client-rekognition/protocols/Aws_json1_1.ts
+++ b/clients/client-rekognition/protocols/Aws_json1_1.ts
@@ -9430,7 +9430,9 @@ const deserializeAws_json1_1VideoTooLargeException = (output: any, context: __Se
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.
diff --git a/clients/client-resource-groups-tagging-api/protocols/Aws_json1_1.ts b/clients/client-resource-groups-tagging-api/protocols/Aws_json1_1.ts
index 341264faaa9f..94bdf7466f74 100644
--- a/clients/client-resource-groups-tagging-api/protocols/Aws_json1_1.ts
+++ b/clients/client-resource-groups-tagging-api/protocols/Aws_json1_1.ts
@@ -1353,7 +1353,9 @@ const deserializeAws_json1_1UntagResourcesOutput = (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.
diff --git a/clients/client-resource-groups/protocols/Aws_restJson1.ts b/clients/client-resource-groups/protocols/Aws_restJson1.ts
index b63066b38eb5..99ecec247237 100644
--- a/clients/client-resource-groups/protocols/Aws_restJson1.ts
+++ b/clients/client-resource-groups/protocols/Aws_restJson1.ts
@@ -2458,7 +2458,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.
diff --git a/clients/client-robomaker/protocols/Aws_restJson1.ts b/clients/client-robomaker/protocols/Aws_restJson1.ts
index 401a74503cfb..2e5c4fea5581 100644
--- a/clients/client-robomaker/protocols/Aws_restJson1.ts
+++ b/clients/client-robomaker/protocols/Aws_restJson1.ts
@@ -9121,7 +9121,9 @@ const deserializeAws_restJson1WorldSummary = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-route-53-domains/protocols/Aws_json1_1.ts b/clients/client-route-53-domains/protocols/Aws_json1_1.ts
index a0380eb91415..3dcb0de3e62f 100644
--- a/clients/client-route-53-domains/protocols/Aws_json1_1.ts
+++ b/clients/client-route-53-domains/protocols/Aws_json1_1.ts
@@ -3557,7 +3557,9 @@ const deserializeAws_json1_1ViewBillingResponse = (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.
diff --git a/clients/client-route-53/protocols/Aws_restXml.ts b/clients/client-route-53/protocols/Aws_restXml.ts
index 5270faf1a211..12afaf7d2db3 100644
--- a/clients/client-route-53/protocols/Aws_restXml.ts
+++ b/clients/client-route-53/protocols/Aws_restXml.ts
@@ -8972,7 +8972,9 @@ const deserializeAws_restXmlVPCs = (output: any, context: __SerdeContext): VPC[]
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.
diff --git a/clients/client-route53resolver/protocols/Aws_json1_1.ts b/clients/client-route53resolver/protocols/Aws_json1_1.ts
index 29002e091fb0..488098ed756c 100644
--- a/clients/client-route53resolver/protocols/Aws_json1_1.ts
+++ b/clients/client-route53resolver/protocols/Aws_json1_1.ts
@@ -4995,7 +4995,9 @@ const deserializeAws_json1_1UpdateResolverRuleResponse = (
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.
diff --git a/clients/client-s3-control/protocols/Aws_restXml.ts b/clients/client-s3-control/protocols/Aws_restXml.ts
index 6456f7866810..b3f42f1e4e33 100644
--- a/clients/client-s3-control/protocols/Aws_restXml.ts
+++ b/clients/client-s3-control/protocols/Aws_restXml.ts
@@ -6732,7 +6732,9 @@ const deserializeAws_restXmlVpcConfiguration = (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.
diff --git a/clients/client-s3/protocols/Aws_restXml.ts b/clients/client-s3/protocols/Aws_restXml.ts
index eb8c685ba75b..723fe5df5e3b 100644
--- a/clients/client-s3/protocols/Aws_restXml.ts
+++ b/clients/client-s3/protocols/Aws_restXml.ts
@@ -14269,7 +14269,9 @@ const deserializeAws_restXmlTransitionList = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-s3outposts/protocols/Aws_restJson1.ts b/clients/client-s3outposts/protocols/Aws_restJson1.ts
index 1d46e9790ea3..6793b411d880 100644
--- a/clients/client-s3outposts/protocols/Aws_restJson1.ts
+++ b/clients/client-s3outposts/protocols/Aws_restJson1.ts
@@ -477,7 +477,9 @@ const deserializeAws_restJson1NetworkInterfaces = (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.
diff --git a/clients/client-sagemaker-a2i-runtime/protocols/Aws_restJson1.ts b/clients/client-sagemaker-a2i-runtime/protocols/Aws_restJson1.ts
index 193862dcac1f..55caf41f44d4 100644
--- a/clients/client-sagemaker-a2i-runtime/protocols/Aws_restJson1.ts
+++ b/clients/client-sagemaker-a2i-runtime/protocols/Aws_restJson1.ts
@@ -773,7 +773,9 @@ const deserializeAws_restJson1HumanLoopSummary = (output: any, context: __SerdeC
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.
diff --git a/clients/client-sagemaker-edge/protocols/Aws_restJson1.ts b/clients/client-sagemaker-edge/protocols/Aws_restJson1.ts
index 8025527fd205..d0fa23822218 100644
--- a/clients/client-sagemaker-edge/protocols/Aws_restJson1.ts
+++ b/clients/client-sagemaker-edge/protocols/Aws_restJson1.ts
@@ -244,7 +244,9 @@ const serializeAws_restJson1Models = (input: Model[], 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.
diff --git a/clients/client-sagemaker-featurestore-runtime/protocols/Aws_restJson1.ts b/clients/client-sagemaker-featurestore-runtime/protocols/Aws_restJson1.ts
index 6cc65663fd52..de95cc14e725 100644
--- a/clients/client-sagemaker-featurestore-runtime/protocols/Aws_restJson1.ts
+++ b/clients/client-sagemaker-featurestore-runtime/protocols/Aws_restJson1.ts
@@ -486,7 +486,9 @@ const deserializeAws_restJson1Record = (output: any, context: __SerdeContext): F
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.
diff --git a/clients/client-sagemaker-runtime/protocols/Aws_restJson1.ts b/clients/client-sagemaker-runtime/protocols/Aws_restJson1.ts
index a4906ead5743..d50baed513eb 100644
--- a/clients/client-sagemaker-runtime/protocols/Aws_restJson1.ts
+++ b/clients/client-sagemaker-runtime/protocols/Aws_restJson1.ts
@@ -224,7 +224,9 @@ const deserializeAws_restJson1ValidationErrorResponse = async (
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.
diff --git a/clients/client-sagemaker/protocols/Aws_json1_1.ts b/clients/client-sagemaker/protocols/Aws_json1_1.ts
index 570e2eb3c174..67946ba3d976 100644
--- a/clients/client-sagemaker/protocols/Aws_json1_1.ts
+++ b/clients/client-sagemaker/protocols/Aws_json1_1.ts
@@ -34181,7 +34181,9 @@ const deserializeAws_json1_1Workteams = (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.
diff --git a/clients/client-savingsplans/protocols/Aws_restJson1.ts b/clients/client-savingsplans/protocols/Aws_restJson1.ts
index 3b592648cb9e..82a2a507226e 100644
--- a/clients/client-savingsplans/protocols/Aws_restJson1.ts
+++ b/clients/client-savingsplans/protocols/Aws_restJson1.ts
@@ -1681,7 +1681,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.
diff --git a/clients/client-schemas/protocols/Aws_restJson1.ts b/clients/client-schemas/protocols/Aws_restJson1.ts
index 2b949fae56e1..23babde7bb31 100644
--- a/clients/client-schemas/protocols/Aws_restJson1.ts
+++ b/clients/client-schemas/protocols/Aws_restJson1.ts
@@ -4626,7 +4626,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.
diff --git a/clients/client-secrets-manager/protocols/Aws_json1_1.ts b/clients/client-secrets-manager/protocols/Aws_json1_1.ts
index 337b6fbe0b9c..b2f666d9e9db 100644
--- a/clients/client-secrets-manager/protocols/Aws_json1_1.ts
+++ b/clients/client-secrets-manager/protocols/Aws_json1_1.ts
@@ -2863,7 +2863,9 @@ const deserializeAws_json1_1ValidationErrorsType = (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.
diff --git a/clients/client-securityhub/protocols/Aws_restJson1.ts b/clients/client-securityhub/protocols/Aws_restJson1.ts
index a4403c18d75d..95fe63cb4fcb 100644
--- a/clients/client-securityhub/protocols/Aws_restJson1.ts
+++ b/clients/client-securityhub/protocols/Aws_restJson1.ts
@@ -16810,7 +16810,9 @@ const deserializeAws_restJson1Workflow = (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.
diff --git a/clients/client-serverlessapplicationrepository/protocols/Aws_restJson1.ts b/clients/client-serverlessapplicationrepository/protocols/Aws_restJson1.ts
index cc3687eb8611..d808e2009f60 100644
--- a/clients/client-serverlessapplicationrepository/protocols/Aws_restJson1.ts
+++ b/clients/client-serverlessapplicationrepository/protocols/Aws_restJson1.ts
@@ -2479,7 +2479,9 @@ const deserializeAws_restJson1VersionSummary = (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.
diff --git a/clients/client-service-catalog-appregistry/protocols/Aws_restJson1.ts b/clients/client-service-catalog-appregistry/protocols/Aws_restJson1.ts
index da1f75b2bf25..11d9b7686d74 100644
--- a/clients/client-service-catalog-appregistry/protocols/Aws_restJson1.ts
+++ b/clients/client-service-catalog-appregistry/protocols/Aws_restJson1.ts
@@ -2351,7 +2351,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.
diff --git a/clients/client-service-catalog/protocols/Aws_json1_1.ts b/clients/client-service-catalog/protocols/Aws_json1_1.ts
index 353cac0e0445..a9b18e969cd4 100644
--- a/clients/client-service-catalog/protocols/Aws_json1_1.ts
+++ b/clients/client-service-catalog/protocols/Aws_json1_1.ts
@@ -11238,7 +11238,9 @@ const deserializeAws_json1_1UsageInstructions = (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.
diff --git a/clients/client-service-quotas/protocols/Aws_json1_1.ts b/clients/client-service-quotas/protocols/Aws_json1_1.ts
index feeae2591983..f9220e122fba 100644
--- a/clients/client-service-quotas/protocols/Aws_json1_1.ts
+++ b/clients/client-service-quotas/protocols/Aws_json1_1.ts
@@ -2841,7 +2841,9 @@ const deserializeAws_json1_1TooManyRequestsException = (
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.
diff --git a/clients/client-servicediscovery/protocols/Aws_json1_1.ts b/clients/client-servicediscovery/protocols/Aws_json1_1.ts
index 11ba24fa3585..6174ad20c259 100644
--- a/clients/client-servicediscovery/protocols/Aws_json1_1.ts
+++ b/clients/client-servicediscovery/protocols/Aws_json1_1.ts
@@ -3341,7 +3341,9 @@ const deserializeAws_json1_1UpdateServiceResponse = (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.
diff --git a/clients/client-ses/protocols/Aws_query.ts b/clients/client-ses/protocols/Aws_query.ts
index 5daa2de397c4..79eee82cb562 100644
--- a/clients/client-ses/protocols/Aws_query.ts
+++ b/clients/client-ses/protocols/Aws_query.ts
@@ -10267,7 +10267,9 @@ const deserializeAws_queryWorkmailAction = (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.
diff --git a/clients/client-sesv2/protocols/Aws_restJson1.ts b/clients/client-sesv2/protocols/Aws_restJson1.ts
index b058a2655cea..09318a8b0586 100644
--- a/clients/client-sesv2/protocols/Aws_restJson1.ts
+++ b/clients/client-sesv2/protocols/Aws_restJson1.ts
@@ -10675,7 +10675,9 @@ const deserializeAws_restJson1VolumeStatistics = (output: any, context: __SerdeC
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.
diff --git a/clients/client-sfn/protocols/Aws_json1_0.ts b/clients/client-sfn/protocols/Aws_json1_0.ts
index a02dc316df87..197605e2ba8b 100644
--- a/clients/client-sfn/protocols/Aws_json1_0.ts
+++ b/clients/client-sfn/protocols/Aws_json1_0.ts
@@ -3890,7 +3890,9 @@ const deserializeAws_json1_0UpdateStateMachineOutput = (
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.
diff --git a/clients/client-shield/protocols/Aws_json1_1.ts b/clients/client-shield/protocols/Aws_json1_1.ts
index 6b043dfb5502..bc99450eaf4b 100644
--- a/clients/client-shield/protocols/Aws_json1_1.ts
+++ b/clients/client-shield/protocols/Aws_json1_1.ts
@@ -4291,7 +4291,9 @@ const deserializeAws_json1_1ValidationExceptionFieldList = (
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.
diff --git a/clients/client-signer/protocols/Aws_restJson1.ts b/clients/client-signer/protocols/Aws_restJson1.ts
index d058a7159c52..c8f19f45d04e 100644
--- a/clients/client-signer/protocols/Aws_restJson1.ts
+++ b/clients/client-signer/protocols/Aws_restJson1.ts
@@ -2916,7 +2916,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.
diff --git a/clients/client-sms/protocols/Aws_json1_1.ts b/clients/client-sms/protocols/Aws_json1_1.ts
index 751f6394e57e..495195fe740f 100644
--- a/clients/client-sms/protocols/Aws_json1_1.ts
+++ b/clients/client-sms/protocols/Aws_json1_1.ts
@@ -5756,7 +5756,9 @@ const deserializeAws_json1_1VmServerAddress = (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.
diff --git a/clients/client-snowball/protocols/Aws_json1_1.ts b/clients/client-snowball/protocols/Aws_json1_1.ts
index d3922fcdd9d2..369edea98006 100644
--- a/clients/client-snowball/protocols/Aws_json1_1.ts
+++ b/clients/client-snowball/protocols/Aws_json1_1.ts
@@ -3133,7 +3133,9 @@ const deserializeAws_json1_1WirelessConnection = (output: any, context: __SerdeC
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.
diff --git a/clients/client-sns/protocols/Aws_query.ts b/clients/client-sns/protocols/Aws_query.ts
index 0547534e168a..ba82ed12a119 100644
--- a/clients/client-sns/protocols/Aws_query.ts
+++ b/clients/client-sns/protocols/Aws_query.ts
@@ -5277,7 +5277,9 @@ const deserializeAws_queryUntagResourceResponse = (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.
diff --git a/clients/client-sqs/protocols/Aws_query.ts b/clients/client-sqs/protocols/Aws_query.ts
index 98ddc52402b3..9341aaac8c45 100644
--- a/clients/client-sqs/protocols/Aws_query.ts
+++ b/clients/client-sqs/protocols/Aws_query.ts
@@ -3088,7 +3088,9 @@ const deserializeAws_queryUnsupportedOperation = (output: any, context: __SerdeC
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.
diff --git a/clients/client-ssm/protocols/Aws_json1_1.ts b/clients/client-ssm/protocols/Aws_json1_1.ts
index fd8ffd61732b..5f5eabd22980 100644
--- a/clients/client-ssm/protocols/Aws_json1_1.ts
+++ b/clients/client-ssm/protocols/Aws_json1_1.ts
@@ -23569,7 +23569,9 @@ const deserializeAws_json1_1ValidNextStepList = (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.
diff --git a/clients/client-sso-admin/protocols/Aws_json1_1.ts b/clients/client-sso-admin/protocols/Aws_json1_1.ts
index 89d5e3feb5f3..76d7141ac753 100644
--- a/clients/client-sso-admin/protocols/Aws_json1_1.ts
+++ b/clients/client-sso-admin/protocols/Aws_json1_1.ts
@@ -4659,7 +4659,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.
diff --git a/clients/client-sso-oidc/protocols/Aws_restJson1.ts b/clients/client-sso-oidc/protocols/Aws_restJson1.ts
index bf30598bb39c..b23220c41b9a 100644
--- a/clients/client-sso-oidc/protocols/Aws_restJson1.ts
+++ b/clients/client-sso-oidc/protocols/Aws_restJson1.ts
@@ -734,7 +734,9 @@ const serializeAws_restJson1Scopes = (input: string[], 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.
diff --git a/clients/client-sso/models/models_0.ts b/clients/client-sso/models/models_0.ts
index 231a7045815c..38c260729a1d 100644
--- a/clients/client-sso/models/models_0.ts
+++ b/clients/client-sso/models/models_0.ts
@@ -5,6 +5,11 @@ import { MetadataBearer as $MetadataBearer } from "@aws-sdk/types";
* Provides information about your AWS account.
*/
export interface AccountInfo {
+ /**
+ * The identifier of the AWS account that is assigned to the user.
+ */
+ accountId?: string;
+
/**
* The display name of the AWS account that is assigned to the user.
*/
@@ -14,11 +19,6 @@ export interface AccountInfo {
* The email address of the AWS account that is assigned to the user.
*/
emailAddress?: string;
-
- /**
- * The identifier of the AWS account that is assigned to the user.
- */
- accountId?: string;
}
export namespace AccountInfo {
@@ -34,15 +34,15 @@ export interface GetRoleCredentialsRequest {
roleName: string | undefined;
/**
- * The token issued by the CreateToken API call. For more information, see
- * CreateToken in the AWS SSO OIDC API Reference Guide.
+ * The identifier for the AWS account that is assigned to the user.
*/
- accessToken: string | undefined;
+ accountId: string | undefined;
/**
- * The identifier for the AWS account that is assigned to the user.
+ * The token issued by the CreateToken API call. For more information, see
+ * CreateToken in the AWS SSO OIDC API Reference Guide.
*/
- accountId: string | undefined;
+ accessToken: string | undefined;
}
export namespace GetRoleCredentialsRequest {
@@ -57,35 +57,35 @@ export namespace GetRoleCredentialsRequest {
*/
export interface RoleCredentials {
/**
- * The date on which temporary security credentials expire.
+ * The identifier used for the temporary security credentials. For more information, see
+ * Using Temporary Security Credentials to Request Access to AWS Resources in the
+ * AWS IAM User Guide.
*/
- expiration?: number;
+ accessKeyId?: string;
/**
- * The token used for temporary credentials. For more information, see Using Temporary Security Credentials to Request Access to AWS Resources in the
+ *
The key that is used to sign the request. For more information, see Using Temporary Security Credentials to Request Access to AWS Resources in the
* AWS IAM User Guide.
*/
- sessionToken?: string;
+ secretAccessKey?: string;
/**
- * The identifier used for the temporary security credentials. For more information, see
- * Using Temporary Security Credentials to Request Access to AWS Resources in the
+ *
The token used for temporary credentials. For more information, see Using Temporary Security Credentials to Request Access to AWS Resources in the
* AWS IAM User Guide.
*/
- accessKeyId?: string;
+ sessionToken?: string;
/**
- * The key that is used to sign the request. For more information, see Using Temporary Security Credentials to Request Access to AWS Resources in the
- * AWS IAM User Guide.
+ * The date on which temporary security credentials expire.
*/
- secretAccessKey?: string;
+ expiration?: number;
}
export namespace RoleCredentials {
export const filterSensitiveLog = (obj: RoleCredentials): any => ({
...obj,
- ...(obj.sessionToken && { sessionToken: SENSITIVE_STRING }),
...(obj.secretAccessKey && { secretAccessKey: SENSITIVE_STRING }),
+ ...(obj.sessionToken && { sessionToken: SENSITIVE_STRING }),
});
}
@@ -166,10 +166,9 @@ export namespace UnauthorizedException {
export interface ListAccountRolesRequest {
/**
- * The token issued by the CreateToken API call. For more information, see
- * CreateToken in the AWS SSO OIDC API Reference Guide.
+ * The page token from the previous response output when you request subsequent pages.
*/
- accessToken: string | undefined;
+ nextToken?: string;
/**
* The number of items that clients can request per page.
@@ -177,14 +176,15 @@ export interface ListAccountRolesRequest {
maxResults?: number;
/**
- * The identifier for the AWS account that is assigned to the user.
+ * The token issued by the CreateToken API call. For more information, see
+ * CreateToken in the AWS SSO OIDC API Reference Guide.
*/
- accountId: string | undefined;
+ accessToken: string | undefined;
/**
- * The page token from the previous response output when you request subsequent pages.
+ * The identifier for the AWS account that is assigned to the user.
*/
- nextToken?: string;
+ accountId: string | undefined;
}
export namespace ListAccountRolesRequest {
@@ -199,14 +199,14 @@ export namespace ListAccountRolesRequest {
*/
export interface RoleInfo {
/**
- * The identifier of the AWS account assigned to the user.
+ * The friendly name of the role that is assigned to the user.
*/
- accountId?: string;
+ roleName?: string;
/**
- * The friendly name of the role that is assigned to the user.
+ * The identifier of the AWS account assigned to the user.
*/
- roleName?: string;
+ accountId?: string;
}
export namespace RoleInfo {
@@ -217,14 +217,14 @@ export namespace RoleInfo {
export interface ListAccountRolesResponse {
/**
- * A paginated response with the list of roles and the next token if more results are available.
+ * The page token client that is used to retrieve the list of accounts.
*/
- roleList?: RoleInfo[];
+ nextToken?: string;
/**
- * The page token client that is used to retrieve the list of accounts.
+ * A paginated response with the list of roles and the next token if more results are available.
*/
- nextToken?: string;
+ roleList?: RoleInfo[];
}
export namespace ListAccountRolesResponse {
@@ -235,10 +235,9 @@ export namespace ListAccountRolesResponse {
export interface ListAccountsRequest {
/**
- * The token issued by the CreateToken API call. For more information, see
- * CreateToken in the AWS SSO OIDC API Reference Guide.
+ * (Optional) When requesting subsequent pages, this is the page token from the previous response output.
*/
- accessToken: string | undefined;
+ nextToken?: string;
/**
* This is the number of items clients can request per page.
@@ -246,9 +245,10 @@ export interface ListAccountsRequest {
maxResults?: number;
/**
- * (Optional) When requesting subsequent pages, this is the page token from the previous response output.
+ * The token issued by the CreateToken API call. For more information, see
+ * CreateToken in the AWS SSO OIDC API Reference Guide.
*/
- nextToken?: string;
+ accessToken: string | undefined;
}
export namespace ListAccountsRequest {
@@ -260,14 +260,14 @@ export namespace ListAccountsRequest {
export interface ListAccountsResponse {
/**
- * A paginated response with the list of account information and the next token if more results are available.
+ * The page token client that is used to retrieve the list of accounts.
*/
- accountList?: AccountInfo[];
+ nextToken?: string;
/**
- * The page token client that is used to retrieve the list of accounts.
+ * A paginated response with the list of account information and the next token if more results are available.
*/
- nextToken?: string;
+ accountList?: AccountInfo[];
}
export namespace ListAccountsResponse {
diff --git a/clients/client-sso/protocols/Aws_restJson1.ts b/clients/client-sso/protocols/Aws_restJson1.ts
index 79370f4975ae..2d7e914ab3bb 100644
--- a/clients/client-sso/protocols/Aws_restJson1.ts
+++ b/clients/client-sso/protocols/Aws_restJson1.ts
@@ -58,9 +58,9 @@ export const serializeAws_restJson1ListAccountRolesCommand = async (
};
let resolvedPath = "/assignment/roles";
const query: any = {
+ ...(input.nextToken !== undefined && { next_token: input.nextToken }),
...(input.maxResults !== undefined && { max_result: input.maxResults.toString() }),
...(input.accountId !== undefined && { account_id: input.accountId }),
- ...(input.nextToken !== undefined && { next_token: input.nextToken }),
};
let body: any;
const { hostname, protocol = "https", port } = await context.endpoint();
@@ -85,8 +85,8 @@ export const serializeAws_restJson1ListAccountsCommand = async (
};
let resolvedPath = "/assignment/accounts";
const query: any = {
- ...(input.maxResults !== undefined && { max_result: input.maxResults.toString() }),
...(input.nextToken !== undefined && { next_token: input.nextToken }),
+ ...(input.maxResults !== undefined && { max_result: input.maxResults.toString() }),
};
let body: any;
const { hostname, protocol = "https", port } = await context.endpoint();
@@ -552,7 +552,9 @@ const deserializeAws_restJson1RoleListType = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-storage-gateway/protocols/Aws_json1_1.ts b/clients/client-storage-gateway/protocols/Aws_json1_1.ts
index bbd9d51d3c45..2961cc51d1a4 100644
--- a/clients/client-storage-gateway/protocols/Aws_json1_1.ts
+++ b/clients/client-storage-gateway/protocols/Aws_json1_1.ts
@@ -9818,7 +9818,9 @@ const deserializeAws_json1_1VTLDevices = (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.
diff --git a/clients/client-sts/protocols/Aws_query.ts b/clients/client-sts/protocols/Aws_query.ts
index 9a600c0eb3c2..dd60bf512202 100644
--- a/clients/client-sts/protocols/Aws_query.ts
+++ b/clients/client-sts/protocols/Aws_query.ts
@@ -1413,7 +1413,9 @@ const deserializeAws_queryRegionDisabledException = (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.
diff --git a/clients/client-support/protocols/Aws_json1_1.ts b/clients/client-support/protocols/Aws_json1_1.ts
index b534eb0cbab5..9b23e00c70a3 100644
--- a/clients/client-support/protocols/Aws_json1_1.ts
+++ b/clients/client-support/protocols/Aws_json1_1.ts
@@ -2118,7 +2118,9 @@ const deserializeAws_json1_1TrustedAdvisorResourcesSummary = (
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.
diff --git a/clients/client-swf/protocols/Aws_json1_0.ts b/clients/client-swf/protocols/Aws_json1_0.ts
index ee62c32eb329..0621672e9192 100644
--- a/clients/client-swf/protocols/Aws_json1_0.ts
+++ b/clients/client-swf/protocols/Aws_json1_0.ts
@@ -6123,7 +6123,9 @@ const deserializeAws_json1_0WorkflowTypeInfos = (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.
diff --git a/clients/client-synthetics/protocols/Aws_restJson1.ts b/clients/client-synthetics/protocols/Aws_restJson1.ts
index 3e594c268aef..700dd2fab334 100644
--- a/clients/client-synthetics/protocols/Aws_restJson1.ts
+++ b/clients/client-synthetics/protocols/Aws_restJson1.ts
@@ -1801,7 +1801,9 @@ const deserializeAws_restJson1VpcConfigOutput = (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.
diff --git a/clients/client-textract/protocols/Aws_json1_1.ts b/clients/client-textract/protocols/Aws_json1_1.ts
index f7150ee8303c..0daf07ea285c 100644
--- a/clients/client-textract/protocols/Aws_json1_1.ts
+++ b/clients/client-textract/protocols/Aws_json1_1.ts
@@ -1696,7 +1696,9 @@ const deserializeAws_json1_1Warnings = (output: any, context: __SerdeContext): W
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.
diff --git a/clients/client-timestream-query/protocols/Aws_json1_0.ts b/clients/client-timestream-query/protocols/Aws_json1_0.ts
index e9a61dfdacad..26da307aac1f 100644
--- a/clients/client-timestream-query/protocols/Aws_json1_0.ts
+++ b/clients/client-timestream-query/protocols/Aws_json1_0.ts
@@ -697,7 +697,9 @@ const deserializeAws_json1_0ValidationException = (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.
diff --git a/clients/client-timestream-write/protocols/Aws_json1_0.ts b/clients/client-timestream-write/protocols/Aws_json1_0.ts
index 0297f576ce21..a780a3e50d55 100644
--- a/clients/client-timestream-write/protocols/Aws_json1_0.ts
+++ b/clients/client-timestream-write/protocols/Aws_json1_0.ts
@@ -2305,7 +2305,9 @@ const deserializeAws_json1_0ValidationException = (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.
diff --git a/clients/client-transcribe-streaming/protocols/Aws_restJson1.ts b/clients/client-transcribe-streaming/protocols/Aws_restJson1.ts
index 7e205842ffce..d7c7752f37db 100644
--- a/clients/client-transcribe-streaming/protocols/Aws_restJson1.ts
+++ b/clients/client-transcribe-streaming/protocols/Aws_restJson1.ts
@@ -884,7 +884,9 @@ const deserializeAws_restJson1TranscriptEvent = (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.
diff --git a/clients/client-transcribe/protocols/Aws_json1_1.ts b/clients/client-transcribe/protocols/Aws_json1_1.ts
index 0ef56a02f7bd..1d1371f93c6d 100644
--- a/clients/client-transcribe/protocols/Aws_json1_1.ts
+++ b/clients/client-transcribe/protocols/Aws_json1_1.ts
@@ -3896,7 +3896,9 @@ const deserializeAws_json1_1VocabularyInfo = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-transfer/protocols/Aws_json1_1.ts b/clients/client-transfer/protocols/Aws_json1_1.ts
index cefce5623c99..f987a9d104a5 100644
--- a/clients/client-transfer/protocols/Aws_json1_1.ts
+++ b/clients/client-transfer/protocols/Aws_json1_1.ts
@@ -2992,7 +2992,9 @@ const deserializeAws_json1_1UpdateUserResponse = (output: any, context: __SerdeC
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.
diff --git a/clients/client-translate/protocols/Aws_json1_1.ts b/clients/client-translate/protocols/Aws_json1_1.ts
index 647f81c58223..232753e9d305 100644
--- a/clients/client-translate/protocols/Aws_json1_1.ts
+++ b/clients/client-translate/protocols/Aws_json1_1.ts
@@ -2483,7 +2483,9 @@ const deserializeAws_json1_1UpdateParallelDataResponse = (
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.
diff --git a/clients/client-waf-regional/protocols/Aws_json1_1.ts b/clients/client-waf-regional/protocols/Aws_json1_1.ts
index 5de5428a30b5..bf34d473cac0 100644
--- a/clients/client-waf-regional/protocols/Aws_json1_1.ts
+++ b/clients/client-waf-regional/protocols/Aws_json1_1.ts
@@ -11706,7 +11706,9 @@ const deserializeAws_json1_1XssMatchTuples = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-waf/protocols/Aws_json1_1.ts b/clients/client-waf/protocols/Aws_json1_1.ts
index ff63c82e4b7d..a32279067233 100644
--- a/clients/client-waf/protocols/Aws_json1_1.ts
+++ b/clients/client-waf/protocols/Aws_json1_1.ts
@@ -11199,7 +11199,9 @@ const deserializeAws_json1_1XssMatchTuples = (output: any, context: __SerdeConte
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.
diff --git a/clients/client-wafv2/protocols/Aws_json1_1.ts b/clients/client-wafv2/protocols/Aws_json1_1.ts
index be8bd9f5f137..c41dffdc704a 100644
--- a/clients/client-wafv2/protocols/Aws_json1_1.ts
+++ b/clients/client-wafv2/protocols/Aws_json1_1.ts
@@ -7085,7 +7085,9 @@ const deserializeAws_json1_1XssMatchStatement = (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.
diff --git a/clients/client-workdocs/protocols/Aws_restJson1.ts b/clients/client-workdocs/protocols/Aws_restJson1.ts
index d4ced33d36c7..49f4befded38 100644
--- a/clients/client-workdocs/protocols/Aws_restJson1.ts
+++ b/clients/client-workdocs/protocols/Aws_restJson1.ts
@@ -6600,7 +6600,9 @@ const deserializeAws_restJson1UserStorageMetadata = (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.
diff --git a/clients/client-worklink/protocols/Aws_restJson1.ts b/clients/client-worklink/protocols/Aws_restJson1.ts
index f7f7aab4ab21..5821d2d5d5a0 100644
--- a/clients/client-worklink/protocols/Aws_restJson1.ts
+++ b/clients/client-worklink/protocols/Aws_restJson1.ts
@@ -4147,7 +4147,9 @@ const deserializeAws_restJson1WebsiteCaSummaryList = (output: any, context: __Se
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.
diff --git a/clients/client-workmail/protocols/Aws_json1_1.ts b/clients/client-workmail/protocols/Aws_json1_1.ts
index e0fcbe390fd8..6403c081fd42 100644
--- a/clients/client-workmail/protocols/Aws_json1_1.ts
+++ b/clients/client-workmail/protocols/Aws_json1_1.ts
@@ -4892,7 +4892,9 @@ const deserializeAws_json1_1Users = (output: any, context: __SerdeContext): User
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.
diff --git a/clients/client-workmailmessageflow/protocols/Aws_restJson1.ts b/clients/client-workmailmessageflow/protocols/Aws_restJson1.ts
index b7926e5565d9..040a0d9f9efc 100644
--- a/clients/client-workmailmessageflow/protocols/Aws_restJson1.ts
+++ b/clients/client-workmailmessageflow/protocols/Aws_restJson1.ts
@@ -115,7 +115,9 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (
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.
diff --git a/clients/client-workspaces/protocols/Aws_json1_1.ts b/clients/client-workspaces/protocols/Aws_json1_1.ts
index 739bb20d68d1..0b031a25dced 100644
--- a/clients/client-workspaces/protocols/Aws_json1_1.ts
+++ b/clients/client-workspaces/protocols/Aws_json1_1.ts
@@ -7074,7 +7074,9 @@ const deserializeAws_json1_1WorkspacesIpGroupsList = (output: any, context: __Se
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.
diff --git a/clients/client-xray/protocols/Aws_restJson1.ts b/clients/client-xray/protocols/Aws_restJson1.ts
index 012212d60f8e..75ea99511ec6 100644
--- a/clients/client-xray/protocols/Aws_restJson1.ts
+++ b/clients/client-xray/protocols/Aws_restJson1.ts
@@ -4273,7 +4273,9 @@ const deserializeAws_restJson1ValueWithServiceIds = (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.
diff --git a/protocol_tests/aws-ec2/protocols/Aws_ec2.ts b/protocol_tests/aws-ec2/protocols/Aws_ec2.ts
index 70bbf25b8d13..25b4775ad924 100644
--- a/protocol_tests/aws-ec2/protocols/Aws_ec2.ts
+++ b/protocol_tests/aws-ec2/protocols/Aws_ec2.ts
@@ -1943,7 +1943,9 @@ const deserializeAws_ec2TimestampList = (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.
diff --git a/protocol_tests/aws-json/protocols/Aws_json1_1.ts b/protocol_tests/aws-json/protocols/Aws_json1_1.ts
index b300d3b01104..0d017ee528d1 100644
--- a/protocol_tests/aws-json/protocols/Aws_json1_1.ts
+++ b/protocol_tests/aws-json/protocols/Aws_json1_1.ts
@@ -1481,7 +1481,9 @@ const deserializeAws_json1_1StringMap = (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.
diff --git a/protocol_tests/aws-query/protocols/Aws_query.ts b/protocol_tests/aws-query/protocols/Aws_query.ts
index 586c3eec8900..46991eadfa21 100644
--- a/protocol_tests/aws-query/protocols/Aws_query.ts
+++ b/protocol_tests/aws-query/protocols/Aws_query.ts
@@ -2719,7 +2719,9 @@ const deserializeAws_queryTimestampList = (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.
diff --git a/protocol_tests/aws-restjson/protocols/Aws_restJson1.ts b/protocol_tests/aws-restjson/protocols/Aws_restJson1.ts
index 80cf1e5ed120..952b7b25873e 100644
--- a/protocol_tests/aws-restjson/protocols/Aws_restJson1.ts
+++ b/protocol_tests/aws-restjson/protocols/Aws_restJson1.ts
@@ -4003,7 +4003,9 @@ const deserializeAws_restJson1TimestampList = (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.
diff --git a/protocol_tests/aws-restxml/protocols/Aws_restXml.ts b/protocol_tests/aws-restxml/protocols/Aws_restXml.ts
index 71ba11ea9656..70f40ff3194e 100644
--- a/protocol_tests/aws-restxml/protocols/Aws_restXml.ts
+++ b/protocol_tests/aws-restxml/protocols/Aws_restXml.ts
@@ -5023,7 +5023,9 @@ const deserializeAws_restXmlTimestampList = (output: any, context: __SerdeContex
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.
From 8265db40a6e00451960cb1481aa5ec46e6615a34 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Mon, 21 Dec 2020 21:18:50 +0000
Subject: [PATCH 2/2] chore(middleware-logger): emit $metadata from output
---
.../src/loggerMiddleware.spec.ts | 22 ++-----------------
.../middleware-logger/src/loggerMiddleware.ts | 12 +---------
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/packages/middleware-logger/src/loggerMiddleware.spec.ts b/packages/middleware-logger/src/loggerMiddleware.spec.ts
index 9a5d71484d67..4b6562b485af 100644
--- a/packages/middleware-logger/src/loggerMiddleware.spec.ts
+++ b/packages/middleware-logger/src/loggerMiddleware.spec.ts
@@ -110,16 +110,7 @@ describe("loggerMiddleware", () => {
commandName,
input: mockInputLog,
output: mockOutputLog,
- metadata: {
- statusCode: mockResponse.response.statusCode,
- requestId: mockResponse.response.headers["x-amzn-requestid"],
- extendedRequestId: mockResponse.response.headers["x-amz-id-2"],
- cfId: mockResponse.response.headers["x-amz-cf-id"],
- retry: {
- attempts: $metadata.attempts,
- totalDelay: $metadata.totalRetryDelay,
- },
- },
+ metadata: $metadata,
});
});
@@ -154,16 +145,7 @@ describe("loggerMiddleware", () => {
expect(logger.info).toHaveBeenCalledWith({
input: mockArgs.input,
output: outputWithoutMetadata,
- metadata: {
- statusCode: customResponse.response.statusCode,
- requestId: requestIdBackup,
- extendedRequestId: undefined,
- cfId: undefined,
- retry: {
- attempts: $metadata.attempts,
- totalDelay: $metadata.totalRetryDelay,
- },
- },
+ metadata: $metadata,
});
});
});
diff --git a/packages/middleware-logger/src/loggerMiddleware.ts b/packages/middleware-logger/src/loggerMiddleware.ts
index c4c0117ef143..577e3e2f572a 100644
--- a/packages/middleware-logger/src/loggerMiddleware.ts
+++ b/packages/middleware-logger/src/loggerMiddleware.ts
@@ -25,23 +25,13 @@ export const loggerMiddleware = () =>