radicle/radicle-explorer
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git synced 2026-11-15 19:30:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

httpd: Update dependencies

Browse Source 
Required:
- removing the #[async_trait] declarations since that has been
stabilized in rust.
- axum 0.8.0 introduced new endpoints declarations with curly brackets.
This commit is contained in:
Sebastian Martinez
2025-08-15 14:12:35 +02:00
parent 2727615b53
commit d5cf0612d5
8 changed files with 490 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radicle-httpd/Cargo.lock
Generated
+444 -135
View File
File diff suppressed because it is too large Load Diff
radicle-httpd/Cargo.toml
+16 -16
View File
@@ -22,31 +22,31 @@ path = "src/main.rs"
[dependencies]
anyhow = { version = "1" }
axum = { version = "0.7.5", default-features = false, features = ["json", "query", "tokio", "http1"] }
axum = { version = "0.8.4", default-features = false, features = ["json", "query", "tokio", "http1"] }
base64 = { version = "0.22.1" }
chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
flate2 = { version = "1" }
hyper = { version = "1.4", default-features = false }
infer = { version = "0.16.0" }
lexopt = { version = "0.3.0" }
lru = { version = "0.12.4" }
nonempty = { version = "0.9.0", features = ["serialize"] }
hyper = { version = "1.6.0", default-features = false }
infer = { version = "0.19.0" }
lexopt = { version = "0.3.1" }
lru = { version = "0.16.0" }
nonempty = { version = "0.12.0", features = ["serialize"] }
radicle = { version = "0.18.0" }
radicle-surf = { version = "0.22.0", default-features = false, features = ["serde"] }
radicle-term = { version = "0.14.0", default-features = false }
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["preserve_order"] }
thiserror = { version = "1" }
tokio = { version = "1.40", default-features = false, features = ["macros", "rt-multi-thread"] }
tower-http = { version = "0.5.2", default-features = false, features = ["trace", "cors", "set-header"] }
tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] }
thiserror = { version = "2" }
tokio = { version = "1.47.1", default-features = false, features = ["macros", "rt-multi-thread"] }
tower-http = { version = "0.6.6", default-features = false, features = ["trace", "cors", "set-header"] }
tracing = { version = "0.1.41", default-features = false, features = ["std", "log"] }
tracing-logfmt = { version = "0.3.5", optional = true }
tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std", "ansi", "fmt"] }
tracing-subscriber = { version = "0.3.19", default-features = false, features = ["std", "ansi", "fmt"] }
[dev-dependencies]
hyper = { version = "1.4", default-features = false, features = ["client"] }
pretty_assertions = { version = "1.3.0" }
hyper = { version = "1.6", default-features = false, features = ["client"] }
pretty_assertions = { version = "1.4.1" }
radicle = { version = "0.18.0", features = ["test"] }
radicle-crypto = { version = "0.13.0", features = ["test"] }
tempfile = { version = "3.3.0" }
tower = { version = "0.5.0", features = ["util"] }
tempfile = { version = "3.20.0" }
tower = { version = "0.5.2", features = ["util"] }
radicle-httpd/src/api/v1/delegates.rs
+1 -1
View File
@@ -13,7 +13,7 @@ use crate::axum_extra::{Path, Query};
pub fn router(ctx: Context) -> Router {
Router::new()
.route("/delegates/:did/repos", get(delegates_repos_handler))
.route("/delegates/{did}/repos", get(delegates_repos_handler))
.with_state(ctx)
}
radicle-httpd/src/api/v1/node.rs
+6 -3
View File
@@ -21,9 +21,12 @@ pub fn router(ctx: Context) -> Router {
Router::new()
.route("/node", get(node_handler))
.route("/node/policies/repos", get(node_policies_repos_handler))
.route("/node/policies/repos/:rid", get(node_policies_repo_handler))
.route("/nodes/:nid", get(nodes_handler))
.route("/nodes/:nid/inventory", get(nodes_inventory_handler))
.route(
"/node/policies/repos/{rid}",
get(node_policies_repo_handler),
)
.route("/nodes/{nid}", get(nodes_handler))
.route("/nodes/{nid}/inventory", get(nodes_inventory_handler))
.with_state(ctx)
}
radicle-httpd/src/api/v1/repos.rs
+16 -16
View File
@@ -29,22 +29,22 @@ pub fn router(ctx: Context) -> Router {
Router::new()
.route("/repos", get(repo_root_handler))
.route("/repos/search", get(repo_search_handler))
.route("/repos/:rid", get(repo_handler))
.route("/repos/:rid/commits", get(history_handler))
.route("/repos/:rid/commits/:sha", get(commit_handler))
.route("/repos/:rid/diff/:base/:oid", get(diff_handler))
.route("/repos/:rid/activity", get(activity_handler))
.route("/repos/:rid/tree/:sha/", get(tree_handler_root))
.route("/repos/:rid/tree/:sha/*path", get(tree_handler))
.route("/repos/:rid/stats/tree/:sha", get(stats_tree_handler))
.route("/repos/:rid/remotes", get(remotes_handler))
.route("/repos/:rid/remotes/:peer", get(remote_handler))
.route("/repos/:rid/blob/:sha/*path", get(blob_handler))
.route("/repos/:rid/readme/:sha", get(readme_handler))
.route("/repos/:rid/issues", get(issues_handler))
.route("/repos/:rid/issues/:id", get(issue_handler))
.route("/repos/:rid/patches", get(patches_handler))
.route("/repos/:rid/patches/:id", get(patch_handler))
.route("/repos/{rid}", get(repo_handler))
.route("/repos/{rid}/commits", get(history_handler))
.route("/repos/{rid}/commits/{sha}", get(commit_handler))
.route("/repos/{rid}/diff/{base}/{oid}", get(diff_handler))
.route("/repos/{rid}/activity", get(activity_handler))
.route("/repos/{rid}/tree/{sha}/", get(tree_handler_root))
.route("/repos/{rid}/tree/{sha}/{*path}", get(tree_handler))
.route("/repos/{rid}/stats/tree/{sha}", get(stats_tree_handler))
.route("/repos/{rid}/remotes", get(remotes_handler))
.route("/repos/{rid}/remotes/{peer}", get(remote_handler))
.route("/repos/{rid}/blob/{sha}/{*path}", get(blob_handler))
.route("/repos/{rid}/readme/{sha}", get(readme_handler))
.route("/repos/{rid}/issues", get(issues_handler))
.route("/repos/{rid}/issues/{id}", get(issue_handler))
.route("/repos/{rid}/patches", get(patches_handler))
.route("/repos/{rid}/patches/{id}", get(patch_handler))
.with_state(ctx)
.layer(DefaultBodyLimit::max(MAX_BODY_LIMIT))
}
radicle-httpd/src/axum_extra.rs
+1 -3
View File
@@ -4,14 +4,13 @@ use axum::extract::FromRequestParts;
use axum::http::request::Parts;
use axum::http::{header, StatusCode};
use axum::response::IntoResponse;
use axum::{async_trait, Json};
use axum::Json;
use serde::de::DeserializeOwned;
use serde::Serialize;
pub struct Path<T>(pub T);
#[async_trait]
impl<S, T> FromRequestParts<S> for Path<T>
where
T: DeserializeOwned + Send,
@@ -53,7 +52,6 @@ where
#[derive(Default)]
pub struct Query<T>(pub T);
#[async_trait]
impl<S, T> FromRequestParts<S> for Query<T>
where
T: DeserializeOwned + Send,
radicle-httpd/src/git.rs
+1 -1
View File
@@ -24,7 +24,7 @@ use crate::error::GitError as Error;
pub fn router(profile: Arc<Profile>, aliases: HashMap<String, RepoId>) -> Router {
Router::new()
.route("/:rid/*request", any(git_handler))
.route("/{rid}/{*request}", any(git_handler))
.with_state((profile, aliases))
}
radicle-httpd/src/raw.rs
+5 -5
View File
@@ -26,11 +26,11 @@ const ARCHIVE_SUFFIX: &str = ".tar.gz";
pub fn router(profile: Arc<Profile>) -> Router {
Router::new()
.route("/:rid/:sha", get(commit_handler))
.route("/:rid/:sha/*path", get(file_by_commit_handler))
.route("/:rid/head/*path", get(file_by_canonical_head_handler))
.route("/:rid/archive/*refname", get(archive_by_refname_handler))
.route("/:rid/blobs/:oid", get(file_by_oid_handler))
.route("/{rid}/{sha}", get(commit_handler))
.route("/{rid}/{sha}/{*path}", get(file_by_commit_handler))
.route("/{rid}/head/{*path}", get(file_by_canonical_head_handler))
.route("/{rid}/archive/{*refname}", get(archive_by_refname_handler))
.route("/{rid}/blobs/{oid}", get(file_by_oid_handler))
.with_state(profile)
}