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 9955E7C20F for ; Thu, 4 Nov 2021 10:56:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 731AA1DD2F for ; Thu, 4 Nov 2021 10:56:25 +0100 (CET) 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 9B7B71DCC9 for ; Thu, 4 Nov 2021 10:56:24 +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 72DD745ED5 for ; Thu, 4 Nov 2021 10:56:24 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 4 Nov 2021 10:56:19 +0100 Message-Id: <20211104095622.2207427-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211104095622.2207427-1-d.csapak@proxmox.com> References: <20211104095622.2207427-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.247 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jobs.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/5] tape backup jobs: add group filters to config/api X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2021 09:56:55 -0000 Signed-off-by: Dominik Csapak --- pbs-api-types/src/jobs.rs | 6 ++++++ src/api2/config/tape_backup_job.rs | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index 18c55dad..320c879e 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -247,6 +247,10 @@ pub struct VerificationJobStatus { optional: true, type: Userid, }, + groups: { + schema: GROUP_FILTER_LIST_SCHEMA, + optional: true, + }, } )] #[derive(Serialize,Deserialize,Clone,Updater)] @@ -265,6 +269,8 @@ pub struct TapeBackupJobSetup { /// Send job email notification to this user #[serde(skip_serializing_if="Option::is_none")] pub notify_user: Option, + #[serde(skip_serializing_if="Option::is_none")] + pub groups: Option>, } #[api( diff --git a/src/api2/config/tape_backup_job.rs b/src/api2/config/tape_backup_job.rs index 6c5680d3..84dda075 100644 --- a/src/api2/config/tape_backup_job.rs +++ b/src/api2/config/tape_backup_job.rs @@ -133,6 +133,8 @@ pub enum DeletableProperty { LatestOnly, /// Delete the 'notify-user' property NotifyUser, + /// Delete the 'groups' property + Groups, } #[api( @@ -191,6 +193,7 @@ pub fn update_tape_backup_job( DeletableProperty::NotifyUser => { data.setup.notify_user = None; }, DeletableProperty::Schedule => { data.schedule = None; }, DeletableProperty::Comment => { data.comment = None; }, + DeletableProperty::Groups => { data.setup.groups = None; }, } } } @@ -203,6 +206,7 @@ pub fn update_tape_backup_job( if update.setup.export_media_set.is_some() { data.setup.export_media_set = update.setup.export_media_set; } if update.setup.latest_only.is_some() { data.setup.latest_only = update.setup.latest_only; } if update.setup.notify_user.is_some() { data.setup.notify_user = update.setup.notify_user; } + if update.setup.groups.is_some() { data.setup.groups = update.setup.groups; } let schedule_changed = data.schedule != update.schedule; if update.schedule.is_some() { data.schedule = update.schedule; } -- 2.30.2