From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 59CDC1FF179 for ; Wed, 12 Nov 2025 10:42:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E9E181C4D1; Wed, 12 Nov 2025 10:42:47 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Wed, 12 Nov 2025 10:42:01 +0100 Message-ID: <20251112094203.112452-6-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112094203.112452-1-l.wagner@proxmox.com> References: <20251112094203.112452-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762940506337 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH datacenter-manager 5/7] api: pve tasks: use shared helpers for RemoteUpid handling X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" 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 --- 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 { 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, 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