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 81D4A9F3C for ; Tue, 29 Aug 2023 13:13:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 632A3873B for ; Tue, 29 Aug 2023 13:13:20 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 29 Aug 2023 13:13:19 +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 656AD47332 for ; Tue, 29 Aug 2023 13:13:19 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Tue, 29 Aug 2023 13:13:09 +0200 Message-Id: <20230829111310.90248-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.458 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs, group.rs] Subject: [pbs-devel] [PATCH proxmox-backup] close #4763: client: added command to forget backup group 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: Tue, 29 Aug 2023 11:13:50 -0000 Added the command `proxmox-backup-client group forget ` so that we can forget (delete) whole groups with all the containing snapshots. As this is quite dangerous, we added a prompt, so the user has to confirm the operation. Fixed paths for local dependencies in Cargo.toml. Signed-off-by: Gabriel Goller --- Cargo.toml | 4 +- proxmox-backup-client/src/group.rs | 68 ++++++++++++++++++++++++++++++ proxmox-backup-client/src/main.rs | 4 +- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 proxmox-backup-client/src/group.rs diff --git a/Cargo.toml b/Cargo.toml index c7773f0e..e0f12806 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -264,8 +264,8 @@ proxmox-rrd.workspace = true #proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" } #proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" } -#proxmox-apt = { path = "../proxmox-apt" } -#proxmox-openid = { path = "../proxmox-openid-rs" } +#proxmox-apt = { path = "../proxmox/proxmox-apt" } +#proxmox-openid = { path = "../proxmox/proxmox-openid" } #pathpatterns = {path = "../pathpatterns" } #pxar = { path = "../pxar" } diff --git a/proxmox-backup-client/src/group.rs b/proxmox-backup-client/src/group.rs new file mode 100644 index 00000000..84b73b67 --- /dev/null +++ b/proxmox-backup-client/src/group.rs @@ -0,0 +1,68 @@ +use anyhow::{bail, Error}; +use pbs_api_types::{BackupGroup, BackupNamespace}; +use pbs_client::tools::{connect, extract_repository_from_value}; +use proxmox_router::cli::{ask_for_confirmation, CliCommand, CliCommandMap}; +use proxmox_schema::api; +use serde_json::Value; + +use crate::{ + complete_backup_group, complete_namespace, complete_repository, merge_group_into, + REPO_URL_SCHEMA, +}; + +pub fn group_mgtm_cli() -> CliCommandMap { + CliCommandMap::new().insert( + "forget", + CliCommand::new(&API_METHOD_FORGET_GROUP) + .arg_param(&["group"]) + .completion_cb("ns", complete_namespace) + .completion_cb("repository", complete_repository) + .completion_cb("group", complete_backup_group), + ) +} + +#[api( + input: { + properties: { + group: { + type: String, + description: "Backup group", + }, + repository: { + schema: REPO_URL_SCHEMA, + optional: true, + }, + ns: { + type: BackupNamespace, + optional: true, + }, + } + } +)] +/// Forget (remove) backup snapshots. +async fn forget_group(group: String, param: Value) -> Result { + let backup_group: BackupGroup = group.parse()?; + let repo = extract_repository_from_value(¶m)?; + let client = connect(&repo)?; + + let mut api_params = param; + merge_group_into(api_params.as_object_mut().unwrap(), backup_group.clone()); + + let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store()); + let result = client.get(&path, Some(api_params.clone())).await?; + let snapshots = result["data"].as_array().unwrap().len(); + if snapshots == 0 { + bail!("Backup group doesn't exist."); + } + + ask_for_confirmation(format!( + "Delete group \"{}\" with {} snapshots?", + backup_group, snapshots + ))?; + + let path = format!("api2/json/admin/datastore/{}/groups", repo.store()); + let _ = client.delete(&path, Some(api_params)).await?; + + println!("Successfully deleted group!"); + Ok(Value::Null) +} diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 1a13291a..76d45b84 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -72,6 +72,8 @@ mod catalog; pub use catalog::*; mod snapshot; pub use snapshot::*; +mod group; +pub use group::*; pub mod key; pub mod namespace; @@ -1606,7 +1608,6 @@ async fn prune( } format_and_print_result_full(&mut data, return_type, &output_format, &options); - Ok(Value::Null) } @@ -1783,6 +1784,7 @@ fn main() { .insert("benchmark", benchmark_cmd_def) .insert("change-owner", change_owner_cmd_def) .insert("namespace", namespace::cli_map()) + .insert("group", group_mgtm_cli()) .alias(&["files"], &["snapshot", "files"]) .alias(&["forget"], &["snapshot", "forget"]) .alias(&["upload-log"], &["snapshot", "upload-log"]) -- 2.39.2