From 2732c47466c980715d37ca86936f51a1e7b90ec5 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 10 May 2021 08:19:28 +0200 Subject: [PATCH] cleanup src/api2/node/config.rs - add return type - fix permissions - fix descriptions --- src/api2/node/config.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/api2/node/config.rs b/src/api2/node/config.rs index fd997062..92c0100e 100644 --- a/src/api2/node/config.rs +++ b/src/api2/node/config.rs @@ -1,12 +1,11 @@ use anyhow::Error; -use serde_json::Value; use proxmox::api::schema::Updatable; use proxmox::api::{api, Permission, Router, RpcEnvironment}; use crate::api2::types::NODE_SCHEMA; -use crate::config::acl::PRIV_SYS_MODIFY; -use crate::config::node::NodeConfigUpdater; +use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY}; +use crate::config::node::{NodeConfig, NodeConfigUpdater}; pub const ROUTER: Router = Router::new() .get(&API_METHOD_GET_NODE_CONFIG) @@ -19,14 +18,17 @@ pub const ROUTER: Router = Router::new() }, }, access: { - permission: &Permission::Privilege(&["system"], PRIV_SYS_MODIFY, false), + permission: &Permission::Privilege(&["system"], PRIV_SYS_AUDIT, false), + }, + returns: { + type: NodeConfig, }, )] -/// Create a new changer device. -pub fn get_node_config(mut rpcenv: &mut dyn RpcEnvironment) -> Result { +/// Get the node configuration +pub fn get_node_config(mut rpcenv: &mut dyn RpcEnvironment) -> Result { let (config, digest) = crate::config::node::config()?; rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into(); - Ok(serde_json::to_value(config)?) + Ok(config) } #[api( @@ -52,7 +54,7 @@ pub fn get_node_config(mut rpcenv: &mut dyn RpcEnvironment) -> Result,