From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 C56DB7552E for ; Wed, 21 Apr 2021 16:38:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2E7111604 for ; Wed, 21 Apr 2021 16:38:13 +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 08218115FF for ; Wed, 21 Apr 2021 16:38:13 +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 D05F944D34 for ; Wed, 21 Apr 2021 16:38:12 +0200 (CEST) To: Thomas Lamprecht , Proxmox VE development discussion References: <20210421111539.29261-1-s.reiter@proxmox.com> <20210421111539.29261-3-s.reiter@proxmox.com> From: Stefan Reiter Message-ID: <7579d4ba-749f-8ffb-4cc9-acb100ad3eb7@proxmox.com> Date: Wed, 21 Apr 2021 16:38:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.039 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 14:38:43 -0000 On 21/04/2021 16:29, Thomas Lamprecht wrote: > 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). > This is not part of a public interface though? Both functions that now support the 'binary' argument are declared private... Any yes, that is why I added extra functions for the restore specific functionality. >> Signed-off-by: Stefan Reiter >> --- >> >> 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; >> >