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 989D71FF173 for ; Mon, 25 Nov 2024 18:40:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74FCC199CB; Mon, 25 Nov 2024 18:40:59 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 25 Nov 2024 18:40:09 +0100 Message-Id: <20241125174012.678523-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241125174012.678523-1-c.ebner@proxmox.com> References: <20241125174012.678523-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 1/4] config: sync: use same config section type `sync` for push and pull 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" Use `sync` as config section type string for both, sync jobs in push and pull direction, renaming the now combined config plugin to sync plugin. Commit bcd80bf9 ("api types/config: add `sync-push` config type for push sync jobs") introduced the additional config type with the intend to reduce possible misconfiguration. Partially revert this to use the same config type string again, since the misconfiguration can happen nevertheless (by editing the config type) and currently sync job configs are only listed partially when fetched via the config api endpoint. The filtering based on the additional api parameter is however retained. Signed-off-by: Christian Ebner --- pbs-config/src/sync.rs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pbs-config/src/sync.rs b/pbs-config/src/sync.rs index 7fc977e77..10f528b5e 100644 --- a/pbs-config/src/sync.rs +++ b/pbs-config/src/sync.rs @@ -6,7 +6,7 @@ use anyhow::Error; use proxmox_schema::{ApiType, Schema}; use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin}; -use pbs_api_types::{SyncDirection, SyncJobConfig, JOB_ID_SCHEMA}; +use pbs_api_types::{SyncJobConfig, JOB_ID_SCHEMA}; use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard}; @@ -18,19 +18,10 @@ fn init() -> SectionConfig { _ => unreachable!(), }; - let pull_plugin = SectionConfigPlugin::new( - SyncDirection::Pull.as_config_type_str().to_string(), - Some(String::from("id")), - obj_schema, - ); - let push_plugin = SectionConfigPlugin::new( - SyncDirection::Push.as_config_type_str().to_string(), - Some(String::from("id")), - obj_schema, - ); + let sync_plugin = + SectionConfigPlugin::new("sync".to_string(), Some(String::from("id")), obj_schema); let mut config = SectionConfig::new(&JOB_ID_SCHEMA); - config.register_plugin(pull_plugin); - config.register_plugin(push_plugin); + config.register_plugin(sync_plugin); config } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel