axum: Adjust to new path syntax

Author: Turbo87

src/config/server.rs

@@ -109,7 +109,7 @@ impl Server {
     /// - `FORCE_UNCONDITIONAL_REDIRECTS`: Whether to force unconditional redirects in the download
     ///   endpoint even with a healthy database pool.
     /// - `BLOCKED_ROUTES`: A comma separated list of HTTP route patterns that are manually blocked
-    ///   by an operator (e.g. `/crates/:crate_id/:version/download`).
+    ///   by an operator (e.g. `/crates/{crate_id}/{version}/download`).
     ///
     /// # Panics
     ///

src/controllers/metrics.rs

@@ -6,7 +6,7 @@ use http::request::Parts;
 use http::{header, StatusCode};
 use prometheus::TextEncoder;
 
-/// Handles the `GET /api/private/metrics/:kind` endpoint.
+/// Handles the `GET /api/private/metrics/{kind}` endpoint.
 pub async fn prometheus(app: AppState, Path(kind): Path<String>, req: Parts) -> AppResult<String> {
     if let Some(expected_token) = &app.config.metrics_authorization_token {
         let provided_token = req

src/middleware/cargo_compat.rs

@@ -75,11 +75,11 @@ pub async fn middleware(
 fn is_cargo_endpoint(method: &Method, path: &str) -> bool {
     const CARGO_ENDPOINTS: &[(Method, &str)] = &[
         (Method::PUT, "/api/v1/crates/new"),
-        (Method::DELETE, "/api/v1/crates/:crate_id/:version/yank"),
-        (Method::PUT, "/api/v1/crates/:crate_id/:version/unyank"),
-        (Method::GET, "/api/v1/crates/:crate_id/owners"),
-        (Method::PUT, "/api/v1/crates/:crate_id/owners"),
-        (Method::DELETE, "/api/v1/crates/:crate_id/owners"),
+        (Method::DELETE, "/api/v1/crates/{crate_id}/{version}/yank"),
+        (Method::PUT, "/api/v1/crates/{crate_id}/{version}/unyank"),
+        (Method::GET, "/api/v1/crates/{crate_id}/owners"),
+        (Method::PUT, "/api/v1/crates/{crate_id}/owners"),
+        (Method::DELETE, "/api/v1/crates/{crate_id}/owners"),
         (Method::GET, "/api/v1/crates"),
     ];
 

src/router.rs

@@ -91,7 +91,7 @@ pub fn build_axum_router(state: AppState) -> Router<()> {
 
     let mut router = router
         // Metrics
-        .route("/api/private/metrics/:kind", get(metrics::prometheus))
+        .route("/api/private/metrics/{kind}", get(metrics::prometheus))
         // Alerts from GitHub scanning for exposed API tokens
         .route(
             "/api/github/secret-scanning/verify",

src/tests/blocked_routes.rs

@@ -32,7 +32,7 @@ async fn test_blocked_download_route() {
             config.blocked_routes.clear();
             config
                 .blocked_routes
-                .insert("/api/v1/crates/:name/:version/download".into());
+                .insert("/api/v1/crates/{name}/{version}/download".into());
         })
         .with_user()
         .await;

src/tests/routes/crates/owners/add.rs

@@ -7,7 +7,7 @@ use insta::assert_snapshot;
 
 // This is testing Cargo functionality! ! !
 // specifically functions modify_owners and add_owners
-// which call the `PUT /crates/:crate_id/owners` route
+// which call the `PUT /crates/{crate_id}/owners` route
 #[tokio::test(flavor = "multi_thread")]
 async fn test_cargo_invite_owners() {
     let (app, _, owner) = TestApp::init().with_user().await;

src/tests/routes/users/read.rs

@@ -32,7 +32,7 @@ async fn show_latest_user_case_insensitively() {
     // available for anyone to take. We need to support having multiple user accounts
     // with the same gh_login in crates.io. `gh_id` is stable across renames, so that field
     // should be used for uniquely identifying GitHub accounts whenever possible. For the
-    // crates.io/user/:username pages, the best we can do is show the last crates.io account
+    // crates.io/user/{username} pages, the best we can do is show the last crates.io account
     // created with that username.
 
     let user1 = NewUser::new(

src/tests/user.rs

@@ -134,7 +134,7 @@ async fn github_with_email_does_not_overwrite_email() -> anyhow::Result<()> {
 }
 
 /// Given a crates.io user, check that the user's email can be
-/// updated in the database (PUT /user/:user_id), then check
+/// updated in the database (PUT /user/{user_id}), then check
 /// that the updated email is sent back to the user (GET /me).
 #[tokio::test(flavor = "multi_thread")]
 async fn test_email_get_and_put() -> anyhow::Result<()> {
@@ -155,7 +155,7 @@ async fn test_email_get_and_put() -> anyhow::Result<()> {
 
 /// Given a new user, test that their email can be added
 /// to the email table and a token for the email is generated
-/// and added to the token table. When /confirm/:email_token is
+/// and added to the token table. When /confirm/{email_token} is
 /// requested, check that the response back is ok, and that
 /// the email_verified field on user is now set to true.
 #[tokio::test(flavor = "multi_thread")]