From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 5F7B87875C
for <pbs-devel@lists.proxmox.com>; Fri, 30 Apr 2021 14:52:29 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 52EDF87DD
for <pbs-devel@lists.proxmox.com>; Fri, 30 Apr 2021 14:51:59 +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 id C182F8760
for <pbs-devel@lists.proxmox.com>; Fri, 30 Apr 2021 14:51:57 +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 9B2DA4298A
for <pbs-devel@lists.proxmox.com>; Fri, 30 Apr 2021 14:51:57 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Fri, 30 Apr 2021 14:51:56 +0200
Message-Id: <20210430125156.20072-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210430125156.20072-1-d.csapak@proxmox.com>
References: <20210430125156.20072-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.005 Adjusted score from AWL reputation of From: address
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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox-tape.rs, proxmox-backup-client.rs]
Subject: [pbs-devel] [PATCH proxmox-backup 1/1] bin: use
extract_output_format where necessary
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2021 12:52:29 -0000
else we sometimes forget to remove it from the 'params' variable
and use that further, running into 'invalid parameter' errors
found by giving 'output-format' paramter to proxmox-tape status
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/bin/proxmox-backup-client.rs | 3 +--
src/bin/proxmox-tape.rs | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index 50703dcb..578b2680 100644
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -1266,13 +1266,12 @@ async fn prune_async(mut param: Value) -> Result<Value, Error> {
let group = tools::required_string_param(¶m, "group")?;
let group: BackupGroup = group.parse()?;
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let quiet = param["quiet"].as_bool().unwrap_or(false);
param.as_object_mut().unwrap().remove("repository");
param.as_object_mut().unwrap().remove("group");
- param.as_object_mut().unwrap().remove("output-format");
param.as_object_mut().unwrap().remove("quiet");
param["backup-type"] = group.backup_type().into();
diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs
index e1b87e35..e18f334c 100644
--- a/src/bin/proxmox-tape.rs
+++ b/src/bin/proxmox-tape.rs
@@ -119,7 +119,7 @@ pub fn extract_drive_name(
/// Format media
async fn format_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -152,7 +152,7 @@ async fn format_media(mut param: Value) -> Result<(), Error> {
/// Rewind tape
async fn rewind(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -185,7 +185,7 @@ async fn rewind(mut param: Value) -> Result<(), Error> {
/// Eject/Unload drive media
async fn eject_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -221,7 +221,7 @@ async fn eject_media(mut param: Value) -> Result<(), Error> {
/// Load media with specified label
async fn load_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -318,7 +318,7 @@ async fn load_media_from_slot(mut param: Value) -> Result<(), Error> {
/// Unload media via changer
async fn unload_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -358,7 +358,7 @@ async fn unload_media(mut param: Value) -> Result<(), Error> {
/// Label media
async fn label_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -396,7 +396,7 @@ async fn label_media(mut param: Value) -> Result<(), Error> {
/// Read media label
async fn read_label(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -456,7 +456,7 @@ async fn inventory(
mut param: Value,
) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
let drive = extract_drive_name(&mut param, &config)?;
@@ -514,7 +514,7 @@ async fn inventory(
/// Label media with barcodes from changer device
async fn barcode_label_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -653,7 +653,7 @@ fn debug_scan(mut param: Value) -> Result<(), Error> {
/// Read Cartridge Memory (Medium auxiliary memory attributes)
async fn cartridge_memory(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -694,7 +694,7 @@ async fn cartridge_memory(mut param: Value) -> Result<(), Error> {
/// Read Volume Statistics (SCSI log page 17h)
async fn volume_statistics(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -732,7 +732,7 @@ async fn volume_statistics(mut param: Value) -> Result<(), Error> {
/// Get drive/media status
async fn status(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -792,7 +792,7 @@ async fn status(mut param: Value) -> Result<(), Error> {
/// Clean drive
async fn clean_drive(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -853,7 +853,7 @@ async fn clean_drive(mut param: Value) -> Result<(), Error> {
/// Backup datastore to tape media pool
async fn backup(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -900,7 +900,7 @@ async fn backup(mut param: Value) -> Result<(), Error> {
/// Restore data from media-set
async fn restore(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
@@ -947,7 +947,7 @@ async fn restore(mut param: Value) -> Result<(), Error> {
/// Scan media and record content
async fn catalog_media(mut param: Value) -> Result<(), Error> {
- let output_format = get_output_format(¶m);
+ let output_format = extract_output_format(&mut param);
let (config, _digest) = config::drive::config()?;
--
2.20.1