api/compat: drop more compat imports from api_schema.rs

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

diff --git a/src/api2/access.rs b/src/api2/access.rs
index 3d81f2a838261293c806d9888603f5147ea73ed8..2d77a946a3512d5409ebd6ceee5db82d12505213 100644 (file)
--- a/src/api2/access.rs
+++ b/src/api2/access.rs
@@ -1,6 +1,5 @@
 use failure::*;
 
-use hyper::StatusCode;
 use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};

diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index c0feda5ad0f1c75394af0eae9e8909ebb7e25699..278ca251ab70b09d913218a62408c154139f6a10 100644 (file)
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -8,8 +8,8 @@ use proxmox::tools::{
     digest_to_hex,
     fs::file_set_contents,
 };
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
 
-use crate::api_schema::router::{RpcEnvironment, RpcEnvironmentType};
 use crate::server::WorkerTask;
 use crate::backup::*;
 use crate::server::formatter::*;

diff --git a/src/api2/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs
index 80125d050a50a8592f25712d14ff8a258317f6f1..620dff5ec4ad502d7efb1a79fdfed1ace1d09488 100644 (file)
--- a/src/api2/backup/upload_chunk.rs
+++ b/src/api2/backup/upload_chunk.rs
@@ -9,10 +9,10 @@ use hyper::http::request::Parts;
 use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, RpcEnvironment};
+use proxmox::api::schema::*;
 
 use crate::api2::types::*;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use crate::backup::*;
 use crate::tools;
 

diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index e5de4df23082a3ac0de86ddc632f678c17483547..e58212e780f8f50609db4f9292b14b05e9508a8f 100644 (file)
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -1,12 +1,12 @@
-use failure::*;
-//use std::collections::HashMap;
+use std::path::PathBuf;
 
-use crate::api_schema::*;
-use crate::api_schema::router::*;
-use crate::backup::*;
+use failure::*;
 use serde_json::{json, Value};
-use std::path::PathBuf;
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
+
+use crate::backup::*;
 use crate::config::datastore;
 
 pub const GET: ApiMethod = ApiMethod::new(

diff --git a/src/api2/node/dns.rs b/src/api2/node/dns.rs
index e6aa8aab5584d5c25221854897e823a8a3d1b82a..c4f7ac063167f414020992e858c89b48e38bcf67 100644 (file)
--- a/src/api2/node/dns.rs
+++ b/src/api2/node/dns.rs
@@ -1,22 +1,19 @@
+use std::sync::{Arc, Mutex};
+
 use failure::*;
+use lazy_static::lazy_static;
+use openssl::sha;
+use regex::Regex;
+use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
 use proxmox::tools::fs::{file_get_contents, file_set_contents};
 use proxmox::tools::*; // required to use IPRE!() macro ???
 
-use crate::api2::*;
-use crate::api_schema::*;
-//use crate::api_schema::router::*;
 use crate::api2::types::*;
 
-use lazy_static::lazy_static;
-
-use std::sync::{Arc, Mutex};
-use openssl::sha;
-use regex::Regex;
-
-use serde_json::{json, Value};
-
 static RESOLV_CONF_FN: &str = "/etc/resolv.conf";
 
 fn read_etc_resolv_conf() -> Result<Value, Error> {

diff --git a/src/api2/node/network.rs b/src/api2/node/network.rs
index ee3b7049a6cd7da9310985a19540a3b5038065e1..0cef10d2587732a5aa19b9b08502e325d6973e8d 100644 (file)
--- a/src/api2/node/network.rs
+++ b/src/api2/node/network.rs
@@ -1,10 +1,9 @@
 use failure::*;
-
-//use crate::tools;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
 use crate::api2::types::*;
 
 fn get_network_config(

diff --git a/src/api2/node/syslog.rs b/src/api2/node/syslog.rs
index 62856480dccd1ad5cbf75bc9d799044202d58483..3a3b9fbdd73398ce38081319519a28be3595e5a9 100644 (file)
--- a/src/api2/node/syslog.rs
+++ b/src/api2/node/syslog.rs
@@ -1,14 +1,14 @@
+use std::process::{Command, Stdio};
+
 use failure::*;
+use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
 
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use crate::api2::types::*;
 
-use serde_json::{json, Value};
-use std::process::{Command, Stdio};
-
 fn dump_journal(
     start: Option<u64>,
     limit: Option<u64>,

diff --git a/src/api2/reader/environment.rs b/src/api2/reader/environment.rs
index 082973d3cea11c1665f1783dc69077167f142ee6..b56d9e6eb19831656b4d5d4e07c2b53c1f4c138d 100644 (file)
--- a/src/api2/reader/environment.rs
+++ b/src/api2/reader/environment.rs
@@ -4,7 +4,8 @@ use std::collections::HashMap;
 
 use serde_json::Value;
 
-use crate::api_schema::router::{RpcEnvironment, RpcEnvironmentType};
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
+
 use crate::server::WorkerTask;
 use crate::backup::*;
 use crate::server::formatter::*;

diff --git a/src/api2/subscription.rs b/src/api2/subscription.rs
index 359657712ab862dd49fdc646d3f63bc9b5040a30..86b0b0403296d8ff4b9595673e0f082063ea5e2a 100644 (file)
--- a/src/api2/subscription.rs
+++ b/src/api2/subscription.rs
@@ -1,10 +1,10 @@
 use failure::*;
-
-use crate::tools;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
+use crate::tools;
 
 fn get_subscription(
     _param: Value,

diff --git a/src/api2/version.rs b/src/api2/version.rs
index 597dc4b51b90976c45ad7e24e8c91b337601b8c7..2e0d20e75749c6327a5b484aa3504bbaf1c929f0 100644 (file)
--- a/src/api2/version.rs
+++ b/src/api2/version.rs
@@ -1,9 +1,9 @@
 use failure::*;
-
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
 pub const PROXMOX_PKG_VERSION: &str =
     concat!(
         env!("CARGO_PKG_VERSION_MAJOR"),

diff --git a/src/api_schema.rs b/src/api_schema.rs
index 571fa29c27e6513f4695bed3909fd826860dd420..9d6d7606be3e516e2e9fa2acb7b98be227b64e08 100644 (file)
--- a/src/api_schema.rs
+++ b/src/api_schema.rs
@@ -21,8 +21,3 @@ pub mod format;
 
 pub use proxmox::api::schema::*;
 pub use proxmox::api::*;
-
-pub mod router {
-    pub use super::{ApiHandler, ApiMethod, HttpError, RpcEnvironment, RpcEnvironmentType};
-    pub use proxmox::api::router::*;
-}

diff --git a/src/api_schema/config.rs b/src/api_schema/config.rs
index 74f95e8b9d3052812e40d4683cc5b954aa89c577..d9aa076c40eef5d22685db853fa29c9b9f0cbbbc 100644 (file)
--- a/src/api_schema/config.rs
+++ b/src/api_schema/config.rs
@@ -1,10 +1,10 @@
-use crate::api_schema::router::*;
-
 use std::collections::HashMap;
 use std::path::{PathBuf};
 
 use hyper::Method;
 
+use proxmox::api::{ApiMethod, Router, RpcEnvironmentType};
+
 pub struct ApiConfig {
     basedir: PathBuf,
     router: &'static Router,

diff --git a/src/api_schema/format.rs b/src/api_schema/format.rs
index cf3c23bb4e501df59b2065d849935f221d76596e..01011e98428fd6754a5f4ed2eec0c07f2eeafc18 100644 (file)
--- a/src/api_schema/format.rs
+++ b/src/api_schema/format.rs
@@ -1,11 +1,10 @@
 use failure::*;
 
 use std::io::Write;
-//use super::*;
-use super::router::*;
-use super::schema::*;
-//use super::api_handler::*;
 
+use proxmox::api::{ApiHandler, ApiMethod};
+use proxmox::api::router::{Router, SubRoute};
+use proxmox::api::schema::*;
 
 #[derive(Copy, Clone)]
 pub enum ParameterDisplayStyle {

diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
index b9a9f1fc9c80eb86fd1c37f2e29e4b2a477a5641..bcaa2122bc8a2e087a9b24dbc09ebd5a09ef08da 100644 (file)
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -2,9 +2,9 @@ use failure::*;
 use futures::*;
 
 use proxmox::tools::try_block;
+use proxmox::api::RpcEnvironmentType;
 
 //use proxmox_backup::tools;
-use proxmox_backup::api_schema::router::*;
 use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::server;

diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index b7f5b3f1c17c5b80ff094e5ff5a37050db613ffb..f7d346bc7fae30d7d89da20883d94117ef276ef6 100644 (file)
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -1,22 +1,21 @@
+use std::sync::Arc;
+
+use failure::*;
+use futures::*;
+use hyper;
+use openssl::ssl::{SslMethod, SslAcceptor, SslFiletype};
+
+use proxmox::tools::try_block;
+use proxmox::api::RpcEnvironmentType;
+
 use proxmox_backup::configdir;
 use proxmox_backup::buildcfg;
 use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
-use proxmox_backup::api_schema::router::*;
 use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::auth_helpers::*;
 
-use failure::*;
-use proxmox::tools::try_block;
-
-use futures::*;
-
-use openssl::ssl::{SslMethod, SslAcceptor, SslFiletype};
-use std::sync::Arc;
-
-use hyper;
-
 #[tokio::main]
 async fn main() {
     if let Err(err) = run().await {

diff --git a/src/cli/command.rs b/src/cli/command.rs
index f877885d162a0d88e9e85fa14a6768e4411fdeb0..69750d24e13f63f254882cda3e55b398ec59d60c 100644 (file)
--- a/src/cli/command.rs
+++ b/src/cli/command.rs
@@ -3,10 +3,10 @@ use serde_json::Value;
 
 use std::collections::{HashMap, HashSet};
 
-use crate::api_schema::*;
-use crate::api_schema::router::*;
+use proxmox::api::schema::*;
+use proxmox::api::{ApiHandler, ApiMethod};
+
 use crate::api_schema::format::*;
-//use crate::api_schema::config::*;
 use super::environment::CliEnvironment;
 
 use super::getopts;

diff --git a/src/cli/environment.rs b/src/cli/environment.rs
index 3b5b87259a8bf3fcb2e41a1d1acbc142fa1792b3..ad40ca1ac0dd4f9c797014a67dfe8e5b7c84370d 100644 (file)
--- a/src/cli/environment.rs
+++ b/src/cli/environment.rs
@@ -1,8 +1,8 @@
-use crate::api_schema::router::*;
-
 use std::collections::HashMap;
 use serde_json::Value;
 
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
+
 /// `RpcEnvironmet` implementation for command line tools
 pub struct CliEnvironment {
     result_attributes: HashMap<String, Value>,

diff --git a/src/server/environment.rs b/src/server/environment.rs
index b002b24fa16a55df7aa5701b7851b3df29999ce7..9e026997d363621fdbb6512de9552a4e21741600 100644 (file)
--- a/src/server/environment.rs
+++ b/src/server/environment.rs
@@ -1,8 +1,8 @@
-use crate::api_schema::router::*;
-
 use std::collections::HashMap;
 use serde_json::Value;
 
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
+
 /// Encapsulates information about the runtime environment
 pub struct RestEnvironment {
     env_type: RpcEnvironmentType,

diff --git a/src/server/formatter.rs b/src/server/formatter.rs
index ca2a6e73485d2e3c69810a4dcfa33a3887f8e42c..2daf4dbf8bf18f68e14746dbd0f08745132ae3db 100644 (file)
--- a/src/server/formatter.rs
+++ b/src/server/formatter.rs
@@ -1,11 +1,11 @@
 use failure::*;
 use serde_json::{json, Value};
 
-use crate::api_schema::router::{HttpError, RpcEnvironment};
-
 use hyper::{Body, Response, StatusCode};
 use hyper::header;
 
+use proxmox::api::{HttpError, RpcEnvironment};
+
 /// Extension to set error message for server side logging
 pub struct ErrorMessageExtension(pub String);
 

diff --git a/src/server/h2service.rs b/src/server/h2service.rs
index a9abf4f3d2e66751ae573471b9e19de62d45cba3..c8a1f8395a92b29e72b6713d3406c78a924708ac 100644 (file)
--- a/src/server/h2service.rs
+++ b/src/server/h2service.rs
@@ -7,10 +7,9 @@ use std::task::{Context, Poll};
 use futures::*;
 use hyper::{Body, Request, Response, StatusCode};
 
-use proxmox::api::{http_err, ApiFuture};
+use proxmox::api::{http_err, ApiFuture, ApiHandler, HttpError, Router, RpcEnvironment};
 
 use crate::tools;
-use crate::api_schema::router::*;
 use crate::server::formatter::*;
 use crate::server::WorkerTask;
 

diff --git a/src/server/rest.rs b/src/server/rest.rs
index f583afaa926060f0e58eab23e904a353bd082f16..55e010b642a87c477d16a5c33a247a5bc3f95a97 100644 (file)
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -16,13 +16,15 @@ use serde_json::{json, Value};
 use tokio::fs::File;
 use url::form_urlencoded;
 
+use proxmox::api::http_err;
+use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, HttpError};
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
+use proxmox::api::schema::{parse_simple_value, verify_json_object, parse_parameter_strings};
+
 use super::environment::RestEnvironment;
 use super::formatter::*;
-use crate::api_schema::rpc_environment::*;
-use crate::api_schema::config::*;
-use crate::api_schema::router::*;
-use crate::api_schema::*;
 use crate::auth_helpers::*;
+use crate::api_schema::config::ApiConfig;
 use crate::tools;
 
 extern "C"  { fn tzset(); }