s3s-aws: proxy: improve readability

Nugine · Jan 8, 2024 · 6d547b2 · 6d547b2
1 parent 48cff0b
commit 6d547b2
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 1,050 deletions.
diff --git a/codegen/src/aws_proxy.rs b/codegen/src/aws_proxy.rs
@@ -19,7 +19,6 @@ pub fn codegen(ops: &Operations, rust_types: &RustTypes) {
         "use s3s::S3;"
         "use s3s::{S3Request, S3Response};"
         "use s3s::S3Result;"
-        "use s3s::header::{X_AMZ_REQUEST_ID, X_AMZ_ID_2};"
         ""
         "use tracing::debug;"
         ""
@@ -88,18 +87,9 @@ pub fn codegen(ops: &Operations, rust_types: &RustTypes) {
         glines![
             "match result {"
             "    Ok(output) => {"
-            "        let request_id = super::meta::request_id(&output)?;"
-            "        let ext_request_id = super::meta::extended_request_id(&output)?;"
+            "        let headers = super::meta::build_headers(&output)?;"
             "        let output = try_from_aws(output)?;"
-            "        debug!(?output);"
-            "        let mut res = S3Response::new(output);"
-            "        if let Some(val) = request_id {"
-            "            res.headers.insert(X_AMZ_REQUEST_ID, val);"
-            "        }"
-            "        if let Some(val) = ext_request_id {"
-            "            res.headers.insert(X_AMZ_ID_2, val);"
-            "        }"
-            "        Ok(res)"
+            "        Ok(S3Response::new_with_headers(output, headers))"
             "    },"
             "    Err(e) => Err(wrap_sdk_error!(e)),"
             "}"