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 876E592827 for ; Mon, 13 Feb 2023 16:46:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 22482261A7 for ; Mon, 13 Feb 2023 16:46:08 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 13 Feb 2023 16:46:03 +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 754FD46D9C for ; Mon, 13 Feb 2023 16:46:03 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 13 Feb 2023 16:45:54 +0100 Message-Id: <20230213154555.49610-4-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230213154555.49610-1-h.laimer@proxmox.com> References: <20230213154555.49610-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 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 3/4] manager: add completion for local sync-jobs 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: Mon, 13 Feb 2023 15:46:38 -0000 Signed-off-by: Hannes Laimer --- src/bin/proxmox-backup-manager.rs | 67 +++++++++++++++++++------------ 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index 740fdc49..1944c468 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -526,35 +526,33 @@ fn get_remote(param: &HashMap) -> Option { param.get("remote").map(|r| r.to_owned()).or_else(|| { if let Some(id) = param.get("id") { if let Ok(job) = get_sync_job(id) { - return Some(job.remote); + return job.remote; } } None }) } -fn get_remote_store(param: &HashMap) -> Option<(String, String)> { +fn get_remote_store(param: &HashMap) -> Option<(Option, String)> { let mut job: Option = None; let remote = param.get("remote").map(|r| r.to_owned()).or_else(|| { if let Some(id) = param.get("id") { job = get_sync_job(id).ok(); if let Some(ref job) = job { - return Some(job.remote.clone()); + return job.remote.clone(); } } None }); - if let Some(remote) = remote { - let store = param - .get("remote-store") - .map(|r| r.to_owned()) - .or_else(|| job.map(|job| job.remote_store)); + let store = param + .get("remote-store") + .map(|r| r.to_owned()) + .or_else(|| job.map(|job| job.remote_store)); - if let Some(store) = store { - return Some((remote, store)); - } + if let Some(store) = store { + return Some((remote, store)); } None @@ -575,7 +573,7 @@ fn get_remote_ns(param: &HashMap) -> Option { } // shell completion helper -pub fn complete_remote_datastore_name(_arg: &str, param: &HashMap) -> Vec { +pub fn complete_remote_datastore_name(arg: &str, param: &HashMap) -> Vec { let mut list = Vec::new(); if let Some(remote) = get_remote(param) { @@ -586,7 +584,9 @@ pub fn complete_remote_datastore_name(_arg: &str, param: &HashMap Vec { let mut list = Vec::new(); - if let Some((remote, remote_store)) = get_remote_store(param) { - if let Ok(data) = proxmox_async::runtime::block_on(async move { + if let Some(data) = match get_remote_store(param) { + Some((Some(remote), remote_store)) => proxmox_async::runtime::block_on(async move { crate::api2::config::remote::scan_remote_namespaces( remote.clone(), remote_store.clone(), ) .await - }) { - for item in data { - list.push(item.ns.name()); - } + .ok() + }), + Some((None, source_store)) => { + let mut rpcenv = CliEnvironment::new(); + rpcenv.set_auth_id(Some(String::from("root@pam"))); + crate::api2::admin::namespace::list_namespaces(source_store, None, None, &mut rpcenv) + .ok() + } + _ => None, + } { + for item in data { + list.push(item.ns.name()); } } @@ -653,19 +661,26 @@ pub fn complete_sync_local_datastore_namespace( pub fn complete_remote_datastore_group(_arg: &str, param: &HashMap) -> Vec { let mut list = Vec::new(); - if let Some((remote, remote_store)) = get_remote_store(param) { - let ns = get_remote_ns(param); - if let Ok(data) = proxmox_async::runtime::block_on(async move { + let ns = get_remote_ns(param); + if let Some(data) = match get_remote_store(param) { + Some((Some(remote), remote_store)) => proxmox_async::runtime::block_on(async move { crate::api2::config::remote::scan_remote_groups( remote.clone(), remote_store.clone(), ns, ) .await - }) { - for item in data { - list.push(format!("{}/{}", item.backup.ty, item.backup.id)); - } + .ok() + }), + Some((None, source_store)) => { + let mut rpcenv = CliEnvironment::new(); + rpcenv.set_auth_id(Some(String::from("root@pam"))); + crate::api2::admin::datastore::list_groups(source_store, ns, &mut rpcenv).ok() + } + _ => None, + } { + for item in data { + list.push(format!("{}/{}", item.backup.ty, item.backup.id)); } } -- 2.30.2