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

src/api2/pull.rs: use reference to remote configuration

Browse Source
This commit is contained in:
Dietmar Maurer 2020-01-16 13:54:29 +01:00
parent 625d19621f
commit 94609e2380
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/api2/pull.rs
View File

@ -14,6 +14,7 @@ use proxmox::api::{ApiMethod, Router, RpcEnvironment};
use crate::server::{WorkerTask}; use crate::server::{WorkerTask};
use crate::backup::*; use crate::backup::*;
use crate::client::*; use crate::client::*;
use crate::config::remotes;
use crate::api2::types::*; use crate::api2::types::*;
// fixme: implement filters // fixme: implement filters
@ -342,31 +343,20 @@ pub async fn pull_store(
store: { store: {
schema: DATASTORE_SCHEMA, schema: DATASTORE_SCHEMA,
}, },
"remote-host": { remote: {
description: "Remote host", // TODO: use predefined type: host or IP schema: REMOTE_ID_SCHEMA,
type: String,
}, },
"remote-store": { "remote-store": {
schema: DATASTORE_SCHEMA, schema: DATASTORE_SCHEMA,
}, },
"remote-user": {
description: "Remote user name.", // TODO: use predefined typed
type: String,
},
"remote-password": {
description: "Remote passsword.",
type: String,
},
}, },
}, },
)] )]
/// Sync store from other repository /// Sync store from other repository
async fn pull ( async fn pull (
store: String, store: String,
remote_host: String, remote: String,
remote_store: String, remote_store: String,
remote_user: String,
remote_password: String,
_info: &ApiMethod, _info: &ApiMethod,
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<String, Error> { ) -> Result<String, Error> {
@ -375,12 +365,15 @@ async fn pull (
let tgt_store = DataStore::lookup_datastore(&store)?; let tgt_store = DataStore::lookup_datastore(&store)?;
let client = HttpClient::new(&remote_host, &remote_user, Some(remote_password))?; let (remote_config, _digest) = remotes::config()?;
let remote: remotes::Remote = remote_config.lookup("remote", &remote)?;
let client = HttpClient::new(&remote.host, &remote.userid, Some(remote.password.clone()))?;
let _auth_info = client.login() // make sure we can auth let _auth_info = client.login() // make sure we can auth
.await .await
.map_err(|err| format_err!("remote connection to '{}' failed - {}", remote_host, err))?; .map_err(|err| format_err!("remote connection to '{}' failed - {}", remote.host, err))?;
let src_repo = BackupRepository::new(Some(remote_user), Some(remote_host), remote_store); let src_repo = BackupRepository::new(Some(remote.userid), Some(remote.host), remote_store);
// fixme: set to_stdout to false? // fixme: set to_stdout to false?
let upid_str = WorkerTask::spawn("sync", Some(store.clone()), &username.clone(), true, move |worker| async move { let upid_str = WorkerTask::spawn("sync", Some(store.clone()), &username.clone(), true, move |worker| async move {

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

@ -417,15 +417,10 @@ async fn pull_datastore(
let mut client = connect()?; let mut client = connect()?;
let (remote_config, _digest) = remotes::config()?;
let remote: Remote = remote_config.lookup("remote", &remote)?;
let args = json!({ let args = json!({
"store": local_store, "store": local_store,
"remote-host": remote.host, "remote": remote,
"remote-user": remote.userid,
"remote-store": remote_store, "remote-store": remote_store,
"remote-password": remote.password,
}); });
let result = client.post("api2/json/pull", Some(args)).await?; let result = client.post("api2/json/pull", Some(args)).await?;