From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 741591FF16F for ; Tue, 14 Oct 2025 10:35:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 307F223A5A; Tue, 14 Oct 2025 10:36:12 +0200 (CEST) Message-ID: <9948790b-0076-45d0-a9fe-4aeb600d223e@proxmox.com> Date: Tue, 14 Oct 2025 10:35:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Datacenter Manager development discussion , Christian Ebner References: <20251013085623.211136-1-c.ebner@proxmox.com> <20251013085623.211136-2-c.ebner@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20251013085623.211136-2-c.ebner@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760430900724 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pdm-devel] [PATCH datacenter-manager 1/7] server: api: add remote-type search category for resources 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" one comment inline On 10/13/25 10:56 AM, Christian Ebner wrote: > Extend the current search capability for resources by adding the > `RemoteType` search category, allowing to selectively filter remotes > of type PVE and PBS. While extending the search capabilities, this > will also be used to filter the resources to be gathered on status > api calls, to refine statistics based on remote type. > > Since the current remote filtering is only applied in case of remotes > only search, add an additional helper to pre-filter the to be fetched > resources by the remote type. > > With this it is now possible to search, e.g. `remote-type:pbs` to > only get resources from PBS remotes. > > Signed-off-by: Christian Ebner > --- > server/src/api/resources.rs | 44 +++++++++++++++++++++++++++++++++---- > 1 file changed, 40 insertions(+), 4 deletions(-) > > diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs > index f4f56bc..029106f 100644 > --- a/server/src/api/resources.rs > +++ b/server/src/api/resources.rs > @@ -56,6 +56,7 @@ enum MatchCategory { > Status, > Template, > Remote, > + RemoteType, > } > > impl std::str::FromStr for MatchCategory { > @@ -69,6 +70,7 @@ impl std::str::FromStr for MatchCategory { > "status" => MatchCategory::Status, > "template" => MatchCategory::Template, > "remote" => MatchCategory::Remote, > + "remote-type" => MatchCategory::RemoteType, > _ => bail!("invalid category"), > }; > Ok(category) > @@ -88,11 +90,18 @@ impl MatchCategory { > (Ok(a), Ok(b)) => a == b, > _ => false, > }, > + MatchCategory::RemoteType => match ( > + RemoteType::from_str(value), > + RemoteType::from_str(search_term), > + ) { > + (Ok(a), Ok(b)) => a == b, > + _ => false, > + }, > } > } > } > > -// returns None if we can't decide if it matches, currently only for the `Remote` category` > +// returns None if we can't decide if it matches, currently only for the `RemoteType` category > fn resource_matches_search_term( > remote_name: &str, > resource: &Resource, > @@ -112,6 +121,7 @@ fn resource_matches_search_term( > _ => false, > }, > MatchCategory::Remote => category.matches(remote_name, &term.value), > + MatchCategory::RemoteType => return None, > }, > Some(Err(_)) => false, > None => { > @@ -122,7 +132,12 @@ fn resource_matches_search_term( > Some(matches) > } > > -fn remote_matches_search_term(remote_name: &str, online: Option, term: &SearchTerm) -> bool { > +fn remote_matches_search_term( > + remote_name: &str, > + online: Option, > + remote_type: Option, > + term: &SearchTerm, maybe we could just pass '&Remote' here? then we don't have to add a new parameter in case we want extra info from the remote in the future? this would mean that we add a more complete remote struct in the `RemoteResources` one, but that could help later (see my comment on patch 3) > +) -> bool { > match term.category.as_deref().map(|c| c.parse::()) { > Some(Ok(category)) => match category { > MatchCategory::Type => category.matches("remote", &term.value), > @@ -135,6 +150,10 @@ fn remote_matches_search_term(remote_name: &str, online: Option, term: &Se > None => true, > }, > MatchCategory::Template => false, > + MatchCategory::RemoteType => match remote_type { > + Some(remote_type) => category.matches(&remote_type.to_string(), &term.value), > + None => true, > + }, > }, > Some(Err(_)) => false, > None => { > @@ -144,6 +163,17 @@ fn remote_matches_search_term(remote_name: &str, online: Option, term: &Se > } > } > > +fn remote_type_matches_search_term(remote_type: RemoteType, term: &SearchTerm) -> bool { > + match term.category.as_deref().map(|c| c.parse::()) { > + Some(Ok(category)) => match category { > + MatchCategory::RemoteType => category.matches(&remote_type.to_string(), &term.value), > + _ => true, > + }, > + Some(Err(_)) => false, > + None => true, > + } > +} > + > #[api( > // FIXME:: see list-like API calls in resource routers, we probably want more fine-grained > // checks.. > @@ -248,8 +278,14 @@ pub(crate) async fn get_resources_impl( > } > } > > + if !filters.matches(|term| remote_type_matches_search_term(remote.ty, term)) { > + continue; > + } > + > if remotes_only > - && !filters.matches(|term| remote_matches_search_term(&remote_name, None, term)) > + && !filters.matches(|term| { > + remote_matches_search_term(&remote_name, None, Some(remote.ty), term) > + }) > { > continue; > } > @@ -301,7 +337,7 @@ pub(crate) async fn get_resources_impl( > return true; > } > filters.matches(|filter| { > - remote_matches_search_term(&res.remote, Some(res.error.is_none()), filter) > + remote_matches_search_term(&res.remote, Some(res.error.is_none()), None, filter) > }) > }) > } _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel