STS code generates end-to-end and tests pass

smithy-lang · Oct 11, 2023 · d0812be · d0812be
1 parent a543a3f
commit d0812be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...mazon/smithy/rust/codegen/client/smithy/generators/protocol/RequestSerializerGenerator.kt b/...mazon/smithy/rust/codegen/client/smithy/generators/protocol/RequestSerializerGenerator.kt
@@ -77,7 +77,7 @@ class RequestSerializerGenerator(
                     };
                     let body = #{generate_body};
                     #{add_content_length}
-                    #{Ok}(request_builder.body(body).expect("valid request"))
+                    #{Ok}(request_builder.body(body).expect("valid request").try_into().unwrap())
                 }
             }
             """,

diff --git a/rust-runtime/aws-smithy-protocol-test/src/lib.rs b/rust-runtime/aws-smithy-protocol-test/src/lib.rs
@@ -128,16 +128,18 @@ fn extract_params(uri: &Uri) -> HashSet<&str> {
 }
 
 #[track_caller]
-pub fn assert_uris_match(left: &Uri, right: &Uri) {
-    if left == right {
+pub fn assert_uris_match(left: impl AsRef<str>, right: impl AsRef<str>) {
+    if left.as_ref() == right.as_ref() {
         return;
     }
+    let left: Uri = left.as_ref().parse().expect("left is not a valid URI");
+    let right: Uri = right.as_ref().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());
     assert_eq!(
-        extract_params(left),
-        extract_params(right),
+        extract_params(&left),
+        extract_params(&right),
         "Query parameters did not match. left: {}, right: {}",
         left,
         right
@@ -383,7 +385,7 @@ mod tests {
         validate_headers, validate_query_string, FloatEquals, MediaType, ProtocolTestFailure,
     };
     use aws_smithy_runtime_api::client::http::request::Headers;
-    use http::{header::HeaderMap, Request};
+    use http::Request;
 
     #[test]
     fn test_validate_empty_query_string() {

diff --git a/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs b/rust-runtime/aws-smithy-runtime/src/client/http/test_util/dvr/replay.rs
@@ -126,8 +126,9 @@ impl ReplayingClient {
                 ))?
                 .take()
                 .await;
-            aws_smithy_protocol_test::assert_uris_match(expected.uri(), actual.uri());
             body_comparer(expected.body().as_ref(), actual.body().as_ref())?;
+            let actual: HttpRequest = actual.map(SdkBody::from).try_into()?;
+            aws_smithy_protocol_test::assert_uris_match(&expected.uri().to_string(), actual.uri());
             let expected_headers = expected
                 .headers()
                 .keys()