From 0a30a4cf68139c377bbc517b7518535bb60b9a43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:51:14 +0000 Subject: [PATCH] chore(deps): Bump axum from 0.6.20 to 0.7.1 Bumps [axum](https://github.com/tokio-rs/axum) from 0.6.20 to 0.7.1. - [Release notes](https://github.com/tokio-rs/axum/releases) - [Changelog](https://github.com/tokio-rs/axum/blob/main/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/axum/compare/axum-v0.6.20...axum-v0.7.1) --- updated-dependencies: - dependency-name: axum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 227 ++++++++++++++++++---- crates/connectors/ndc-postgres/Cargo.toml | 2 +- crates/tests/databases-tests/Cargo.toml | 2 +- crates/tests/tests-common/Cargo.toml | 2 +- 4 files changed, 189 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 282595ced..9d90f6244 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,13 +148,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" +dependencies = [ + "async-trait", + "axum-core 0.4.0", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.0.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -182,10 +215,30 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] @@ -196,12 +249,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ab90e7b70bea63a153137162affb6a0bce26b584c24a4c7885509783e2cf30b" dependencies = [ - "axum", - "axum-core", + "axum 0.6.20", + "axum-core 0.3.4", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "mime", "pin-project-lite", "serde", @@ -217,11 +270,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "298f62fa902c2515c169ab0bfb56c593229f33faa01131215d58e3d4898e3aa9" dependencies = [ - "axum", + "axum 0.6.20", "bytes", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "reqwest", "serde", "tokio", @@ -591,7 +644,7 @@ dependencies = [ name = "databases-tests" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.1", "insta", "ndc-postgres", "ndc-test", @@ -939,7 +992,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -947,6 +1000,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1031,6 +1103,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1038,7 +1121,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1076,9 +1182,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.21", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1090,13 +1196,32 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1109,12 +1234,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.0.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -1469,10 +1614,10 @@ name = "ndc-postgres" version = "0.1.0" dependencies = [ "async-trait", - "axum", + "axum 0.7.1", "axum-test-helper", "env_logger", - "hyper", + "hyper 0.14.27", "insta", "ndc-client", "ndc-sdk", @@ -1502,13 +1647,13 @@ version = "0.1.0" source = "git+https://github.com/hasura/ndc-hub.git?rev=fb03873#fb03873bd29a7e927c83fbc28923b376dfeaa638" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "axum-extra", "base64 0.21.5", "bytes", "clap", "gdc_rust_types", - "http", + "http 0.2.11", "indexmap 2.1.0", "mime", "ndc-client", @@ -1780,7 +1925,7 @@ checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", - "http", + "http 0.2.11", "opentelemetry_api", "reqwest", ] @@ -1793,7 +1938,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.11", "opentelemetry-http", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -2277,10 +2422,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-tls", "ipnet", "js-sys", @@ -3124,10 +3269,10 @@ dependencies = [ name = "tests-common" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.1", "axum-test-helper", "env_logger", - "hyper", + "hyper 0.14.27", "jsonschema", "ndc-client", "ndc-postgres", @@ -3328,15 +3473,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.5", "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -3379,8 +3524,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "http-range-header", "mime", "pin-project-lite", diff --git a/crates/connectors/ndc-postgres/Cargo.toml b/crates/connectors/ndc-postgres/Cargo.toml index dfcb27e07..59e79e36d 100644 --- a/crates/connectors/ndc-postgres/Cargo.toml +++ b/crates/connectors/ndc-postgres/Cargo.toml @@ -38,7 +38,7 @@ ndc-client = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc. ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.11" } tests-common = { path = "../../tests/tests-common" } -axum = "0.6.20" +axum = "0.7.1" axum-test-helper = "0.3.0" env_logger = "0.10.1" hyper = { version = "0.14.27", features = ["tcp"] } diff --git a/crates/tests/databases-tests/Cargo.toml b/crates/tests/databases-tests/Cargo.toml index 7cca8fecc..170c715db 100644 --- a/crates/tests/databases-tests/Cargo.toml +++ b/crates/tests/databases-tests/Cargo.toml @@ -24,7 +24,7 @@ ndc-postgres = { path = "../../connectors/ndc-postgres" } ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.11" } tests-common = { path = "../tests-common" } -axum = "0.6.20" +axum = "0.7.1" insta = { version = "1.34.0", features = ["json"] } schemars = { version = "0.8.16", features = ["smol_str", "preserve_order"] } serde_json = "1.0.108" diff --git a/crates/tests/tests-common/Cargo.toml b/crates/tests/tests-common/Cargo.toml index e781a1a17..ce4435807 100644 --- a/crates/tests/tests-common/Cargo.toml +++ b/crates/tests/tests-common/Cargo.toml @@ -14,7 +14,7 @@ ndc-postgres = { path = "../../connectors/ndc-postgres" } ndc-sdk = { git = "https://github.com/hasura/ndc-hub.git", rev = "fb03873" } ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.11" } -axum = "0.6.20" +axum = "0.7.1" axum-test-helper = "0.3.0" env_logger = "0.10.1" hyper = { version = "0.14.27", features = ["tcp"] }