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 6787769BC9
for <pve-devel@lists.proxmox.com>; Wed, 20 Jan 2021 11:01:56 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 584442556B
for <pve-devel@lists.proxmox.com>; Wed, 20 Jan 2021 11:01:56 +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 EE09525548
for <pve-devel@lists.proxmox.com>; Wed, 20 Jan 2021 11:01:54 +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 ADBA74609E
for <pve-devel@lists.proxmox.com>; Wed, 20 Jan 2021 11:01:54 +0100 (CET)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 20 Jan 2021 11:01:39 +0100
Message-Id: <20210120100143.16268-4-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210120100143.16268-1-f.ebner@proxmox.com>
References: <20210120100143.16268-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.007 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.pm]
Subject: [pve-devel] [RFC manager 3/7] api: APT: add call to list
repositories
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 20 Jan 2021 10:01:56 -0000
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
There is both metadata (path, number, enabled) and actual data (Suites,
Components, etc.) for a repository. The actual data parts are capitalized.
This makes parsing from the DEB-822 format a bit easier, and as a side effect
distinguishes metadata and actual data. An alternative would be to introduce
nesting in the result like
{
path =>
number =>
enabled =>
repodata => {
suites =>
types =>
}
}
but having a flat result makes handling in the UI code easier. Is the current
approach fine or does it need to be uniform or should there be nesting?
Since the UI code should be reused for PBS, this question also affects the
not-yet-written Rust code.
PVE/API2/APT.pm | 69 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index fb4954e7..e92770ca 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -12,6 +12,7 @@ use LWP::UserAgent;
use PVE::pvecfg;
use PVE::Tools qw(extract_param);
+use PVE::APT;
use PVE::Cluster;
use PVE::DataCenterConfig;
use PVE::SafeSyslog;
@@ -67,6 +68,7 @@ __PACKAGE__->register_method({
my $res = [
{ id => 'changelog' },
{ id => 'update' },
+ { id => 'repositories' },
{ id => 'versions' },
];
@@ -478,6 +480,73 @@ __PACKAGE__->register_method({
return $data;
}});
+__PACKAGE__->register_method({
+ name => 'repositories',
+ path => 'repositories',
+ method => 'GET',
+ proxyto => 'node',
+ description => "Get APT repository information.",
+ permissions => {
+ check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]],
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ },
+ },
+ returns => {
+ type => "array",
+ description => "List of configured repositories.",
+ items => {
+ type => "object",
+ properties => {
+ path => {
+ type => 'string',
+ description => "Path to the file that defines the repository.",
+ },
+ number => {
+ type => 'integer',
+ description => "Line or stanza number.",
+ },
+ enabled => {
+ type => 'boolean',
+ },
+ comment => {
+ type => 'string',
+ optional => 1,
+ },
+ Types => {
+ type => 'string',
+ description => "List of repository types.",
+ },
+ URIs => {
+ type => 'string',
+ description => "List of repository URIs.",
+ },
+ Suites => {
+ type => 'string',
+ description => "List of repository suites.",
+ },
+ Components => {
+ type => 'string',
+ description => "List of repository components. Needs to " .
+ "be empty when the suite is absolute.",
+ optional => 1,
+ },
+ Options => {
+ type => 'object',
+ description => "Further options for APT.",
+ },
+ },
+ },
+ },
+ code => sub {
+ my ($param) = @_;
+
+ return PVE::APT::list_repositories();
+ }});
+
__PACKAGE__->register_method({
name => 'versions',
path => 'versions',
--
2.20.1