From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.reiter@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 B09486900F
for <pbs-devel@lists.proxmox.com>; Thu, 12 Nov 2020 10:13:33 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9DB3DC7C1
for <pbs-devel@lists.proxmox.com>; Thu, 12 Nov 2020 10:13:03 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 2884DC7B1
for <pbs-devel@lists.proxmox.com>; Thu, 12 Nov 2020 10:13:03 +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 E46F841EF1
for <pbs-devel@lists.proxmox.com>; Thu, 12 Nov 2020 10:13:02 +0100 (CET)
From: Stefan Reiter <s.reiter@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 12 Nov 2020 10:12:54 +0100
Message-Id: <20201112091254.29059-1-s.reiter@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <36cbccc4-340b-933b-63d7-921bc332a25b@proxmox.com>
References: <36cbccc4-340b-933b-63d7-921bc332a25b@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.036 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. [apt.rs, proxmox-backup-manager.rs]
Subject: [pbs-devel] [PATCH proxmox-backup] apt: use typed response for
get_versions
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, 12 Nov 2020 09:13:33 -0000
...and cleanup get_versions for manager CLI.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
No need to return an untyped Value, especially if we want to further work with
it, so how about this for a cleanup?
src/api2/node/apt.rs | 4 ++--
src/bin/proxmox-backup-manager.rs | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs
index 500b2309..765ea525 100644
--- a/src/api2/node/apt.rs
+++ b/src/api2/node/apt.rs
@@ -261,7 +261,7 @@ fn apt_get_changelog(
},
)]
/// Get package information for important Proxmox Backup Server packages.
-pub fn get_versions() -> Result<Value, Error> {
+pub fn get_versions() -> Result<Vec<APTUpdateInfo>, Error> {
const PACKAGES: &[&str] = &[
"ifupdown2",
"libjs-extjs",
@@ -350,7 +350,7 @@ pub fn get_versions() -> Result<Value, Error> {
}
}
- Ok(json!(packages))
+ Ok(packages)
}
const SUBDIRS: SubdirMap = &[
diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index 84ec0148..80e699f1 100644
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -383,14 +383,8 @@ async fn report() -> Result<Value, Error> {
async fn get_versions(verbose: bool, param: Value) -> Result<Value, Error> {
let output_format = get_output_format(¶m);
- let mut packages = if verbose {
- crate::api2::node::apt::get_versions()?
- } else {
- // TODO: slice first element out in a nicer way?
- let packages = crate::api2::node::apt::get_versions()?;
- let packages = packages.as_array().unwrap();
- Value::Array(vec![packages[0].to_owned()])
- };
+ let packages = crate::api2::node::apt::get_versions()?;
+ let mut packages = json!(if verbose { &packages[..] } else { &packages[0..1] });
let options = default_table_format_options()
.disable_sort()
--
2.20.1