bump proxmox crate to 0.1.7

[proxmox-backup.git] / src / api2.rs

diff --git a/src/api2.rs b/src/api2.rs
index 3f59b72d941ebfdb5dae3022f905b8a8046ad27b..31c9d8e71cc31145e0a494283124f8fa94bb0af2 100644 (file)
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -1,96 +1,32 @@
-use failure::*;
-
-use crate::api::schema::*;
-use crate::api::router::*;
-use serde_json::{json, Value};
-use std::sync::Arc;
-
-pub mod config;
+mod access;
 pub mod admin;
+pub mod backup;
+pub mod config;
 pub mod node;
-mod version;
+pub mod reader;
 mod subscription;
-
-use lazy_static::lazy_static;
-use crate::tools::common_regex;
-
-// common schema definitions
-
-lazy_static! {
-    pub static ref IP_FORMAT: Arc<ApiStringFormat> = ApiStringFormat::Pattern(&common_regex::IP_REGEX).into();
-
-    pub static ref PVE_CONFIG_DIGEST_FORMAT: Arc<ApiStringFormat> =
-        ApiStringFormat::Pattern(&common_regex::SHA256_HEX_REGEX).into();
-
-    pub static ref PVE_CONFIG_DIGEST_SCHEMA: Arc<Schema> =
-        StringSchema::new("Prevent changes if current configuration file has different SHA256 digest. This can be used to prevent concurrent modifications.")
-        .format(PVE_CONFIG_DIGEST_FORMAT.clone()).into();
-
-}
-
-
-
-fn test_sync_api_handler(
-    param: Value,
-    _info: &ApiMethod,
-    _rpcenv: &mut RpcEnvironment,
-) -> Result<Value, Error> {
-    println!("This is a test {}", param);
-
-   // let force: Option<bool> = Some(false);
-
-    //if let Some(force) = param.force {
-    //}
-
-    let _force =  param["force"].as_bool()
-        .ok_or_else(|| format_err!("missing parameter 'force'"))?;
-
-    if let Some(_force) = param["force"].as_bool() {
-    }
-
-    Ok(json!(null))
-}
-
-pub fn router() -> Router {
-
-    let route4 = Router::new()
-        .get(ApiMethod::new(
-            |param, _info, _rpcenv| {
-                println!("This is a clousure handler: {}", param);
-
-                Ok(json!(null))
-            },
-            ObjectSchema::new("Another Endpoint."))
-             .returns(Schema::Null));
-
-
-    let nodeinfo = Router::new()
-        .get(ApiMethod::new(
-            test_sync_api_handler,
-            ObjectSchema::new("This is a simple test.")
-                .optional("force", BooleanSchema::new("Test for boolean options")))
-        )
-        .subdir("subdir3", route4);
-
-    let nodes = Router::new()
-        .subdir("localhost", node::router());
-
-
-    let route = Router::new()
-        .get(ApiMethod::new(
-            |_,_,_| Ok(json!([
-                {"subdir": "config"},
-                {"subdir": "admin"},
-                {"subdir": "nodes"},
-                {"subdir": "subscription"},
-                {"subdir": "version"},
-            ])),
-            ObjectSchema::new("Directory index.")))
-        .subdir("admin", admin::router())
-        .subdir("config", config::router())
-        .subdir("nodes", nodes)
-        .subdir("subscription", subscription::router())
-        .subdir("version", version::router());
-
-    route
-}
+pub mod types;
+pub mod version;
+pub mod pull;
+
+use proxmox::api::router::SubdirMap;
+use proxmox::api::Router;
+use proxmox::list_subdirs_api_method;
+
+const NODES_ROUTER: Router = Router::new().match_all("node", &node::ROUTER);
+
+pub const SUBDIRS: SubdirMap = &[
+    ("access", &access::ROUTER),
+    ("admin", &admin::ROUTER),
+    ("backup", &backup::ROUTER),
+    ("config", &config::ROUTER),
+    ("nodes", &NODES_ROUTER),
+    ("pull", &pull::ROUTER),
+    ("reader", &reader::ROUTER),
+    ("subscription", &subscription::ROUTER),
+    ("version", &version::ROUTER),
+];
+
+pub const ROUTER: Router = Router::new()
+    .get(&list_subdirs_api_method!(SUBDIRS))
+    .subdirs(SUBDIRS);