From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 3524F1FF165 for ; Wed, 15 Jan 2025 15:16:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B941DE81; Wed, 15 Jan 2025 15:16:12 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 15 Jan 2025 15:15:46 +0100 Message-Id: <20250115141547.376149-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250115141547.376149-1-c.ebner@proxmox.com> References: <20250115141547.376149-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pbs-devel] [PATCH proxmox-backup 4/5] bin: manager: expose encrypted/verified only flags for cli 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Allow to perform a push/pull sync job including only encrypted and/or verified backup snapshots via the command line. Signed-off-by: Christian Ebner --- src/bin/proxmox-backup-manager.rs | 39 +++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index 02ca0d028..154c6d5da 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -14,8 +14,9 @@ use pbs_api_types::percent_encoding::percent_encode_component; use pbs_api_types::{ BackupNamespace, GroupFilter, RateLimitConfig, SyncDirection, SyncJobConfig, DATASTORE_SCHEMA, GROUP_FILTER_LIST_SCHEMA, IGNORE_VERIFIED_BACKUPS_SCHEMA, NS_MAX_DEPTH_SCHEMA, - REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, RESYNC_CORRUPT_SCHEMA, TRANSFER_LAST_SCHEMA, - UPID_SCHEMA, VERIFICATION_OUTDATED_AFTER_SCHEMA, + REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA, RESYNC_CORRUPT_SCHEMA, + SYNC_ENCRYPTED_ONLY_SCHEMA, SYNC_VERIFIED_ONLY_SCHEMA, TRANSFER_LAST_SCHEMA, UPID_SCHEMA, + VERIFICATION_OUTDATED_AFTER_SCHEMA, }; use pbs_client::{display_task_log, view_task_result}; use pbs_config::sync; @@ -308,6 +309,8 @@ async fn sync_datastore( limit: RateLimitConfig, transfer_last: Option, resync_corrupt: Option, + encrypted_only: Option, + verified_only: Option, param: Value, sync_direction: SyncDirection, ) -> Result { @@ -348,6 +351,14 @@ async fn sync_datastore( args["resync-corrupt"] = Value::from(resync); } + if let Some(encrypted_only) = encrypted_only { + args["encrypted-only"] = Value::from(encrypted_only); + } + + if let Some(verified_only) = verified_only { + args["verified-only"] = Value::from(verified_only); + } + let mut limit_json = json!(limit); let limit_map = limit_json .as_object_mut() @@ -414,6 +425,14 @@ async fn sync_datastore( schema: RESYNC_CORRUPT_SCHEMA, optional: true, }, + "encrypted-only": { + schema: SYNC_ENCRYPTED_ONLY_SCHEMA, + optional: true, + }, + "verified-only": { + schema: SYNC_VERIFIED_ONLY_SCHEMA, + optional: true, + }, } } )] @@ -431,6 +450,8 @@ async fn pull_datastore( limit: RateLimitConfig, transfer_last: Option, resync_corrupt: Option, + encrypted_only: Option, + verified_only: Option, param: Value, ) -> Result { sync_datastore( @@ -445,6 +466,8 @@ async fn pull_datastore( limit, transfer_last, resync_corrupt, + encrypted_only, + verified_only, param, SyncDirection::Pull, ) @@ -495,6 +518,14 @@ async fn pull_datastore( schema: TRANSFER_LAST_SCHEMA, optional: true, }, + "encrypted-only": { + schema: SYNC_ENCRYPTED_ONLY_SCHEMA, + optional: true, + }, + "verified-only": { + schema: SYNC_VERIFIED_ONLY_SCHEMA, + optional: true, + }, } } )] @@ -511,6 +542,8 @@ async fn push_datastore( group_filter: Option>, limit: RateLimitConfig, transfer_last: Option, + encrypted_only: Option, + verified_only: Option, param: Value, ) -> Result { sync_datastore( @@ -525,6 +558,8 @@ async fn push_datastore( limit, transfer_last, None, + encrypted_only, + verified_only, param, SyncDirection::Push, ) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel