From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 8EC3F1FF164
for <inbox@lore.proxmox.com>; Fri, 28 Mar 2025 13:37:58 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 07A341BB7;
Fri, 28 Mar 2025 13:37:52 +0100 (CET)
Mime-Version: 1.0
Date: Fri, 28 Mar 2025 13:37:49 +0100
Message-Id: <D8RWL5JD1TGA.15IR1UERQNHN8@proxmox.com>
To: "Proxmox Datacenter Manager development discussion"
<pdm-devel@lists.proxmox.com>
From: "Max Carrara" <m.carrara@proxmox.com>
X-Mailer: aerc 0.18.2-0-ge037c095a049
References: <20250326150636.460010-1-m.sandoval@proxmox.com>
<20250326150636.460010-2-m.sandoval@proxmox.com>
In-Reply-To: <20250326150636.460010-2-m.sandoval@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.077 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: Re: [pdm-devel] [PATCH proxmox-datacenter-manager 2/2] pbs-client:
make use of query builder
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
<pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>
On Wed Mar 26, 2025 at 4:06 PM CET, Maximiliano Sandoval wrote:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
What I said in my response to patch 1 also applies here: Since I've
also looked at the patch for proxmox-client [1], this LGTM.
Consider:
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
[1]: https://lore.proxmox.com/pbs-devel/20250326144410.430616-1-m.sandoval@proxmox.com/T/#u
> ---
> server/src/pbs_client.rs | 33 +++++++++------------------------
> 1 file changed, 9 insertions(+), 24 deletions(-)
>
> diff --git a/server/src/pbs_client.rs b/server/src/pbs_client.rs
> index c4115c1..20d31f2 100644
> --- a/server/src/pbs_client.rs
> +++ b/server/src/pbs_client.rs
> @@ -7,7 +7,7 @@
> use anyhow::bail; // don't import Error as default error in here
> use serde::Deserialize;
>
> -use proxmox_client::{Error, HttpApiClient};
> +use proxmox_client::{ApiPathBuilder, Error, HttpApiClient};
> use proxmox_router::stream::JsonRecords;
> use proxmox_schema::api;
> use proxmox_section_config::typed::SectionConfigData;
> @@ -100,8 +100,10 @@ impl PbsClient {
> datastore: &str,
> namespace: Option<&str>,
> ) -> Result<JsonRecords<pbs_api_types::SnapshotListItem>, anyhow::Error> {
> - let mut path = format!("/api2/extjs/admin/datastore/{datastore}/snapshots");
> - add_query_arg(&mut path, &mut '?', "ns", &namespace);
> + let path =
> + ApiPathBuilder::new(format!("/api2/extjs/admin/datastore/{datastore}/snapshots"))
> + .maybe_arg("ns", &namespace)
> + .build();
> let response = self
> .0
> .streaming_request(http::Method::GET, &path, None::<()>)
> @@ -169,10 +171,10 @@ impl PbsClient {
> history: Option<bool>,
> start_time: Option<i64>,
> ) -> Result<pbs_api_types::Metrics, Error> {
> - let mut path = "/api2/extjs/status/metrics".to_string();
> - let mut sep = '?';
> - add_query_arg(&mut path, &mut sep, "history", &history);
> - add_query_arg(&mut path, &mut sep, "start-time", &start_time);
> + let path = ApiPathBuilder::new("/api2/extjs/status/metrics")
> + .maybe_arg("history", &history)
> + .maybe_arg("start-time", &start_time)
> + .build();
>
> Ok(self.0.get(&path).await?.expect_json()?.data)
> }
> @@ -192,20 +194,3 @@ impl PbsClient {
> struct JsonData<T> {
> data: T,
> }
> -
> -/// Add an optional string parameter to the query, and if it was added, change `separator` to `&`.
> -fn add_query_arg<T>(query: &mut String, separator: &mut char, name: &str, value: &Option<T>)
> -where
> - T: std::fmt::Display,
> -{
> - if let Some(value) = value {
> - query.push(*separator);
> - *separator = '&';
> - query.push_str(name);
> - query.push('=');
> - query.extend(percent_encoding::percent_encode(
> - value.to_string().as_bytes(),
> - percent_encoding::NON_ALPHANUMERIC,
> - ));
> - }
> -}
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel