Merge remote-tracking branch 'upstream/main' into smithy-rpc-v2

smithy-lang · Jun 4, 2024 · 24d2614 · 24d2614
2 parents 9531447 + 9c1ae5a
commit 24d2614
Show file tree

Hide file tree

Showing 11 changed files with 850 additions and 411 deletions.
diff --git a/CHANGELOG.next.toml b/CHANGELOG.next.toml
@@ -11,6 +11,18 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
+ [[aws-sdk-rust]]
+ message = "Add support for v1 `http_body::Body` to `aws_smithy_types::byte_stream::bytestream_util::PathBody`."
+ references = ["smithy-rs#1925", "smithy-rs#3673"]
+ meta = { "breaking" = false, "tada" = false, "bug" = false }
+ author = "Velfi"
+
+ [[smithy-rs]]
+ message = "Add support for v1 `http_body::Body` to `aws_smithy_types::byte_stream::bytestream_util::PathBody`."
+ references = ["smithy-rs#1925", "smithy-rs#3673"]
+ meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "all"}
+ author = "Velfi"
+
 [[smithy-rs]]
 message = "Reduce verbosity of various debug logs"
 references = ["smithy-rs#3664"]

diff --git a/aws/rust-runtime/aws-types/Cargo.toml b/aws/rust-runtime/aws-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aws-types"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["AWS Rust SDK Team <[email protected]>", "Russell Cohen <[email protected]>"]
 description = "Cross-service types for the AWS SDK."
 edition = "2021"
@@ -27,7 +27,7 @@ hyper-rustls = { version = "0.24", optional = true, features = ["rustls-native-c
 [dev-dependencies]
 http = "0.2.4"
 tempfile = "3"
-tracing-test = "0.2.4"
+tracing-test = "=0.2.5"
 tokio = { version = "1", features = ["rt", "macros"] }
 
 [build-dependencies]

diff --git a/aws/rust-runtime/aws-types/src/app_name.rs b/aws/rust-runtime/aws-types/src/app_name.rs
@@ -140,7 +140,7 @@ mod tests {
 
         // HACK: there's no way to reset tracing-test, so just
         // reach into its internals and clear it manually
-        tracing_test::internal::GLOBAL_BUF.lock().unwrap().clear();
+        tracing_test::internal::global_buf().lock().unwrap().clear();
 
         AppName::new("greaterthanfiftycharactersgreaterthanfiftycharacters").unwrap();
         assert!(!logs_contain(

diff --git a/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt b/...core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt
@@ -301,7 +301,7 @@ data class CargoDependency(
         val Tokio: CargoDependency =
             CargoDependency(
                 "tokio",
-                CratesIo("1.23.1"),
+                CratesIo("=1.37.0"),
                 DependencyScope.Dev,
                 features = setOf("macros", "test-util", "rt-multi-thread"),
             )
@@ -321,7 +321,7 @@ data class CargoDependency(
         val TracingTest: CargoDependency =
             CargoDependency(
                 "tracing-test",
-                CratesIo("0.2.4"),
+                CratesIo("0.2.5"),
                 DependencyScope.Dev,
                 features = setOf("no-env-filter"),
             )

diff --git a/rust-runtime/aws-smithy-types/Cargo.toml b/rust-runtime/aws-smithy-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aws-smithy-types"
-version = "1.1.10"
+version = "1.2.0"
 authors = [
     "AWS Rust SDK Team <[email protected]>",
     "Russell Cohen <[email protected]>",

diff --git a/rust-runtime/aws-smithy-types/src/byte_stream.rs b/rust-runtime/aws-smithy-types/src/byte_stream.rs
@@ -149,6 +149,7 @@ pub use self::bytestream_util::FsBuilder;
 /// The name has a suffix `_x` to avoid name collision with a third-party `http-body-0-4`.
 #[cfg(feature = "http-body-0-4-x")]
 pub mod http_body_0_4_x;
+
 #[cfg(feature = "http-body-1-x")]
 pub mod http_body_1_x;