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 6E186767E2 for ; Fri, 16 Jul 2021 10:53:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FA47E1B7 for ; Fri, 16 Jul 2021 10:53:30 +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 06AC3E183 for ; Fri, 16 Jul 2021 10:53:29 +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 CE2B042152 for ; Fri, 16 Jul 2021 10:53:28 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Jul 2021 10:53:19 +0200 Message-Id: <20210716085328.3731574-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210716085328.3731574-1-d.csapak@proxmox.com> References: <20210716085328.3731574-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.591 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 Subject: [pbs-devel] [PATCH proxmox-backup 02/11] pbs-datastore/prune: make PruneOptions an api type 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: Fri, 16 Jul 2021 08:53:30 -0000 so that we can reuse it from here Signed-off-by: Dominik Csapak --- pbs-datastore/src/prune.rs | 50 +++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs index d0d8ca16..4605e26f 100644 --- a/pbs-datastore/src/prune.rs +++ b/pbs-datastore/src/prune.rs @@ -2,6 +2,18 @@ use std::collections::{HashMap, HashSet}; use std::path::PathBuf; use anyhow::{Error}; +use serde::{Deserialize, Serialize}; + +use proxmox::api::api; + +use pbs_api_types::{ + PRUNE_SCHEMA_KEEP_LAST, + PRUNE_SCHEMA_KEEP_HOURLY, + PRUNE_SCHEMA_KEEP_DAILY, + PRUNE_SCHEMA_KEEP_WEEKLY, + PRUNE_SCHEMA_KEEP_MONTHLY, + PRUNE_SCHEMA_KEEP_YEARLY, +}; use super::BackupInfo; @@ -68,13 +80,49 @@ fn remove_incomplete_snapshots( } } -#[derive(Default)] +#[api( + properties: { + "keep-last": { + schema: PRUNE_SCHEMA_KEEP_LAST, + optional: true, + }, + "keep-hourly": { + schema: PRUNE_SCHEMA_KEEP_HOURLY, + optional: true, + }, + "keep-daily": { + schema: PRUNE_SCHEMA_KEEP_DAILY, + optional: true, + }, + "keep-weekly": { + schema: PRUNE_SCHEMA_KEEP_WEEKLY, + optional: true, + }, + "keep-monthly": { + schema: PRUNE_SCHEMA_KEEP_MONTHLY, + optional: true, + }, + "keep-yearly": { + schema: PRUNE_SCHEMA_KEEP_YEARLY, + optional: true, + }, + } +)] +#[derive(Serialize, Deserialize, Default)] +#[serde(rename_all = "kebab-case")] +/// Common pruning options pub struct PruneOptions { + #[serde(skip_serializing_if="Option::is_none")] pub keep_last: Option, + #[serde(skip_serializing_if="Option::is_none")] pub keep_hourly: Option, + #[serde(skip_serializing_if="Option::is_none")] pub keep_daily: Option, + #[serde(skip_serializing_if="Option::is_none")] pub keep_weekly: Option, + #[serde(skip_serializing_if="Option::is_none")] pub keep_monthly: Option, + #[serde(skip_serializing_if="Option::is_none")] pub keep_yearly: Option, } -- 2.30.2