Bump axum from 0.5.17 to 0.6.2 (MystenLabs#7421)

Bumps [axum](https://github.com/tokio-rs/axum) from 0.5.17 to 0.6.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tokio-rs/axum/releases">axum's releases</a>.</em></p> <blockquote> <h2>axum - v0.6.2</h2> <ul> <li><strong>added:</strong> Add <code>body_text</code> and <code>status</code> methods to built-in rejections (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1612">#1612</a>)</li> <li><strong>added:</strong> Enable the <code>runtime</code> feature of <code>hyper</code> when using <code>tokio</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1671">#1671</a>)</li> </ul> <p><a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1612">#1612</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/axum/pull/1612">tokio-rs/axum#1612</a> <a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1671">#1671</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/axum/pull/1671">tokio-rs/axum#1671</a></p> <h2>axum - v0.6.1</h2> <ul> <li><strong>added:</strong> Expand the docs for <code>Router::with_state</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1580">#1580</a>)</li> </ul> <p><a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1580">#1580</a>: <a href="https://github-redirect.dependabot.com/tokio-rs/axum/pull/1580">tokio-rs/axum#1580</a></p> <h2>axum - v0.6.0</h2> <h2>Routing</h2> <ul> <li> <p><strong>fixed:</strong> Nested routers are now allowed to have fallbacks (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1521">#1521</a>):</p> <pre lang="rust"><code>let api_router = Router::new() .route("/users", get(|| { ... })) .fallback(api_fallback); <p>let app = Router::new() // this would panic in 0.5 but in 0.6 it just works // // requests starting with <code>/api</code> but not handled by <code>api_router</code> // will go to <code>/api_fallback</code> .nest("/api", api_router); </code></pre></p> <p>The outer router's fallback will still apply if a nested router doesn't have its own fallback:</p> <pre lang="rust"><code>// this time without a fallback let api_router = Router::new().route("/users", get(|| { ... })); <p>let app = Router::new() .nest("/api", api_router) // <code>api_fallback</code> will inherit this fallback .fallback(app_fallback); </code></pre></p> </li> <li> <p><strong>breaking:</strong> The request <code>/foo/</code> no longer matches <code>/foo/*rest</code>. If you want to match <code>/foo/</code> you have to add a route specifically for that (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1086">#1086</a>)</p> <p>For example:</p> <pre lang="rust"><code>use axum::{Router, routing::get, extract::Path}; </code></pre> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tokio-rs/axum/commit/e3aaeb3cb7be5ae694c1d9c7a414790de7a23d30"><code>e3aaeb3</code></a> Release axum, axum-core, and axum-macros (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1688">#1688</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/8d92902c8e4c2607e81ceaf1b1e7d516ca9cfff3"><code>8d92902</code></a> Updated websocket example to improve clarity and to be more distinct from cha...</li> <li><a href="https://github.com/tokio-rs/axum/commit/d11af167ca6b6cb2ab01876e2c7856e7c26f5221"><code>d11af16</code></a> Replace <code>actions-rs/toolchain@v1</code> with stable alternative (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1687">#1687</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/3d31bcb6fba0b6a9b6fad8c90f53522ab78a2928"><code>3d31bcb</code></a> Remove lingering async-graphql example file</li> <li><a href="https://github.com/tokio-rs/axum/commit/7192c590c92d05e56086df265fca77c526886645"><code>7192c59</code></a> add more comments to chat example (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1665">#1665</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/6638b274dbbf859d63ca495af5f73befb57c5b19"><code>6638b27</code></a> Update to base64 0.20 (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1641">#1641</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/be9a8c038026bc5fb5c7142ced5d9e4ff580510c"><code>be9a8c0</code></a> Document breaking changes related to <code>nest</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1684">#1684</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/1aa357c879c65e7885b267057de8292774e5109a"><code>1aa357c</code></a> Misc documentation improvements (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1647">#1647</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/211de92d24a0d6e1ffc0c76b75c26c53c7eb09d3"><code>211de92</code></a> Enable the runtime feature of hyper when using tokio (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1671">#1671</a>)</li> <li><a href="https://github.com/tokio-rs/axum/commit/b6c282a2b7666ab2cdf3f0ee3ae96f593283f8f3"><code>b6c282a</code></a> Fix warnings for cloning references in generated code (<a href="https://github-redirect.dependabot.com/tokio-rs/axum/issues/1676">#1676</a>)</li> <li>Additional commits viewable in <a href="https://github.com/tokio-rs/axum/compare/axum-v0.5.17...axum-v0.6.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=axum&package-manager=cargo&previous-version=0.5.17&new-version=0.6.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) Dependabot will merge this PR once CI passes on it, as requested by @mystenadmin. [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
sushmitsarmah · Jan 22, 2023 · b2f3384 · b2f3384
1 parent 80996ed
commit b2f3384
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 77 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -3,7 +3,7 @@
 
 hakari-package = "workspace-hack"
 
-# Format for `workspace-hack = ...` lines in other Cargo.tomls. Requires cargo-hakari 0.9.8 or above.
+# Format for `workspace-hack = ...` lines in other Cargo.tomls.
 dep-format-version = "3"
 
 # Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = { version = "1.0.64", features = ["backtrace"] }
 async-trait = "0.1.61"
-axum = "0.5.16"
+axum = { version = "0.6.2", features = ["json"] }
 clap = { version = "3.2.17", features = ["derive"] }
 thiserror = "1.0.34"
 tokio = { workspace = true, features = ["full"] }

diff --git a/crates/sui-faucet/src/main.rs b/crates/sui-faucet/src/main.rs
@@ -146,8 +146,8 @@ async fn health() -> &'static str {
 
 /// handler for all the request_gas requests
 async fn request_gas(
-    Json(payload): Json<FaucetRequest>,
     Extension(state): Extension<Arc<AppState>>,
+    Json(payload): Json<FaucetRequest>,
 ) -> impl IntoResponse {
     // ID for traceability
     let id = Uuid::new_v4();

diff --git a/crates/sui-faucet/src/metrics_layer.rs b/crates/sui-faucet/src/metrics_layer.rs
@@ -16,6 +16,7 @@ use crate::metrics::RequestMetrics;
 
 /// Tower Layer for tracking metrics in Prometheus related to number, success-rate and latency of
 /// requests running through service.
+#[derive(Clone)]
 pub struct RequestMetricsLayer {
     metrics: Arc<RequestMetrics>,
 }

diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 anemo.workspace = true
 anemo-tower.workspace = true
 arc-swap = "1.5.1"
-axum = "0.5.16"
+axum = "0.6.2"
 anyhow = { version = "1.0.64", features = ["backtrace"] }
 clap = { version = "3.2.17", features = ["derive"] }
 multiaddr = "0.17.0"

diff --git a/crates/sui-rosetta/Cargo.toml b/crates/sui-rosetta/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-axum = "0.6.1"
+axum = "0.6.2"
 axum-extra = "0.4.2"
 anyhow = { version = "1.0.64", features = ["backtrace"] }
 tracing = "0.1.36"

diff --git a/crates/sui-test-validator/Cargo.toml b/crates/sui-test-validator/Cargo.toml
@@ -12,7 +12,7 @@ clap = { version = "3.2.17", features = ["derive"] }
 serde = "1.0.141"
 serde_json = "1.0.88"
 tokio = { workspace = true, features = ["full"] }
-axum = "0.5.16"
+axum = { version = "0.6.2", features = ["json"] }
 tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] }
 tower-http = { version = "0.3.4", features = ["cors"] }
 http = { version = "0.2.8" }

diff --git a/crates/sui-test-validator/src/main.rs b/crates/sui-test-validator/src/main.rs
@@ -100,8 +100,8 @@ async fn health() -> &'static str {
 }
 
 async fn faucet_request(
-    Json(payload): Json<FaucetRequest>,
     Extension(state): Extension<Arc<AppState>>,
+    Json(payload): Json<FaucetRequest>,
 ) -> impl IntoResponse {
     let result = match payload {
         FaucetRequest::FixedAmountRequest(FixedAmountRequest { recipient }) => {

diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
@@ -55,10 +55,8 @@ atoi = { version = "1", default-features = false }
 atomicwrites = { version = "0.3", default-features = false }
 atty = { version = "0.2", default-features = false }
 auto_ops = { version = "0.3", default-features = false }
-axum-d8f496e17d97b5cb = { package = "axum", version = "0.5" }
-axum-3b31131e45eafb45 = { package = "axum", version = "0.6" }
-axum-core-6f8ce4dd05d13bba = { package = "axum-core", version = "0.2", default-features = false }
-axum-core-468e82937335b1c9 = { package = "axum-core", version = "0.3", default-features = false }
+axum = { version = "0.6" }
+axum-core = { version = "0.3", default-features = false }
 axum-extra = { version = "0.4" }
 axum-server = { version = "0.4" }
 backoff = { version = "0.4", features = ["tokio"] }
@@ -720,10 +718,8 @@ atomicwrites = { version = "0.3", default-features = false }
 atty = { version = "0.2", default-features = false }
 auto_ops = { version = "0.3", default-features = false }
 autocfg = { version = "1", default-features = false }
-axum-d8f496e17d97b5cb = { package = "axum", version = "0.5" }
-axum-3b31131e45eafb45 = { package = "axum", version = "0.6" }
-axum-core-6f8ce4dd05d13bba = { package = "axum-core", version = "0.2", default-features = false }
-axum-core-468e82937335b1c9 = { package = "axum-core", version = "0.3", default-features = false }
+axum = { version = "0.6" }
+axum-core = { version = "0.3", default-features = false }
 axum-extra = { version = "0.4" }
 axum-server = { version = "0.4" }
 backoff = { version = "0.4", features = ["tokio"] }

diff --git a/narwhal/network/Cargo.toml b/narwhal/network/Cargo.toml
@@ -31,7 +31,7 @@ eyre = "0.6.8"
 anemo.workspace = true
 anemo-tower.workspace = true
 anyhow = "1.0.65"
-axum = "0.5.16"
+axum = "0.6.2"
 axum-server = "0.4.2"
 tower = "0.4.13"
 fail = "0.5.1"

diff --git a/narwhal/node/Cargo.toml b/narwhal/node/Cargo.toml
@@ -24,7 +24,7 @@ tracing = "0.1.36"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.15", features = ["time", "env-filter"] }
 url = "2.3.1"
-axum = "0.5.16"
+axum = "0.6.2"
 itertools = "0.10.5"
 
 config = { path = "../config", package = "narwhal-config" }