From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id AA5751FF0A8 for ; Thu, 20 Aug 2026 16:52:46 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 64D4E21645; Thu, 20 Aug 2026 16:52:38 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager v2 07/20] remote iterator: pass remote config reader explicitly Date: Thu, 20 Aug 2026 16:52:07 +0200 Message-ID: <20260820145220.418032-8-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260820145220.418032-1-l.wagner@proxmox.com> References: <20260820145220.418032-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1787237518657 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.735 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: MKEV4GY7XAPK5HKMIIRTACRZBJX33C3J X-Message-ID-Hash: MKEV4GY7XAPK5HKMIIRTACRZBJX33C3J X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This will be useful later once we get a reference to the remote config implementation via the application context object. Also, it gently nudges developers to think about the previously hidden dependency. Signed-off-by: Lukas Wagner --- lib/pdm-config/src/remotes.rs | 2 +- server/src/api/pbs/mod.rs | 10 ++++------ server/src/api/pve/firewall.rs | 3 ++- server/src/api/pve/mod.rs | 3 ++- server/src/api/remotes/mod.rs | 5 +++-- server/src/api/remotes/updates.rs | 3 ++- server/src/api/sdn/controllers.rs | 2 +- server/src/api/sdn/vnets.rs | 2 +- server/src/api/sdn/zones.rs | 2 +- server/src/api/subscriptions/mod.rs | 10 ++++++---- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/lib/pdm-config/src/remotes.rs b/lib/pdm-config/src/remotes.rs index 47754e9b..4db6be20 100644 --- a/lib/pdm-config/src/remotes.rs +++ b/lib/pdm-config/src/remotes.rs @@ -21,7 +21,7 @@ pub const REMOTES_CFG_LOCKFILE: &str = configdir!("/.remotes.lock"); static INSTANCE: OnceLock> = OnceLock::new(); -fn instance() -> &'static (dyn RemoteConfig + Send + Sync) { +pub fn instance() -> &'static (dyn RemoteConfig + Send + Sync) { // Not initializing the remote config instance is // entirely in our responsibility and not something we can recover from, // so it should be okay to panic in this case. diff --git a/server/src/api/pbs/mod.rs b/server/src/api/pbs/mod.rs index 1fc75c34..41ee2c08 100644 --- a/server/src/api/pbs/mod.rs +++ b/server/src/api/pbs/mod.rs @@ -13,11 +13,9 @@ use pdm_api_types::{ Authid, HOST_OPTIONAL_PORT_FORMAT, PRIV_RESOURCE_AUDIT, PRIV_SYS_MODIFY, RemoteUpid, }; -use crate::{ - connection::{self, probe_tls_connection}, - pbs_client::{self, PbsClient, get_remote}, -}; - +use crate::api::remotes::RemoteIterator; +use crate::connection::{self, probe_tls_connection}; +use crate::pbs_client::{self, PbsClient, get_remote}; use crate::remote_tasks; mod node; @@ -96,7 +94,7 @@ pub async fn new_remote_upid( )] /// Return the list of PBS remotes fn list_remotes() -> Result, Error> { - Ok(super::remotes::RemoteIterator::new()? + Ok(RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(RemoteType::Pbs) .into_names() .map(|name| RemoteListEntry { remote: name }) diff --git a/server/src/api/pve/firewall.rs b/server/src/api/pve/firewall.rs index 5a6a209e..b381a14e 100644 --- a/server/src/api/pve/firewall.rs +++ b/server/src/api/pve/firewall.rs @@ -17,6 +17,7 @@ use pdm_api_types::{NODE_SCHEMA, VMID_SCHEMA}; use pdm_api_types::{PRIV_RESOURCE_AUDIT, PRIV_RESOURCE_MODIFY, PRIV_SYS_MODIFY}; use super::{connect_to_remote_by_id, find_node_for_vm}; +use crate::api::remotes::RemoteIterator; use crate::connection::PveClient; use crate::parallel_fetcher::ParallelFetcher; @@ -249,7 +250,7 @@ async fn fetch_node_firewall_status( pub async fn pve_firewall_status( _rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { - let pve_remotes: Vec = crate::api::remotes::RemoteIterator::new()? + let pve_remotes: Vec = RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(pdm_api_types::remotes::RemoteType::Pve) .into_remotes() .collect(); diff --git a/server/src/api/pve/mod.rs b/server/src/api/pve/mod.rs index 0970f2ff..4f6f7215 100644 --- a/server/src/api/pve/mod.rs +++ b/server/src/api/pve/mod.rs @@ -30,6 +30,7 @@ use pve_api_types::{ClusterResourceKind, ClusterResourceType}; use super::resources::{map_pve_lxc, map_pve_node, map_pve_qemu, map_pve_storage}; +use crate::api::remotes::RemoteIterator; use crate::connection::PveClient; use crate::connection::{self, probe_tls_connection}; use crate::remote_tasks; @@ -142,7 +143,7 @@ pub fn connect_to_remote_by_id(id: &str) -> Result, Error> { )] /// Return the list of PVE remotes fn list_remotes() -> Result, Error> { - Ok(super::remotes::RemoteIterator::new()? + Ok(RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(RemoteType::Pve) .into_names() .map(|name| RemoteListEntry { remote: name }) diff --git a/server/src/api/remotes/mod.rs b/server/src/api/remotes/mod.rs index 5c9fdccf..d039e6da 100644 --- a/server/src/api/remotes/mod.rs +++ b/server/src/api/remotes/mod.rs @@ -4,6 +4,7 @@ use std::collections::HashSet; use std::error::Error as _; use anyhow::{Context, Error, bail, format_err}; +use pdm_config::remotes::RemoteConfig; use serde::{Deserialize, Serialize}; use proxmox_access_control::CachedUserInfo; @@ -129,8 +130,8 @@ pub struct RemoteIterator { impl RemoteIterator { /// Load the remote config and create an unfiltered iterator. - pub fn new() -> Result { - let (config, _) = pdm_config::remotes::config()?; + pub fn new(config_impl: &dyn RemoteConfig) -> Result { + let (config, _) = config_impl.read()?; Ok(Self { remotes: config.into_iter().collect(), }) diff --git a/server/src/api/remotes/updates.rs b/server/src/api/remotes/updates.rs index d5b6d2dd..0945478b 100644 --- a/server/src/api/remotes/updates.rs +++ b/server/src/api/remotes/updates.rs @@ -17,6 +17,7 @@ use proxmox_router::{ use proxmox_schema::api; use proxmox_sortable_macro::sortable; +use crate::api::remotes::RemoteIterator; use crate::{connection, remote_updates}; use super::get_remote; @@ -88,7 +89,7 @@ pub fn refresh_remote_update_summaries(rpcenv: &mut dyn RpcEnvironment) -> Resul http_bail!(FORBIDDEN, "user has no access to resources"); } - let remotes: Vec = super::RemoteIterator::new()? + let remotes: Vec = RemoteIterator::new(pdm_config::remotes::instance())? .all_privs(&user_info, &auth_id, PRIV_RESOURCE_MODIFY) .into_remotes() .collect(); diff --git a/server/src/api/sdn/controllers.rs b/server/src/api/sdn/controllers.rs index c90e44c9..060fef72 100644 --- a/server/src/api/sdn/controllers.rs +++ b/server/src/api/sdn/controllers.rs @@ -75,7 +75,7 @@ pub async fn list_controllers( http_bail!(FORBIDDEN, "user has no access to resources"); } - let mut iter = RemoteIterator::new()? + let mut iter = RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(RemoteType::Pve) .any_privs(&user_info, &auth_id, PRIV_RESOURCE_AUDIT); if let Some(ref filter) = remotes { diff --git a/server/src/api/sdn/vnets.rs b/server/src/api/sdn/vnets.rs index ede7b539..30d431bc 100644 --- a/server/src/api/sdn/vnets.rs +++ b/server/src/api/sdn/vnets.rs @@ -76,7 +76,7 @@ async fn list_vnets( http_bail!(FORBIDDEN, "user has no access to resources"); } - let mut iter = RemoteIterator::new()? + let mut iter = RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(RemoteType::Pve) .any_privs(&user_info, &auth_id, PRIV_RESOURCE_AUDIT); if let Some(ref filter) = remotes { diff --git a/server/src/api/sdn/zones.rs b/server/src/api/sdn/zones.rs index da471ba9..d37dc46c 100644 --- a/server/src/api/sdn/zones.rs +++ b/server/src/api/sdn/zones.rs @@ -82,7 +82,7 @@ pub async fn list_zones( http_bail!(FORBIDDEN, "user has no access to resources"); } - let mut iter = RemoteIterator::new()? + let mut iter = RemoteIterator::new(pdm_config::remotes::instance())? .remote_type(RemoteType::Pve) .any_privs(&user_info, &auth_id, PRIV_RESOURCE_AUDIT); if let Some(ref filter) = remotes { diff --git a/server/src/api/subscriptions/mod.rs b/server/src/api/subscriptions/mod.rs index 48b15b98..81582945 100644 --- a/server/src/api/subscriptions/mod.rs +++ b/server/src/api/subscriptions/mod.rs @@ -29,6 +29,7 @@ use pdm_api_types::{ Authid, NODE_SCHEMA, PRIV_RESOURCE_AUDIT, PRIV_RESOURCE_MODIFY, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, }; +use crate::api::remotes::RemoteIterator; use crate::api::resources::{ get_subscription_info_for_remote, invalidate_subscription_info_for_remote, }; @@ -1431,10 +1432,11 @@ async fn collect_node_status( .parse()?; let user_info = CachedUserInfo::new()?; - let visible_remotes: Vec<(String, Remote)> = crate::api::remotes::RemoteIterator::new()? - .any_privs(&user_info, &auth_id, PRIV_RESOURCE_AUDIT) - .into_iter() - .collect(); + let visible_remotes: Vec<(String, Remote)> = + RemoteIterator::new(pdm_config::remotes::instance())? + .any_privs(&user_info, &auth_id, PRIV_RESOURCE_AUDIT) + .into_iter() + .collect(); let (keys_config, _) = pdm_config::subscriptions::config()?; -- 2.47.3