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

api: add some missing sorted macro calls

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2022-05-19 09:57:20 +02:00
parent 5408e30ab1
commit 8721b42e2f
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api2/admin/mod.rs
View File

@ -2,6 +2,7 @@
use proxmox_router::list_subdirs_api_method; use proxmox_router::list_subdirs_api_method;
use proxmox_router::{Router, SubdirMap}; use proxmox_router::{Router, SubdirMap};
use proxmox_sys::sortable;
pub mod datastore; pub mod datastore;
pub mod namespace; pub mod namespace;
@ -9,12 +10,13 @@ pub mod sync;
pub mod traffic_control; pub mod traffic_control;
pub mod verify; pub mod verify;
const SUBDIRS: SubdirMap = &[ #[sortable]
const SUBDIRS: SubdirMap = &sorted!([
("datastore", &datastore::ROUTER), ("datastore", &datastore::ROUTER),
("sync", &sync::ROUTER), ("sync", &sync::ROUTER),
("traffic-control", &traffic_control::ROUTER), ("traffic-control", &traffic_control::ROUTER),
("verify", &verify::ROUTER), ("verify", &verify::ROUTER),
]; ]);
pub const ROUTER: Router = Router::new() pub const ROUTER: Router = Router::new()
.get(&list_subdirs_api_method!(SUBDIRS)) .get(&list_subdirs_api_method!(SUBDIRS))

6
src/api2/config/mod.rs
View File

@ -2,6 +2,7 @@
use proxmox_router::list_subdirs_api_method; use proxmox_router::list_subdirs_api_method;
use proxmox_router::{Router, SubdirMap}; use proxmox_router::{Router, SubdirMap};
use proxmox_sys::sortable;
pub mod access; pub mod access;
pub mod acme; pub mod acme;
@ -16,7 +17,8 @@ pub mod tape_encryption_keys;
pub mod traffic_control; pub mod traffic_control;
pub mod verify; pub mod verify;
const SUBDIRS: SubdirMap = &[ #[sortable]
const SUBDIRS: SubdirMap = &sorted!([
("access", &access::ROUTER), ("access", &access::ROUTER),
("acme", &acme::ROUTER), ("acme", &acme::ROUTER),
("changer", &changer::ROUTER), ("changer", &changer::ROUTER),
@ -29,7 +31,7 @@ const SUBDIRS: SubdirMap = &[
("tape-encryption-keys", &tape_encryption_keys::ROUTER), ("tape-encryption-keys", &tape_encryption_keys::ROUTER),
("traffic-control", &traffic_control::ROUTER), ("traffic-control", &traffic_control::ROUTER),
("verify", &verify::ROUTER), ("verify", &verify::ROUTER),
]; ]);
pub const ROUTER: Router = Router::new() pub const ROUTER: Router = Router::new()
.get(&list_subdirs_api_method!(SUBDIRS)) .get(&list_subdirs_api_method!(SUBDIRS))

4
src/api2/config/remote.rs
View File

@ -503,13 +503,13 @@ pub async fn scan_remote_groups(
} }
#[sortable] #[sortable]
const DATASTORE_SCAN_SUBDIRS: SubdirMap = &[ const DATASTORE_SCAN_SUBDIRS: SubdirMap = &sorted!([
("groups", &Router::new().get(&API_METHOD_SCAN_REMOTE_GROUPS)), ("groups", &Router::new().get(&API_METHOD_SCAN_REMOTE_GROUPS)),
( (
"namespaces", "namespaces",
&Router::new().get(&API_METHOD_SCAN_REMOTE_NAMESPACES), &Router::new().get(&API_METHOD_SCAN_REMOTE_NAMESPACES),
), ),
]; ]);
const DATASTORE_SCAN_ROUTER: Router = Router::new() const DATASTORE_SCAN_ROUTER: Router = Router::new()
.get(&list_subdirs_api_method!(DATASTORE_SCAN_SUBDIRS)) .get(&list_subdirs_api_method!(DATASTORE_SCAN_SUBDIRS))

7
src/api2/mod.rs
View File

@ -1,5 +1,7 @@
//! The Proxmox Backup Server API //! The Proxmox Backup Server API
use proxmox_sys::sortable;
pub mod access; pub mod access;
pub mod admin; pub mod admin;
pub mod backup; pub mod backup;
@ -16,7 +18,8 @@ pub mod version;
use proxmox_router::{list_subdirs_api_method, Router, SubdirMap}; use proxmox_router::{list_subdirs_api_method, Router, SubdirMap};
const SUBDIRS: SubdirMap = &[ #[sortable]
const SUBDIRS: SubdirMap = &sorted!([
("access", &access::ROUTER), ("access", &access::ROUTER),
("admin", &admin::ROUTER), ("admin", &admin::ROUTER),
("backup", &backup::ROUTER), ("backup", &backup::ROUTER),
@ -28,7 +31,7 @@ const SUBDIRS: SubdirMap = &[
("status", &status::ROUTER), ("status", &status::ROUTER),
("tape", &tape::ROUTER), ("tape", &tape::ROUTER),
("version", &version::ROUTER), ("version", &version::ROUTER),
]; ]);
pub const ROUTER: Router = Router::new() pub const ROUTER: Router = Router::new()
.get(&list_subdirs_api_method!(SUBDIRS)) .get(&list_subdirs_api_method!(SUBDIRS))