From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 07E9765DB5
for <pbs-devel@lists.proxmox.com>; Thu, 5 Nov 2020 11:03:37 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E88671616B
for <pbs-devel@lists.proxmox.com>; Thu, 5 Nov 2020 11:03:06 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(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 firstgate.proxmox.com (Proxmox) with ESMTPS id 6689516162
for <pbs-devel@lists.proxmox.com>; Thu, 5 Nov 2020 11:03:06 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 286E546022
for <pbs-devel@lists.proxmox.com>; Thu, 5 Nov 2020 11:03:06 +0100 (CET)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 5 Nov 2020 11:03:01 +0100
Message-Id: <20201105100301.4212-1-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.029 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [command.rs]
Subject: [pbs-devel] [PATCH proxmox] fix prefix for nested commands
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: Thu, 05 Nov 2020 10:03:37 -0000
Fixes a regression from commit f50a627f340ca2ae018079e431edd5a127638458
which resulted in re-using the prefix without sub-commands when calling
handle_simple_command(_future)
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
For example,
proxmox-backup-manager user create foo
is affected by this and printed:
Usage: proxmox-backup-manager <userid> [OPTIONS]
instead of:
Usage: proxmox-backup-manager user create <userid> [OPTIONS]
proxmox/src/api/cli/command.rs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/proxmox/src/api/cli/command.rs b/proxmox/src/api/cli/command.rs
index 53e3d93..89dfdf1 100644
--- a/proxmox/src/api/cli/command.rs
+++ b/proxmox/src/api/cli/command.rs
@@ -148,12 +148,11 @@ fn handle_simple_command(
}
fn parse_nested_command<'a>(
- prefix: &str,
+ prefix: &mut String,
def: &'a CliCommandMap,
args: &mut Vec<String>,
) -> Result<&'a CliCommand, Error> {
let mut map = def;
- let mut prefix = prefix.to_string();
// Note: Avoid async recursive function, because current rust compiler cant handle that
loop {
@@ -185,7 +184,7 @@ fn parse_nested_command<'a>(
}
};
- prefix = format!("{} {}", prefix, command);
+ *prefix = format!("{} {}", prefix, command);
match sub_cmd {
CommandLineInterface::Simple(cli_cmd) => {
@@ -277,7 +276,8 @@ pub async fn handle_command_future(
handle_simple_command_future(&prefix, &cli_cmd, args, rpcenv).await
}
CommandLineInterface::Nested(ref map) => {
- let cli_cmd = parse_nested_command(&prefix, &map, &mut args)?;
+ let mut prefix = prefix.to_string();
+ let cli_cmd = parse_nested_command(&mut prefix, &map, &mut args)?;
handle_simple_command_future(&prefix, &cli_cmd, args, rpcenv).await
}
};
@@ -305,7 +305,8 @@ pub fn handle_command(
handle_simple_command(&prefix, &cli_cmd, args, rpcenv, run)
}
CommandLineInterface::Nested(ref map) => {
- let cli_cmd = parse_nested_command(&prefix, &map, &mut args)?;
+ let mut prefix = prefix.to_string();
+ let cli_cmd = parse_nested_command(&mut prefix, &map, &mut args)?;
handle_simple_command(&prefix, &cli_cmd, args, rpcenv, run)
}
};
--
2.20.1