proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-01 03:19:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rest-server: borrow parts parameter in get_request_parameter

Browse Source 
this function does not require ownership of the parts parameter, so we
can simply borrow it. this way we can pass the parameter on to a
handler that consumes them even when using `get_request_parameter`

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
This commit is contained in:
Shannon Sterz 2025-03-04 15:42:28 +01:00 committed by Wolfgang Bumiller
parent 316fe71133
commit b1ed231ed2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proxmox-rest-server/src/rest.rs
View File

@ -383,7 +383,7 @@ fn parse_query_parameters<S: 'static + BuildHasher + Send>(
async fn get_request_parameters<S: 'static + BuildHasher + Send>( async fn get_request_parameters<S: 'static + BuildHasher + Send>(
param_schema: ParameterSchema, param_schema: ParameterSchema,
parts: Parts, parts: &Parts,
req_body: Body, req_body: Body,
uri_param: HashMap<String, String, S>, uri_param: HashMap<String, String, S>,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
@ -433,7 +433,7 @@ async fn get_request_parameters<S: 'static + BuildHasher + Send>(
param_schema.verify_json(&params)?; param_schema.verify_json(&params)?;
Ok(params) Ok(params)
} else { } else {
parse_query_parameters(param_schema, utf8_data, &parts, &uri_param) parse_query_parameters(param_schema, utf8_data, parts, &uri_param)
} }
} }
@ -548,7 +548,7 @@ pub(crate) async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHa
} }
ApiHandler::StreamSync(handler) => { ApiHandler::StreamSync(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
match (handler)(params, info, &mut rpcenv) { match (handler)(params, info, &mut rpcenv) {
Ok(iter) if accept_json_seq => handle_sync_stream_as_json_seq(iter), Ok(iter) if accept_json_seq => handle_sync_stream_as_json_seq(iter),
Ok(iter) => iter Ok(iter) => iter
@ -559,7 +559,7 @@ pub(crate) async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHa
} }
ApiHandler::StreamAsync(handler) => { ApiHandler::StreamAsync(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
match (handler)(params, info, &mut rpcenv).await { match (handler)(params, info, &mut rpcenv).await {
Ok(stream) if accept_json_seq => handle_stream_as_json_seq(stream), Ok(stream) if accept_json_seq => handle_stream_as_json_seq(stream),
Ok(stream) => stream Ok(stream) => stream
@ -571,25 +571,25 @@ pub(crate) async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHa
} }
ApiHandler::SerializingSync(handler) => { ApiHandler::SerializingSync(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
(handler)(params, info, &mut rpcenv) (handler)(params, info, &mut rpcenv)
.and_then(|data| formatter.format_data_streaming(data, &rpcenv)) .and_then(|data| formatter.format_data_streaming(data, &rpcenv))
} }
ApiHandler::SerializingAsync(handler) => { ApiHandler::SerializingAsync(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
(handler)(params, info, &mut rpcenv) (handler)(params, info, &mut rpcenv)
.await .await
.and_then(|data| formatter.format_data_streaming(data, &rpcenv)) .and_then(|data| formatter.format_data_streaming(data, &rpcenv))
} }
ApiHandler::Sync(handler) => { ApiHandler::Sync(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
(handler)(params, info, &mut rpcenv).map(|data| formatter.format_data(data, &rpcenv)) (handler)(params, info, &mut rpcenv).map(|data| formatter.format_data(data, &rpcenv))
} }
ApiHandler::Async(handler) => { ApiHandler::Async(handler) => {
let params = let params =
get_request_parameters(info.parameters, parts, req_body, uri_param).await?; get_request_parameters(info.parameters, &parts, req_body, uri_param).await?;
(handler)(params, info, &mut rpcenv) (handler)(params, info, &mut rpcenv)
.await .await
.map(|data| formatter.format_data(data, &rpcenv)) .map(|data| formatter.format_data(data, &rpcenv))