[pdm-devel] [PATCH datacenter-manager 5/7] api: pve tasks: use shared helpers for RemoteUpid handling

[Lukas Wagner <l.wagner@proxmox.com>]

The helpers defined in RemoteUpid, as well as the verify_upid helper
make the code much shorter and easy to read.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 server/src/api/pve/tasks.rs | 62 ++++++++++---------------------------
 1 file changed, 17 insertions(+), 45 deletions(-)

diff --git a/server/src/api/pve/tasks.rs b/server/src/api/pve/tasks.rs
index e66712ac..5edce149 100644
--- a/server/src/api/pve/tasks.rs
+++ b/server/src/api/pve/tasks.rs
@@ -1,17 +1,16 @@
 //! Access to PVE tasks.
 
-use anyhow::{bail, format_err, Error};
+use anyhow::Error;
 
 use proxmox_router::{list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap};
 use proxmox_schema::api;
 use proxmox_sortable_macro::sortable;
 
-use pdm_api_types::remotes::REMOTE_ID_SCHEMA;
+use pdm_api_types::remotes::{RemoteType, REMOTE_ID_SCHEMA};
 use pdm_api_types::{
     RemoteUpid, NODE_SCHEMA, PRIV_RESOURCE_AUDIT, PRIV_RESOURCE_MANAGE,
     TASKLOG_DOWNLOAD_PARAM_SCHEMA, TASKLOG_LIMIT_PARAM_SCHEMA, TASKLOG_START_PARAM_SCHEMA,
 };
-use pve_api_types::PveUpid;
 
 use super::{connect, connect_to_remote, get_remote};
 
@@ -82,23 +81,14 @@ async fn list_tasks(
 async fn stop_task(remote: String, upid: RemoteUpid) -> Result<(), Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
-    if upid.remote() != remote {
-        bail!(
-            "remote '{remote}' does not match remote in upid ('{}')",
-            upid.remote()
-        );
-    }
+    crate::api::verify_upid(&remote, RemoteType::Pve, &upid)?;
 
-    let pve = get_remote(&remotes, upid.remote())?;
+    let pve_upid = upid.pve_upid()?;
 
-    let pve_upid: PveUpid = upid
-        .upid()
-        .parse()
-        .map_err(|err| format_err!("invalid upid for PVE: {} - {err}", upid.upid()))?;
+    let remote = get_remote(&remotes, upid.remote())?;
+    let client = connect(remote)?;
 
-    let pve = connect(pve)?;
-
-    Ok(pve.stop_task(&pve_upid.node, upid.upid()).await?)
+    Ok(client.stop_task(&pve_upid.node, upid.upid()).await?)
 }
 
 #[api(
@@ -128,24 +118,15 @@ pub async fn get_task_status(
 ) -> Result<pve_api_types::TaskStatus, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
-    if upid.remote() != remote {
-        bail!(
-            "remote '{remote}' does not match remote in upid ('{}')",
-            upid.remote()
-        );
-    }
+    crate::api::verify_upid(&remote, RemoteType::Pve, &upid)?;
 
-    let pve = get_remote(&remotes, upid.remote())?;
+    let pve_upid = upid.pve_upid()?;
 
-    let pve_upid: PveUpid = upid
-        .upid()
-        .parse()
-        .map_err(|err| format_err!("invalid upid for PVE: {} - {err}", upid.upid()))?;
-
-    let pve = connect(pve)?;
+    let remote = get_remote(&remotes, upid.remote())?;
+    let client = connect(remote)?;
 
     loop {
-        let status = pve.get_task_status(&pve_upid.node, upid.upid()).await?;
+        let status = client.get_task_status(&pve_upid.node, upid.upid()).await?;
         if !wait || !status.is_running() {
             break Ok(status);
         }
@@ -189,23 +170,14 @@ async fn read_task_log(
 ) -> Result<Vec<pve_api_types::TaskLogLine>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
-    if upid.remote() != remote {
-        bail!(
-            "remote '{remote}' does not match remote in upid ('{}')",
-            upid.remote()
-        );
-    }
+    crate::api::verify_upid(&remote, RemoteType::Pve, &upid)?;
 
-    let pve = get_remote(&remotes, upid.remote())?;
+    let pve_upid = upid.pve_upid()?;
 
-    let pve_upid: PveUpid = upid
-        .upid()
-        .parse()
-        .map_err(|err| format_err!("invalid upid for PVE: {} - {err}", upid.upid()))?;
+    let remote = get_remote(&remotes, upid.remote())?;
+    let client = connect(remote)?;
 
-    let pve = connect(pve)?;
-
-    let response = pve
+    let response = client
         .get_task_log(&pve_upid.node, upid.upid(), download, limit, start)
         .await?;
 
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel