Fix things

smithy-lang · Jun 12, 2024 · e912cf5 · e912cf5
1 parent a6f39fb
commit e912cf5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/codegen-client-test/build.gradle.kts b/codegen-client-test/build.gradle.kts
@@ -67,7 +67,15 @@ val allCodegenTests = listOf(
     ClientTest(
         "aws.protocoltests.restjson#RestJsonExtras",
         "rest_json_extras",
-        dependsOn = listOf("rest-json-extras.smithy"),
+        dependsOn = listOf(
+            "rest-json-extras.smithy",
+            // TODO(https://github.com/smithy-lang/smithy/pull/2310): Can be deleted when consumed in next Smithy version.
+            "rest-json-extras-2310.smithy",
+            // TODO(https://github.com/smithy-lang/smithy/pull/2314): Can be deleted when consumed in next Smithy version.
+            "rest-json-extras-2314.smithy",
+            // TODO(https://github.com/smithy-lang/smithy/pull/2315): Can be deleted when consumed in next Smithy version.
+            "rest-json-extras-2315.smithy",
+        ),
     ),
     ClientTest("aws.protocoltests.misc#MiscService", "misc", dependsOn = listOf("misc.smithy")),
     ClientTest("aws.protocoltests.restxml#RestXml", "rest_xml", addMessageToErrors = false),

diff --git a/codegen-server-test/python/build.gradle.kts b/codegen-server-test/python/build.gradle.kts
@@ -61,7 +61,15 @@ val allCodegenTests = "../../codegen-core/common-test-models".let { commonModels
         CodegenTest(
             "aws.protocoltests.restjson#RestJsonExtras",
             "rest_json_extras",
-            imports = listOf("$commonModels/rest-json-extras.smithy"),
+            imports = listOf(
+                "$commonModels/rest-json-extras.smithy",
+                // TODO(https://github.com/smithy-lang/smithy/pull/2310): Can be deleted when consumed in next Smithy version.
+                "$commonModels/rest-json-extras-2310.smithy",
+                // TODO(https://github.com/smithy-lang/smithy/pull/2314): Can be deleted when consumed in next Smithy version.
+                "$commonModels/rest-json-extras-2314.smithy",
+                // TODO(https://github.com/smithy-lang/smithy/pull/2315): Can be deleted when consumed in next Smithy version.
+                "$commonModels/rest-json-extras-2315.smithy",
+            ),
         ),
         // TODO(https://github.com/smithy-lang/smithy-rs/issues/2477)
         // CodegenTest(

diff --git a/...tware/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerTypesTest.kt b/...tware/amazon/smithy/rust/codegen/server/python/smithy/generators/PythonServerTypesTest.kt
@@ -130,6 +130,7 @@ internal class PythonServerTypesTest {
                     let req = Request::builder()
                         .method("POST")
                         .uri("/echo")
+                        .header("content-type", "application/json")
                         .body(Body::from(${payload.dq()}))
                         .unwrap();
 
@@ -222,6 +223,7 @@ internal class PythonServerTypesTest {
                 let req = Request::builder()
                     .method("POST")
                     .uri("/echo")
+                    .header("content-type", "application/json")
                     .body(Body::from("{\"value\":1676298520}"))
                     .unwrap();
                 let res = service.call(req).await.unwrap();

diff --git a/rust-runtime/aws-smithy-http-server/Cargo.toml b/rust-runtime/aws-smithy-http-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-http-server"
-version = "0.61.2"
+version = "0.61.3"
 authors = ["Smithy Rust Server <smithy-rs-server@amazon.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/rust-runtime/aws-smithy-http-server/src/protocol/mod.rs b/rust-runtime/aws-smithy-http-server/src/protocol/mod.rs
@@ -142,7 +142,6 @@ pub fn accept_header_classifier(headers: &HeaderMap, content_type: &mime::Mime)
 #[cfg(test)]
 mod tests {
     use super::*;
-    use aws_smithy_runtime_api::http::Headers;
     use http::header::{HeaderValue, ACCEPT, CONTENT_TYPE};
 
     fn req_content_type_smithy(content_type: &'static str) -> SmithyHeaders {