From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <d.csapak@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 2416F972D
 for <pve-devel@lists.proxmox.com>; Fri,  1 Apr 2022 08:14:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 11C89236E6
 for <pve-devel@lists.proxmox.com>; Fri,  1 Apr 2022 08:14:17 +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) server-digest SHA256)
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS id D976F236DA
 for <pve-devel@lists.proxmox.com>; Fri,  1 Apr 2022 08:14:15 +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 A85B145C03
 for <pve-devel@lists.proxmox.com>; Fri,  1 Apr 2022 08:14:15 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri,  1 Apr 2022 08:14:13 +0200
Message-Id: <20220401061413.702998-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.147 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: [pve-devel] [PATCH manager] fix #3976: api/backup: make
 schedule/starttime truly optional on update
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: Fri, 01 Apr 2022 06:14:47 -0000

on create we require either starttime (+dow) or a schedule, but when
updating an existing job, this is not necessary

before we changed to schedules, the starttime was not optional either on
update, but i think there is no reason to require the user to send the
schedule/startime along every time.

the gui will send all values every time, so that was never a problem there

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 PVE/API2/Backup.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index 76175f16..5d36789a 100644
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -62,13 +62,14 @@ my $convert_to_schedule = sub {
 };
 
 my $schedule_param_check = sub {
-    my ($param) = @_;
+    my ($param, $required) = @_;
     if (defined($param->{schedule})) {
 	if (defined($param->{starttime})) {
 	    raise_param_exc({ starttime => "'starttime' and 'schedule' cannot both be set" });
 	}
     } elsif (!defined($param->{starttime})) {
-	raise_param_exc({ schedule => "neither 'starttime' nor 'schedule' were set" });
+	raise_param_exc({ schedule => "neither 'starttime' nor 'schedule' were set" })
+	    if $required;
     } else {
 	$param->{schedule} = $convert_to_schedule->($param);
     }
@@ -201,7 +202,7 @@ __PACKAGE__->register_method({
 	    $rpcenv->check($user, "/pool/$pool", ['VM.Backup']);
 	}
 
-	$schedule_param_check->($param);
+	$schedule_param_check->($param, 1);
 
 	$param->{enabled} = 1 if !defined($param->{enabled});
 
@@ -448,7 +449,7 @@ __PACKAGE__->register_method({
 	    }
 
 	    my $schedule_updated = 0;
-	    if ($param->{schedule} ne $job->{schedule}) {
+	    if (defined($param->{schedule}) && $param->{schedule} ne $job->{schedule}) {
 		$schedule_updated = 1;
 	    }
 
-- 
2.30.2