aws-smithy-http-server - http/1 support

rust-runtime/aws-smithy-protocol-test/Cargo.toml

@@ -7,20 +7,28 @@ edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/smithy-lang/smithy-rs"
 
+[features]
+default = ["http-02x"]
+http-02x = ["dep:http-0x"]
+http-1x = ["dep:http-1x"]
+
 [dependencies]
 # Not perfect for our needs, but good for now
 assert-json-diff = "2"
 base64-simd = "0.8"
 cbor-diag = "0.1.12"
 ciborium = "0.2"
-http = "0.2.12"
 pretty_assertions = "1.3"
 regex-lite = "0.1.5"
 roxmltree = "0.14.1"
 serde_json = "1.0.128"
 thiserror = "2"
 aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client"] }
 
+# HTTP version dependencies
+http-0x = { package = "http", version = "0.2.12", optional = true }
+http-1x = { package = "http", version = "1.0", optional = true }
+
 [package.metadata.docs.rs]
 all-features = true
 targets = ["x86_64-unknown-linux-gnu"]

rust-runtime/aws-smithy-protocol-test/src/lib.rs

@@ -21,7 +21,6 @@ use crate::xml::try_xml_equivalent;
 use assert_json_diff::assert_json_matches_no_panic;
 use aws_smithy_runtime_api::client::orchestrator::HttpRequest;
 use aws_smithy_runtime_api::http::Headers;
-use http::{HeaderMap, Uri};
 use pretty_assertions::Comparison;
 use std::borrow::Cow;
 use std::collections::HashSet;
@@ -148,11 +147,24 @@ pub fn assert_uris_match(left: impl AsRef<str>, right: impl AsRef<str>) {
         left,
         right
     );
-    let left: Uri = left.parse().expect("left is not a valid URI");
-    let right: Uri = right.parse().expect("left is not a valid URI");
-    assert_eq!(left.authority(), right.authority());
-    assert_eq!(left.scheme(), right.scheme());
-    assert_eq!(left.path(), right.path());
+
+    // When both features are enabled, prefer http-1x version
+    #[cfg(feature = "http-1x")]
+    {
+        let left: http_1x::Uri = left.parse().expect("left is not a valid URI");
+        let right: http_1x::Uri = right.parse().expect("right is not a valid URI");
+        assert_eq!(left.authority(), right.authority());
+        assert_eq!(left.scheme(), right.scheme());
+        assert_eq!(left.path(), right.path());
+    }
+    #[cfg(all(feature = "http-02x", not(feature = "http-1x")))]
+    {
+        let left: http_0x::Uri = left.parse().expect("left is not a valid URI");
+        let right: http_0x::Uri = right.parse().expect("right is not a valid URI");
+        assert_eq!(left.authority(), right.authority());
+        assert_eq!(left.scheme(), right.scheme());
+        assert_eq!(left.path(), right.path());
+    }
 }
 
 pub fn validate_query_string(
@@ -232,7 +244,27 @@ impl GetNormalizedHeader for &Headers {
     }
 }
 
-impl GetNormalizedHeader for &HeaderMap {
+// HTTP 0.2.x HeaderMap implementation
+#[cfg(feature = "http-02x")]
+impl GetNormalizedHeader for &http_0x::HeaderMap {
+    fn get_header(&self, key: &str) -> Option<String> {
+        if !self.contains_key(key) {
+            None
+        } else {
+            Some(
+                self.get_all(key)
+                    .iter()
+                    .map(|value| std::str::from_utf8(value.as_bytes()).expect("invalid utf-8"))
+                    .collect::<Vec<_>>()
+                    .join(", "),
+            )
+        }
+    }
+}
+
+// HTTP 1.x HeaderMap implementation
+#[cfg(feature = "http-1x")]
+impl GetNormalizedHeader for &http_1x::HeaderMap {
     fn get_header(&self, key: &str) -> Option<String> {
         if !self.contains_key(key) {
             None
@@ -748,8 +780,9 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "http-02x")]
     fn test_validate_headers_http0x() {
-        let request = http::Request::builder().header("a", "b").body(()).unwrap();
+        let request = http_0x::Request::builder().header("a", "b").body(()).unwrap();
         validate_headers(request.headers(), [("a", "b")]).unwrap()
     }