diff --git a/aws/rust-runtime/Cargo.lock b/aws/rust-runtime/Cargo.lock index 2b0573c4320..9b5bf679e1e 100644 --- a/aws/rust-runtime/Cargo.lock +++ b/aws/rust-runtime/Cargo.lock @@ -193,7 +193,7 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.10" +version = "1.2.11" dependencies = [ "futures-util", "pin-project-lite", @@ -202,7 +202,7 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.64.2" +version = "0.64.3" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -221,7 +221,7 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.17" +version = "0.60.18" dependencies = [ "aws-smithy-types", "bytes", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.63.2" +version = "0.63.3" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -249,7 +249,7 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.8" +version = "1.1.9" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -269,14 +269,14 @@ dependencies = [ [[package]] name = "aws-smithy-observability" -version = "0.2.3" +version = "0.2.4" dependencies = [ "aws-smithy-runtime-api", ] [[package]] name = "aws-smithy-protocol-test" -version = "0.63.10" +version = "0.63.11" dependencies = [ "assert-json-diff", "aws-smithy-runtime-api", @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.11.2" +version = "1.11.3" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -331,7 +331,7 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.4.2" +version = "1.4.3" dependencies = [ "base64-simd", "bytes", diff --git a/rust-runtime/Cargo.lock b/rust-runtime/Cargo.lock index 11cc8884946..b8d2c3b578d 100644 --- a/rust-runtime/Cargo.lock +++ b/rust-runtime/Cargo.lock @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.10" +version = "1.2.11" dependencies = [ "futures-util", "pin-project-lite", @@ -323,7 +323,7 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.64.2" +version = "0.64.3" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "aws-smithy-compression" -version = "0.1.2" +version = "0.1.3" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -365,7 +365,7 @@ dependencies = [ [[package]] name = "aws-smithy-dns" -version = "0.1.8" +version = "0.1.9" dependencies = [ "aws-smithy-runtime-api", "criterion", @@ -375,7 +375,7 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.17" +version = "0.60.18" dependencies = [ "arbitrary", "aws-smithy-types", @@ -394,7 +394,7 @@ version = "0.2.2" [[package]] name = "aws-smithy-http" -version = "0.63.2" +version = "0.63.3" dependencies = [ "async-stream", "aws-smithy-eventstream", @@ -418,7 +418,7 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.8" +version = "1.1.9" dependencies = [ "aws-smithy-async", "aws-smithy-protocol-test", @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.62.2" +version = "0.62.3" dependencies = [ "aws-smithy-types", "proptest", @@ -540,7 +540,7 @@ dependencies = [ [[package]] name = "aws-smithy-legacy-http" -version = "0.62.9" +version = "0.62.10" dependencies = [ "async-stream", "aws-smithy-eventstream", @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "aws-smithy-observability" -version = "0.2.3" +version = "0.2.4" dependencies = [ "aws-smithy-runtime-api", "serial_test", @@ -615,7 +615,7 @@ dependencies = [ [[package]] name = "aws-smithy-observability-otel" -version = "0.1.7" +version = "0.1.8" dependencies = [ "async-global-executor", "async-task", @@ -630,7 +630,7 @@ dependencies = [ [[package]] name = "aws-smithy-protocol-test" -version = "0.63.10" +version = "0.63.11" dependencies = [ "assert-json-diff", "aws-smithy-runtime-api", @@ -648,7 +648,7 @@ dependencies = [ [[package]] name = "aws-smithy-query" -version = "0.60.12" +version = "0.60.13" dependencies = [ "aws-smithy-types", "urlencoding", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.11.2" +version = "1.11.3" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -701,7 +701,7 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.4.2" +version = "1.4.3" dependencies = [ "base64 0.13.1", "base64-simd", diff --git a/rust-runtime/aws-smithy-async/Cargo.toml b/rust-runtime/aws-smithy-async/Cargo.toml index b2fc6af1167..68c5624cc1f 100644 --- a/rust-runtime/aws-smithy-async/Cargo.toml +++ b/rust-runtime/aws-smithy-async/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-async" -version = "1.2.10" +version = "1.2.11" authors = ["AWS Rust SDK Team ", "John DiSanti "] description = "Async runtime agnostic abstractions for smithy-rs." edition = "2021" diff --git a/rust-runtime/aws-smithy-checksums/Cargo.toml b/rust-runtime/aws-smithy-checksums/Cargo.toml index 28c2e62258c..a9c1f54b78b 100644 --- a/rust-runtime/aws-smithy-checksums/Cargo.toml +++ b/rust-runtime/aws-smithy-checksums/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-checksums" -version = "0.64.2" +version = "0.64.3" authors = [ "AWS Rust SDK Team ", "Zelda Hessler ", diff --git a/rust-runtime/aws-smithy-compression/Cargo.toml b/rust-runtime/aws-smithy-compression/Cargo.toml index 14e67416704..9d341385a33 100644 --- a/rust-runtime/aws-smithy-compression/Cargo.toml +++ b/rust-runtime/aws-smithy-compression/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-compression" -version = "0.1.2" +version = "0.1.3" authors = [ "AWS Rust SDK Team ", "Zelda Hessler ", diff --git a/rust-runtime/aws-smithy-dns/Cargo.toml b/rust-runtime/aws-smithy-dns/Cargo.toml index f74cc41cb05..a87cc60d7e4 100644 --- a/rust-runtime/aws-smithy-dns/Cargo.toml +++ b/rust-runtime/aws-smithy-dns/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-dns" -version = "0.1.8" +version = "0.1.9" authors = [ "AWS Rust SDK Team ", ] diff --git a/rust-runtime/aws-smithy-eventstream/Cargo.toml b/rust-runtime/aws-smithy-eventstream/Cargo.toml index fdadba11fa6..1c5d33c966e 100644 --- a/rust-runtime/aws-smithy-eventstream/Cargo.toml +++ b/rust-runtime/aws-smithy-eventstream/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aws-smithy-eventstream" # Only patch releases can be made to this runtime crate until https://github.com/smithy-lang/smithy-rs/issues/3370 is resolved -version = "0.60.17" +version = "0.60.18" # authors = ["AWS Rust SDK Team ", "John DiSanti "] description = "Event stream logic for smithy-rs." diff --git a/rust-runtime/aws-smithy-http-client/Cargo.toml b/rust-runtime/aws-smithy-http-client/Cargo.toml index 8bd224d30d0..4ac2dca4c4b 100644 --- a/rust-runtime/aws-smithy-http-client/Cargo.toml +++ b/rust-runtime/aws-smithy-http-client/Cargo.toml @@ -2,7 +2,7 @@ name = "aws-smithy-http-client" authors = ["AWS Rust SDK Team "] description = "HTTP client abstractions for generated smithy clients" -version = "1.1.8" +version = "1.1.9" license = "Apache-2.0" edition = "2021" repository = "https://github.com/smithy-lang/smithy-rs" diff --git a/rust-runtime/aws-smithy-http/Cargo.toml b/rust-runtime/aws-smithy-http/Cargo.toml index ce37380c66c..ca955c7752b 100644 --- a/rust-runtime/aws-smithy-http/Cargo.toml +++ b/rust-runtime/aws-smithy-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-http" -version = "0.63.2" +version = "0.63.3" authors = [ "AWS Rust SDK Team ", "Russell Cohen ", diff --git a/rust-runtime/aws-smithy-json/Cargo.toml b/rust-runtime/aws-smithy-json/Cargo.toml index 4d6b9b1070c..16f96899949 100644 --- a/rust-runtime/aws-smithy-json/Cargo.toml +++ b/rust-runtime/aws-smithy-json/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-json" -version = "0.62.2" +version = "0.62.3" authors = ["AWS Rust SDK Team ", "John DiSanti "] description = "Token streaming JSON parser for smithy-rs." edition = "2021" diff --git a/rust-runtime/aws-smithy-legacy-http-server/Cargo.toml b/rust-runtime/aws-smithy-legacy-http-server/Cargo.toml index 51567900562..b1b39e3ad47 100644 --- a/rust-runtime/aws-smithy-legacy-http-server/Cargo.toml +++ b/rust-runtime/aws-smithy-legacy-http-server/Cargo.toml @@ -19,7 +19,7 @@ unredacted-logging = [] request-id = ["dep:uuid"] [dependencies] -aws-smithy-http = { path = "../aws-smithy-legacy-http", features = ["rt-tokio"], package = "aws-smithy-legacy-http" } +aws-smithy-legacy-http = { path = "../aws-smithy-legacy-http", features = ["rt-tokio"] } aws-smithy-json = { path = "../aws-smithy-json" } aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["http-02x"] } aws-smithy-types = { path = "../aws-smithy-types", features = ["http-body-0-4-x", "hyper-0-14-x"] } diff --git a/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_json_1/rejection.rs b/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_json_1/rejection.rs index f843c6209fd..f93a35bdcad 100644 --- a/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_json_1/rejection.rs +++ b/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_json_1/rejection.rs @@ -129,7 +129,7 @@ pub enum RequestRejection { /// Used when failing to parse HTTP headers that are bound to input members with the `httpHeader` /// or the `httpPrefixHeaders` traits. #[error("error binding request HTTP headers: {0}")] - HeaderParse(#[from] aws_smithy_http::header::ParseError), + HeaderParse(#[from] aws_smithy_legacy_http::header::ParseError), // In theory, the next two errors should never happen because the router should have already // rejected the request. diff --git a/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_xml/rejection.rs b/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_xml/rejection.rs index 75af5c76916..08b38535ed5 100644 --- a/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_xml/rejection.rs +++ b/rust-runtime/aws-smithy-legacy-http-server/src/protocol/rest_xml/rejection.rs @@ -41,7 +41,7 @@ pub enum RequestRejection { XmlDeserialize(#[from] aws_smithy_xml::decode::XmlDecodeError), #[error("error binding request HTTP headers: {0}")] - HeaderParse(#[from] aws_smithy_http::header::ParseError), + HeaderParse(#[from] aws_smithy_legacy_http::header::ParseError), #[error("request URI does not match pattern because of literal suffix after greedy label was not found")] UriPatternGreedyLabelPostfixNotFound, diff --git a/rust-runtime/aws-smithy-legacy-http/Cargo.toml b/rust-runtime/aws-smithy-legacy-http/Cargo.toml index 7f1617d5551..bdc0ce77030 100644 --- a/rust-runtime/aws-smithy-legacy-http/Cargo.toml +++ b/rust-runtime/aws-smithy-legacy-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-legacy-http" -version = "0.62.9" +version = "0.62.10" authors = [ "AWS Rust SDK Team ", "Russell Cohen ", diff --git a/rust-runtime/aws-smithy-observability-otel/Cargo.toml b/rust-runtime/aws-smithy-observability-otel/Cargo.toml index 64f99986e3c..31fa0d5cadc 100644 --- a/rust-runtime/aws-smithy-observability-otel/Cargo.toml +++ b/rust-runtime/aws-smithy-observability-otel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-observability-otel" -version = "0.1.7" +version = "0.1.8" authors = [ "AWS Rust SDK Team ", ] diff --git a/rust-runtime/aws-smithy-observability/Cargo.toml b/rust-runtime/aws-smithy-observability/Cargo.toml index 79f17fc63f1..6345124c0d7 100644 --- a/rust-runtime/aws-smithy-observability/Cargo.toml +++ b/rust-runtime/aws-smithy-observability/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-observability" -version = "0.2.3" +version = "0.2.4" authors = [ "AWS Rust SDK Team ", ] diff --git a/rust-runtime/aws-smithy-protocol-test/Cargo.toml b/rust-runtime/aws-smithy-protocol-test/Cargo.toml index 805db6be89f..0dab9e2da35 100644 --- a/rust-runtime/aws-smithy-protocol-test/Cargo.toml +++ b/rust-runtime/aws-smithy-protocol-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-protocol-test" -version = "0.63.10" +version = "0.63.11" authors = ["AWS Rust SDK Team ", "Russell Cohen "] description = "A collection of library functions to validate HTTP requests against Smithy protocol tests." edition = "2021" diff --git a/rust-runtime/aws-smithy-query/Cargo.toml b/rust-runtime/aws-smithy-query/Cargo.toml index 91d16d1ef28..bf639c9d6e1 100644 --- a/rust-runtime/aws-smithy-query/Cargo.toml +++ b/rust-runtime/aws-smithy-query/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-query" -version = "0.60.12" +version = "0.60.13" authors = ["AWS Rust SDK Team ", "John DiSanti "] description = "AWSQuery and EC2Query Smithy protocol logic for smithy-rs." edition = "2021" diff --git a/rust-runtime/aws-smithy-runtime-api/Cargo.toml b/rust-runtime/aws-smithy-runtime-api/Cargo.toml index 50742c2cec7..c7dd462c027 100644 --- a/rust-runtime/aws-smithy-runtime-api/Cargo.toml +++ b/rust-runtime/aws-smithy-runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aws-smithy-runtime-api" -version = "1.11.2" +version = "1.11.3" authors = ["AWS Rust SDK Team ", "Zelda Hessler "] description = "Smithy runtime types." edition = "2021" diff --git a/rust-runtime/aws-smithy-types/Cargo.toml b/rust-runtime/aws-smithy-types/Cargo.toml index 0252f0039d3..c931002f473 100644 --- 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.4.2" +version = "1.4.3" authors = [ "AWS Rust SDK Team ", "Russell Cohen ", diff --git a/tools/ci-build/sdk-versioner/src/main.rs b/tools/ci-build/sdk-versioner/src/main.rs index 1980189212d..759f0958963 100644 --- a/tools/ci-build/sdk-versioner/src/main.rs +++ b/tools/ci-build/sdk-versioner/src/main.rs @@ -208,6 +208,13 @@ fn extract_real_crate_name(key: &toml_edit::KeyMut, value: &Item) -> String { key.get() } } + Item::Table(table) => { + if let Some(Item::Value(Value::String(real_package))) = table.get("package") { + real_package.value() + } else { + key.get() + } + } _ => key.get(), } .to_string() @@ -559,7 +566,7 @@ features = ["foo", "baz"] } #[test] - fn update_aliased_dependency_with_real_crate_name() { + fn update_aliased_dependency_with_real_crate_name_inline_table() { let temp_dir = tempfile::tempdir().unwrap(); let crate_path = temp_dir.path().join("test"); fs::create_dir_all(&crate_path).unwrap(); @@ -596,6 +603,50 @@ version = "0.1.0" [dependencies] config = { version = "0.5.0", package = "aws-config" } +"#; + assert_eq!(expected, actual); + } + + #[test] + fn update_aliased_dependency_with_real_crate_name_table() { + let temp_dir = tempfile::tempdir().unwrap(); + let crate_path = temp_dir.path().join("test"); + fs::create_dir_all(&crate_path).unwrap(); + + let manifest_path = crate_path.join("Cargo.toml"); + std::fs::write( + &manifest_path, + br#" +[package] +name = "test" +version = "0.1.0" + +[dependencies.config] +path = "not/a/real/path" +features = ["rt-tokio"] +package = "aws-config" +"#, + ) + .unwrap(); + + let context = DependencyContext { + sdk_path: None, + versions_manifest: Some(versions_toml_for(&[ + ("aws-config", "0.5.0"), + ("config", "1.0.0"), + ])), + }; + + update_manifest(&manifest_path, &context).expect("success"); + + let actual = std::fs::read_to_string(&manifest_path).unwrap(); + let expected = r#" +[package] +name = "test" +version = "0.1.0" + +[dependencies] +config= { version = "0.5.0", package = "aws-config", features = ["rt-tokio"] } "#; assert_eq!(expected, actual); }