From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5E4E38A6BE for ; Thu, 20 Oct 2022 14:48:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 45C037B5B for ; Thu, 20 Oct 2022 14:48:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 20 Oct 2022 14:48:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B9F7844ABC for ; Thu, 20 Oct 2022 14:48:36 +0200 (CEST) Date: Thu, 20 Oct 2022 14:48:35 +0200 From: Wolfgang Bumiller To: Stefan Hanreich Cc: pbs-devel@lists.proxmox.com Message-ID: <20221020124835.uyfnpi6k2xeabr6p@casey.proxmox.com> References: <20221020113731.266248-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221020113731.266248-1-s.hanreich@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.251 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH proxmox-backup] fix #4301: correctly pass rate limit parameters to API X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2022 12:48:38 -0000 On Thu, Oct 20, 2022 at 01:37:31PM +0200, Stefan Hanreich wrote: > With the old code the rate limit parameters got passed in their own > dictionary under the limit key, but the API expects the rate-limit > settings as top-level keys. This commit correctly sets the rate-limit > parameters so the API actually uses them. > > Signed-off-by: Stefan Hanreich > --- > src/bin/proxmox-backup-manager.rs | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs > index 58e7e33a..cdd1037d 100644 > --- a/src/bin/proxmox-backup-manager.rs > +++ b/src/bin/proxmox-backup-manager.rs > @@ -2,7 +2,7 @@ use std::collections::HashMap; > use std::io::{self, Write}; > use std::str::FromStr; > > -use anyhow::Error; > +use anyhow::{Error, format_err}; > use serde_json::{json, Value}; > > use proxmox_router::{cli::*, RpcEnvironment}; > @@ -297,7 +297,6 @@ async fn pull_datastore( > "store": store, > "remote": remote, > "remote-store": remote_store, > - "limit": limit, > }); > > if remote_ns.is_some() { > @@ -320,6 +319,17 @@ async fn pull_datastore( > args["remove-vanished"] = Value::from(remove_vanished); > } > > + let args_map = args > + .as_object_mut() > + .ok_or_else(|| format_err!("args is not an Object"))?; ^ We create the `args` map only a few lines further up, so it would be fine to just `.unwrap()` here. And it would be nicer to keep the access short (iow move the `.as_object_mut()` down to where it's used for `.append()`) > + > + let mut limit_json = json!(limit); > + let limit_map = limit_json > + .as_object_mut() > + .ok_or_else(|| format_err!("limit is not an Object"))?; > + > + args_map.append(limit_map); > + > let result = client.post("api2/json/pull", Some(args)).await?; > > view_task_result(&client, result, &output_format).await?; > -- > 2.30.2