tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/bin/proxmox-backup-manager.rs - list remotes: do not use client, call directly

Browse Source
This commit is contained in:
Dietmar Maurer
2020-01-30 17:57:37 +01:00
parent 9894469e89
commit 9e165b5cad
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/proxmox-backup-manager.rs
View File

@ -5,7 +5,7 @@ use failure::*;
use serde_json::{json, Value}; use serde_json::{json, Value};
use chrono::{Local, TimeZone}; use chrono::{Local, TimeZone};
use proxmox::api::{api, cli::*}; use proxmox::api::{api, cli::*, RpcEnvironment, ApiHandler};
use proxmox_backup::configdir; use proxmox_backup::configdir;
use proxmox_backup::tools; use proxmox_backup::tools;
@ -84,16 +84,15 @@ fn connect() -> Result<HttpClient, Error> {
} }
)] )]
/// List configured remotes. /// List configured remotes.
async fn list_remotes(param: Value) -> Result<Value, Error> { fn list_remotes(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Error> {
let output_format = param["output-format"].as_str().unwrap_or("text").to_owned(); let output_format = param["output-format"].as_str().unwrap_or("text").to_owned();
let client = connect()?; let info = &api2::config::remote::API_METHOD_LIST_REMOTES;
let mut data = match info.handler {
let mut result = client.get("api2/json/config/remote", None).await?; ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
_ => unreachable!(),
let mut data = result["data"].take(); };
let schema = api2::config::remote::API_RETURN_SCHEMA_LIST_REMOTES;
let mut column_config = Vec::new(); let mut column_config = Vec::new();
column_config.push(ColumnConfig::new("name")); column_config.push(ColumnConfig::new("name"));
@ -108,7 +107,7 @@ async fn list_remotes(param: Value) -> Result<Value, Error> {
.column_config(column_config); .column_config(column_config);
format_and_print_result_full(&mut data, schema, &output_format, &options); format_and_print_result_full(&mut data, info.returns, &output_format, &options);
Ok(Value::Null) Ok(Value::Null)
} }