1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
use http::{HeaderMap, HeaderValue};
const EXTENDED_REQUEST_ID: &str = "s3_extended_request_id";
pub trait ErrorExt {
fn extended_request_id(&self) -> Option<&str>;
}
impl ErrorExt for aws_smithy_types::Error {
fn extended_request_id(&self) -> Option<&str> {
self.extra(EXTENDED_REQUEST_ID)
}
}
pub fn parse_extended_error(
error: aws_smithy_types::Error,
headers: &HeaderMap<HeaderValue>,
) -> aws_smithy_types::Error {
let mut builder = error.into_builder();
let host_id = headers
.get("x-amz-id-2")
.and_then(|header_value| header_value.to_str().ok());
if let Some(host_id) = host_id {
builder.custom(EXTENDED_REQUEST_ID, host_id);
}
builder.build()
}
#[cfg(test)]
mod test {
use crate::s3_errors::{parse_extended_error, ErrorExt};
#[test]
fn add_error_fields() {
let resp = http::Response::builder()
.header(
"x-amz-id-2",
"eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran",
)
.status(400)
.body("")
.unwrap();
let error = aws_smithy_types::Error::builder()
.message("123")
.request_id("456")
.build();
let error = parse_extended_error(error, resp.headers());
assert_eq!(
error
.extended_request_id()
.expect("extended request id should be set"),
"eftixk72aD6Ap51TnqcoF8eFidJG9Z/2mkiDFu8yU9AS1ed4OpIszj7UDNEHGran"
);
}
#[test]
fn handle_missing_header() {
let resp = http::Response::builder().status(400).body("").unwrap();
let error = aws_smithy_types::Error::builder()
.message("123")
.request_id("456")
.build();
let error = parse_extended_error(error, resp.headers());
assert_eq!(error.extended_request_id(), None);
}
}