update to first proxmox crate split

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

proxmox-backup-client/Cargo.toml

@@ -22,7 +22,10 @@ zstd = { version = "0.6", features = [ "bindgen" ] }
 pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
-proxmox = { version = "0.14.0", features = [ "sortable-macro", "api-macro", "cli", "router" ] }
+proxmox = { version = "0.14.0", features = [ "sortable-macro" ] }
+proxmox-router = { version = "1", features = [ "cli" ] }
+proxmox-schema = { version = "1", features = [ "api-macro" ] }
+proxmox-time = "1"
 
 pbs-api-types = { path = "../pbs-api-types" }
 pbs-buildcfg = { path = "../pbs-buildcfg" }

proxmox-backup-client/src/benchmark.rs

@@ -5,9 +5,8 @@ use anyhow::{Error};
 use serde_json::Value;
 use serde::Serialize;
 
-use proxmox::api::{ApiMethod, RpcEnvironment};
-use proxmox::api::{
-    api,
+use proxmox_schema::{api, ApiType, ReturnType};
+use proxmox_router::{
     cli::{
         OUTPUT_FORMAT,
         ColumnConfig,
@@ -15,8 +14,8 @@ use proxmox::api::{
         format_and_print_result_full,
         default_table_format_options,
     },
-    router::ReturnType,
-    schema::ApiType,
+    ApiMethod,
+    RpcEnvironment,
 };
 
 use pbs_tools::crypt_config::CryptConfig;
@@ -222,7 +221,7 @@ async fn test_upload_speed(
     verbose: bool,
 ) -> Result<(), Error> {
 
-    let backup_time = proxmox::tools::time::epoch_i64();
+    let backup_time = proxmox_time::epoch_i64();
 
     let client = connect(&repo)?;
     record_repository(&repo);

proxmox-backup-client/src/bin/dump-catalog-shell-cli.rs

@@ -1,7 +1,7 @@
 use anyhow::{Error};
 
-use proxmox::api::format::*;
-use proxmox::api::cli::*;
+use proxmox_router::cli::*;
+use proxmox_schema::format::*;
 
 use pbs_client::catalog_shell::catalog_shell_cli;
 

proxmox-backup-client/src/catalog.rs

@@ -5,7 +5,8 @@ use std::sync::Arc;
 use anyhow::{bail, format_err, Error};
 use serde_json::Value;
 
-use proxmox::api::{api, cli::*};
+use proxmox_schema::api;
+use proxmox_router::cli::*;
 
 use pbs_client::tools::key_source::get_encryption_key_password;
 use pbs_client::{BackupReader, RemoteChunkReader};

proxmox-backup-client/src/key.rs

@@ -4,15 +4,13 @@ use std::path::PathBuf;
 use anyhow::{bail, format_err, Error};
 use serde_json::Value;
 
-use proxmox::api::api;
-use proxmox::api::cli::{
+use proxmox::sys::linux::tty;
+use proxmox::tools::fs::{file_get_contents, replace_file, CreateOptions};
+use proxmox_router::cli::{
     format_and_print_result_full, get_output_format, CliCommand, CliCommandMap, ColumnConfig,
     OUTPUT_FORMAT,
 };
-use proxmox::api::router::ReturnType;
-use proxmox::api::schema::ApiType;
-use proxmox::sys::linux::tty;
-use proxmox::tools::fs::{file_get_contents, replace_file, CreateOptions};
+use proxmox_schema::{api, ApiType, ReturnType};
 
 use pbs_api_types::{RsaPubKeyInfo, PASSWORD_HINT_SCHEMA, Kdf, KeyInfo};
 use pbs_config::key_config::{KeyConfig, rsa_decrypt_key_config};
@@ -266,7 +264,7 @@ fn show_key(path: Option<String>, param: Value) -> Result<(), Error> {
     let mut info: KeyInfo = (&config).into();
     info.path = Some(format!("{:?}", path));
 
-    let options = proxmox::api::cli::default_table_format_options()
+    let options = proxmox_router::cli::default_table_format_options()
         .column(ColumnConfig::new("path"))
         .column(ColumnConfig::new("kdf"))
         .column(ColumnConfig::new("created").renderer(pbs_tools::format::render_epoch))
@@ -394,7 +392,7 @@ fn show_master_pubkey(path: Option<String>, param: Value) -> Result<(), Error> {
     let mut info = RsaPubKeyInfo::try_from(rsa)?;
     info.path = Some(path.display().to_string());
 
-    let options = proxmox::api::cli::default_table_format_options()
+    let options = proxmox_router::cli::default_table_format_options()
         .column(ColumnConfig::new("path"))
         .column(ColumnConfig::new("modulus"))
         .column(ColumnConfig::new("exponent"))

proxmox-backup-client/src/main.rs

@@ -13,18 +13,10 @@ use tokio_stream::wrappers::ReceiverStream;
 use xdg::BaseDirectories;
 
 use pathpatterns::{MatchEntry, MatchType, PatternFlag};
-use proxmox::{
-    tools::{
-        time::{strftime_local, epoch_i64},
-        fs::{file_get_json, replace_file, CreateOptions, image_size},
-    },
-    api::{
-        api,
-        ApiMethod,
-        RpcEnvironment,
-        cli::*,
-    },
-};
+use proxmox::tools::fs::{file_get_json, replace_file, CreateOptions, image_size};
+use proxmox_router::{ApiMethod, RpcEnvironment, cli::*};
+use proxmox_schema::api;
+use proxmox_time::{strftime_local, epoch_i64};
 use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation};
 
 use pbs_api_types::{

proxmox-backup-client/src/mount.rs

@@ -14,8 +14,9 @@ use serde_json::Value;
 use tokio::signal::unix::{signal, SignalKind};
 
 use proxmox::{sortable, identity};
-use proxmox::api::{ApiHandler, ApiMethod, RpcEnvironment, schema::*, cli::*};
 use proxmox::tools::fd::Fd;
+use proxmox_router::{ApiHandler, ApiMethod, RpcEnvironment, cli::*};
+use proxmox_schema::*;
 
 use pbs_tools::crypt_config::CryptConfig;
 use pbs_config::key_config::load_and_decrypt_key;

proxmox-backup-client/src/snapshot.rs

@@ -3,10 +3,9 @@ use std::sync::Arc;
 use anyhow::Error;
 use serde_json::{json, Value};
 
-use proxmox::{
-    api::{api, cli::*},
-    tools::fs::file_get_contents,
-};
+use proxmox::tools::fs::file_get_contents;
+use proxmox_router::cli::*;
+use proxmox_schema::api;
 
 use pbs_tools::crypt_config::CryptConfig;
 use pbs_config::key_config::decrypt_key;

proxmox-backup-client/src/task.rs

@@ -1,7 +1,8 @@
 use anyhow::{Error};
 use serde_json::{json, Value};
 
-use proxmox::api::{api, cli::*};
+use proxmox_schema::api;
+use proxmox_router::cli::*;
 
 use pbs_client::display_task_log;
 use pbs_tools::percent_encoding::percent_encode_component;