From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@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 13D4E754B2
for <pve-devel@lists.proxmox.com>; Wed, 21 Apr 2021 16:29:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0969710CBA
for <pve-devel@lists.proxmox.com>; Wed, 21 Apr 2021 16:29:21 +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 81B7010CAD
for <pve-devel@lists.proxmox.com>; Wed, 21 Apr 2021 16:29:20 +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 4756742931
for <pve-devel@lists.proxmox.com>; Wed, 21 Apr 2021 16:29:20 +0200 (CEST)
Message-ID: <c7151bdd-e5ad-67e2-6de5-0f85b5b8c3a6@proxmox.com>
Date: Wed, 21 Apr 2021 16:29:19 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:88.0) Gecko/20100101
Thunderbird/88.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Reiter <s.reiter@proxmox.com>
References: <20210421111539.29261-1-s.reiter@proxmox.com>
<20210421111539.29261-3-s.reiter@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20210421111539.29261-3-s.reiter@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.001 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.001 Looks like a legit reply (A)
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. [pbsclient.pm]
Subject: Re: [pve-devel] [PATCH common 02/10] PBSClient: allow running other
binaries
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, 21 Apr 2021 14:29:21 -0000
On 21.04.21 13:15, Stefan Reiter wrote:
> ...such as proxmox-file-restore.
>
For public interface I'd rather see a separate sub, like:
run_file_restore_cmd
and ideally not even that would be required from an external POV, i.e., why want
to avoid to expose a general run_something command here, a clear interface, like
you add then for most (all?) things like file_restore_extract, file_restore_list,
..., is in general better (when thinking anti-spaghetti-no-check code).
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>
> Fixes indentation where "binary =>" is added.
>
> src/PVE/PBSClient.pm | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm
> index f05471c..857cff0 100644
> --- a/src/PVE/PBSClient.pm
> +++ b/src/PVE/PBSClient.pm
> @@ -139,8 +139,9 @@ my sub do_raw_client_cmd {
>
> my $use_crypto = $USE_CRYPT_PARAMS->{$client_cmd};
>
> - my $client_exe = '/usr/bin/proxmox-backup-client';
> - die "executable not found '$client_exe'! Proxmox backup client not installed?\n"
> + my $client_exe = (delete $opts{binary}) || 'proxmox-backup-client';
> + $client_exe = "/usr/bin/$client_exe";
> + die "executable not found '$client_exe'! Proxmox backup client or file restore not installed?\n"
> if ! -x $client_exe;
>
> my $scfg = $self->{scfg};
> @@ -193,22 +194,25 @@ my sub run_raw_client_cmd {
> }
>
> my sub run_client_cmd {
> - my ($self, $client_cmd, $param, $no_output) = @_;
> + my ($self, $client_cmd, $param, $no_output, $binary) = @_;
>
> my $json_str = '';
> my $outfunc = sub { $json_str .= "$_[0]\n" };
>
> + $binary //= 'proxmox-backup-client';
> +
> $param = [] if !defined($param);
> $param = [ $param ] if !ref($param);
>
> $param = [@$param, '--output-format=json'] if !$no_output;
>
> do_raw_client_cmd(
> - $self,
> - $client_cmd,
> - $param,
> - outfunc => $outfunc,
> - errmsg => 'proxmox-backup-client failed'
> + $self,
> + $client_cmd,
> + $param,
> + outfunc => $outfunc,
> + errmsg => "$binary failed",
> + binary => $binary,
> );
>
> return undef if $no_output;
>