[pve-devel] [PATCH v2 proxmox-backup 08/10] manager: extend sync/pull completion
Fabian Grünbichler
f.gruenbichler at proxmox.com
Wed Sep 15 15:41:55 CEST 2021
complete groups by scanning the remote store if available, and query the
sync job config if remote or remote-store is not given on the current
command-line (e.g., when updating a job config).
unfortunately groups already given on the current command line are not
passed to the completion helper, so we can't filter those out..
other filter types are completed statically.
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
src/bin/proxmox-backup-manager.rs | 105 ++++++++++++++++++++++---
src/bin/proxmox_backup_manager/sync.rs | 2 +
2 files changed, 96 insertions(+), 11 deletions(-)
diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index 479ecf03..0c8f2dc7 100644
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -1,18 +1,19 @@
use std::collections::HashMap;
use std::io::{self, Write};
-use anyhow::{format_err, Error};
+use anyhow::Error;
use serde_json::{json, Value};
use proxmox::api::{api, cli::*, RpcEnvironment};
use pbs_client::{connect_to_localhost, display_task_log, view_task_result};
+use pbs_config::sync;
use pbs_tools::percent_encoding::percent_encode_component;
use pbs_tools::json::required_string_param;
use pbs_api_types::{
DATASTORE_SCHEMA, UPID_SCHEMA, REMOTE_ID_SCHEMA, REMOVE_VANISHED_BACKUPS_SCHEMA,
IGNORE_VERIFIED_BACKUPS_SCHEMA, VERIFICATION_OUTDATED_AFTER_SCHEMA,
- GroupFilterList,
+ GroupFilterList, SyncJobConfig,
};
use proxmox_backup::config;
@@ -396,6 +397,7 @@ fn main() {
.completion_cb("local-store", pbs_config::datastore::complete_datastore_name)
.completion_cb("remote", pbs_config::remote::complete_remote_name)
.completion_cb("remote-store", complete_remote_datastore_name)
+ .completion_cb("groups", complete_remote_datastore_group_filter)
)
.insert(
"verify",
@@ -418,24 +420,105 @@ fn main() {
pbs_runtime::main(run_async_cli_command(cmd_def, rpcenv));
}
+fn get_sync_job(id: &String) -> Result<SyncJobConfig, Error> {
+ let (config, _digest) = sync::config()?;
+
+ config.lookup("sync", id)
+}
+
+fn get_remote(param: &HashMap<String, String>) -> Option<String> {
+ 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.clone());
+ }
+ }
+ None
+ })
+}
+
+fn get_remote_store(param: &HashMap<String, String>) -> Option<(String, String)> {
+ let mut job: Option<SyncJobConfig> = 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());
+ }
+ }
+ 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.clone()));
+
+ if let Some(store) = store {
+ return Some((remote, store))
+ }
+ }
+
+ None
+}
+
// shell completion helper
pub fn complete_remote_datastore_name(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
let mut list = Vec::new();
- let _ = proxmox::try_block!({
- let remote = param.get("remote").ok_or_else(|| format_err!("no remote"))?;
+ if let Some(remote) = get_remote(param) {
+ if let Ok(data) = pbs_runtime::block_on(async move {
+ crate::api2::config::remote::scan_remote_datastores(remote).await
+ }) {
- let data = pbs_runtime::block_on(async move {
- crate::api2::config::remote::scan_remote_datastores(remote.clone()).await
- })?;
+ for item in data {
+ list.push(item.store);
+ }
+ }
+ }
- for item in data {
- list.push(item.store);
+ list
+}
+
+// shell completion helper
+pub fn complete_remote_datastore_group(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+
+ let mut list = Vec::new();
+
+ if let Some((remote, remote_store)) = get_remote_store(param) {
+ if let Ok(data) = pbs_runtime::block_on(async move {
+ crate::api2::config::remote::scan_remote_groups(remote.clone(), remote_store.clone()).await
+ }) {
+
+ for item in data {
+ list.push(format!("{}/{}", item.backup_type, item.backup_id));
+ }
}
+ }
+
+ list
+}
+
+// shell completion helper
+pub fn complete_remote_datastore_group_filter(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+
+ let mut list = Vec::new();
+
+ list.push("regex:".to_string());
+ list.push("type:ct".to_string());
+ list.push("type:host".to_string());
+ list.push("type:vm".to_string());
- Ok(())
- }).map_err(|_err: Error| { /* ignore */ });
+ list.extend(complete_remote_datastore_group(_arg, param).iter().map(|group| format!("group:{}", group)));
list
}
diff --git a/src/bin/proxmox_backup_manager/sync.rs b/src/bin/proxmox_backup_manager/sync.rs
index 7a1e8718..2dbef119 100644
--- a/src/bin/proxmox_backup_manager/sync.rs
+++ b/src/bin/proxmox_backup_manager/sync.rs
@@ -88,6 +88,7 @@ pub fn sync_job_commands() -> CommandLineInterface {
.completion_cb("store", pbs_config::datastore::complete_datastore_name)
.completion_cb("remote", pbs_config::remote::complete_remote_name)
.completion_cb("remote-store", crate::complete_remote_datastore_name)
+ .completion_cb("groups", crate::complete_remote_datastore_group_filter)
)
.insert("update",
CliCommand::new(&api2::config::sync::API_METHOD_UPDATE_SYNC_JOB)
@@ -96,6 +97,7 @@ pub fn sync_job_commands() -> CommandLineInterface {
.completion_cb("schedule", pbs_config::datastore::complete_calendar_event)
.completion_cb("store", pbs_config::datastore::complete_datastore_name)
.completion_cb("remote-store", crate::complete_remote_datastore_name)
+ .completion_cb("groups", crate::complete_remote_datastore_group_filter)
)
.insert("remove",
CliCommand::new(&api2::config::sync::API_METHOD_DELETE_SYNC_JOB)
--
2.30.2
More information about the pve-devel
mailing list