chore: migrate routes to new axum syntax

Author: Threated

broker/src/serve_health.rs

@@ -19,7 +19,7 @@ struct HealthOutput {
 pub(crate) fn router(health: Arc<RwLock<Health>>) -> Router {
     Router::new()
         .route("/v1/health", get(handler))
-        .route("/v1/health/proxies/:proxy_id", get(proxy_health))
+        .route("/v1/health/proxies/{proxy_id}", get(proxy_health))
         .route("/v1/health/proxies", get(get_all_proxies))
         .route("/v1/control", get(get_control_tasks).layer(axum::middleware::from_fn(log_version_mismatch)))
         .with_state(health)

broker/src/serve_pki.rs

@@ -47,12 +47,12 @@ pub(crate) fn router() -> Router {
         .route("/v1/pki/certs", get(get_certificate_list))
         .route("/v1/pki/certs/im-ca", get(get_im_cert))
         .route(
-            "/v1/pki/certs/by_serial/:serial",
+            "/v1/pki/certs/by_serial/{serial}",
             get(get_certificate_by_serial),
         )
 }
 
-#[tracing::instrument(name = "/v1/pki/certs/by_serial/:serial")]
+#[tracing::instrument(name = "/v1/pki/certs/by_serial/{serial}")]
 async fn get_certificate_by_serial(
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Path(serial): Path<String>,

broker/src/serve_sockets.rs

@@ -42,7 +42,7 @@ impl Default for SocketState {
 pub(crate) fn router() -> Router {
     Router::new()
         .route("/v1/sockets", get(get_socket_requests).post(post_socket_request))
-        .route("/v1/sockets/:id", get(connect_socket))
+        .route("/v1/sockets/{id}", get(connect_socket))
         .with_state(SocketState::default())
 }
 

broker/src/serve_tasks.rs

@@ -40,8 +40,8 @@ pub(crate) fn router() -> Router {
     let state = TasksState::default();
     Router::new()
         .route("/v1/tasks", get(get_tasks).post(post_task))
-        .route("/v1/tasks/:task_id/results", get(get_results_for_task))
-        .route("/v1/tasks/:task_id/results/:app_id", put(put_result))
+        .route("/v1/tasks/{task_id}/results", get(get_results_for_task))
+        .route("/v1/tasks/{task_id}/results/{app_id}", put(put_result))
         .with_state(state)
 }
 
@@ -82,7 +82,7 @@ async fn get_results_for_task(
     }
 }
 
-// GET /v1/tasks/:task_id/results
+// GET /v1/tasks/{task_id}/results
 async fn get_results_for_task_nostream(
     addr: SocketAddr,
     state: TasksState,
@@ -354,7 +354,7 @@ async fn post_task(
     ))
 }
 
-// PUT /v1/tasks/:task_id/results/:app_id
+// PUT /v1/tasks/{task_id}/results/{app_id}
 async fn put_result(
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Path((task_id, app_id)): Path<(MsgId, AppOrProxyId)>,

proxy/src/serve_sockets.rs

@@ -58,7 +58,7 @@ pub(crate) fn router(client: SamplyHttpClient) -> Router {
 
     Router::new()
         .route("/v1/sockets", get(get_tasks))
-        .route("/v1/sockets/:app_or_id", post(create_socket_con).get(connect_socket))
+        .route("/v1/sockets/{app_or_id}", post(create_socket_con).get(connect_socket))
         .with_state(state)
         .layer(Extension(task_secret_map))
 }

proxy/src/serve_tasks.rs

@@ -39,8 +39,8 @@ pub(crate) fn router(client: &SamplyHttpClient) -> Router {
     Router::new()
         // We need both path variants so the server won't send us into a redirect loop (/tasks, /tasks/, ...)
         .route("/v1/tasks", get(handler_task).post(handler_task))
-        .route("/v1/tasks/:task_id/results", get(handler_task))
-        .route("/v1/tasks/:task_id/results/:app_id", put(handler_task))
+        .route("/v1/tasks/{task_id}/results", get(handler_task))
+        .route("/v1/tasks/{task_id}/results/{app_id}", put(handler_task))
         .with_state(state)
 }