From 61a4af0bdd3d19218cffd7b3f2cd00f58d7394b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:15:38 +0000 Subject: [PATCH] build(deps): bump axum from 0.6.20 to 0.7.2 Bumps [axum](https://github.com/tokio-rs/axum) from 0.6.20 to 0.7.2. - [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.2) --- updated-dependencies: - dependency-name: axum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 225 +++++++++++++++++---- crates/connectors/ndc-citus/Cargo.toml | 2 +- crates/connectors/ndc-cockroach/Cargo.toml | 2 +- crates/connectors/ndc-postgres/Cargo.toml | 2 +- crates/tests/other-db-tests/Cargo.toml | 2 +- crates/tests/tests-common/Cargo.toml | 2 +- 6 files changed, 190 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c9190c..8db9a79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,13 +146,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.9", + "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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" +dependencies = [ + "async-trait", + "axum-core 0.4.1", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.0.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -180,10 +213,30 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" +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", ] @@ -206,11 +259,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.9", + "http-body 0.4.5", + "hyper 0.14.27", "reqwest", "serde", "tokio", @@ -858,7 +911,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -866,6 +919,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.0.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -950,6 +1022,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" @@ -957,7 +1040,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "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", ] @@ -995,9 +1101,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1009,13 +1115,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", @@ -1028,12 +1153,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.3", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.57" @@ -1313,10 +1458,10 @@ name = "ndc-citus" version = "0.1.0" dependencies = [ "async-trait", - "axum", + "axum 0.7.2", "axum-test-helper", "env_logger", - "hyper", + "hyper 0.14.27", "insta", "ndc-client", "ndc-postgres", @@ -1354,10 +1499,10 @@ name = "ndc-cockroach" version = "0.1.0" dependencies = [ "async-trait", - "axum", + "axum 0.7.2", "axum-test-helper", "env_logger", - "hyper", + "hyper 0.14.27", "insta", "ndc-client", "ndc-postgres", @@ -1378,11 +1523,11 @@ name = "ndc-postgres" version = "0.1.0" dependencies = [ "async-trait", - "axum", + "axum 0.7.2", "axum-test-helper", "enum-iterator", "env_logger", - "hyper", + "hyper 0.14.27", "insta", "ndc-client", "ndc-sdk 0.1.0 (git+https://github.com/hasura/ndc-hub.git?rev=e16b85a)", @@ -1411,7 +1556,7 @@ version = "0.1.0" source = "git+https://github.com/hasura/ndc-hub.git?rev=abfc255#abfc25587a81e28dab76b66a7b0bc34a38b368f3" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "axum-macros", "clap", "ndc-client", @@ -1442,7 +1587,7 @@ version = "0.1.0" source = "git+https://github.com/hasura/ndc-hub.git?rev=e16b85a#e16b85a94f4db45ba34926c63c5a4683a5ce5d41" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "axum-macros", "clap", "ndc-client", @@ -1640,7 +1785,7 @@ checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", - "http", + "http 0.2.9", "opentelemetry_api", "reqwest", ] @@ -1653,7 +1798,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.9", "opentelemetry-http", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -1740,7 +1885,7 @@ name = "other-db-tests" version = "0.1.0" dependencies = [ "async-trait", - "axum", + "axum 0.7.2", "env_logger", "insta", "ndc-postgres", @@ -2154,10 +2299,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-tls", "ipnet", "js-sys", @@ -2899,7 +3044,7 @@ dependencies = [ name = "tests-common" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.2", "axum-test-helper", "ndc-sdk 0.1.0 (git+https://github.com/hasura/ndc-hub.git?rev=e16b85a)", "reqwest", @@ -3093,15 +3238,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.3", "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.21", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -3144,8 +3289,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "mime", "pin-project-lite", diff --git a/crates/connectors/ndc-citus/Cargo.toml b/crates/connectors/ndc-citus/Cargo.toml index 8c0fedf..1ae7856 100644 --- a/crates/connectors/ndc-citus/Cargo.toml +++ b/crates/connectors/ndc-citus/Cargo.toml @@ -29,7 +29,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.5" } tests-common = { path = "../../tests/tests-common" } -axum = "0.6.19" +axum = "0.7.2" axum-test-helper = "0.3.0" insta = { version = "1.31.0", features = ["json"] } env_logger = "0.10.0" diff --git a/crates/connectors/ndc-cockroach/Cargo.toml b/crates/connectors/ndc-cockroach/Cargo.toml index 65251f3..7017ce0 100644 --- a/crates/connectors/ndc-cockroach/Cargo.toml +++ b/crates/connectors/ndc-cockroach/Cargo.toml @@ -29,7 +29,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.5" } tests-common = { path = "../../tests/tests-common" } -axum = "0.6.19" +axum = "0.7.2" axum-test-helper = "0.3.0" insta = { version = "1.31.0", features = ["json"] } env_logger = "0.10.0" diff --git a/crates/connectors/ndc-postgres/Cargo.toml b/crates/connectors/ndc-postgres/Cargo.toml index ffbc1b2..425ecc7 100644 --- a/crates/connectors/ndc-postgres/Cargo.toml +++ b/crates/connectors/ndc-postgres/Cargo.toml @@ -37,7 +37,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.5" } tests-common = { path = "../../tests/tests-common" } -axum = "0.6.19" +axum = "0.7.2" axum-test-helper = "0.3.0" insta = { version = "1.31.0", features = ["json"] } env_logger = "0.10.0" diff --git a/crates/tests/other-db-tests/Cargo.toml b/crates/tests/other-db-tests/Cargo.toml index b75cea0..78c9bed 100644 --- a/crates/tests/other-db-tests/Cargo.toml +++ b/crates/tests/other-db-tests/Cargo.toml @@ -24,6 +24,6 @@ tracing = "0.1.37" prometheus = "0.13.3" thiserror = "1.0" tests-common = { path = "../tests-common" } -axum = "0.6.19" +axum = "0.7.2" insta = { version = "1.31.0", features = ["json"] } env_logger = "0.10.0" diff --git a/crates/tests/tests-common/Cargo.toml b/crates/tests/tests-common/Cargo.toml index 755dbe7..2c46a5f 100644 --- a/crates/tests/tests-common/Cargo.toml +++ b/crates/tests/tests-common/Cargo.toml @@ -14,7 +14,7 @@ serde = "1.0.188" serde_derive = "^1.0" serde_json = { version = "1.0.107", features = ["raw_value"] } tracing = "0.1.37" -axum = "0.6.19" +axum = "0.7.2" axum-test-helper = "0.3.0" reqwest = "0.11.20" tokio-postgres = "0.7.10"