Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

switch to new schema verify methods

Browse Source 
the deprecated ones only forward to the new ones anyway..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-12-29 10:53:25 +01:00
parent 2d9fbc02ab
commit d363fb2bee
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-router/Cargo.toml
View File

@ -23,7 +23,7 @@ rustyline = { version = "7", optional = true }
libc = { version = "0.2", optional = true } libc = { version = "0.2", optional = true }
proxmox-lang = { path = "../proxmox-lang", version = "1.0" } proxmox-lang = { path = "../proxmox-lang", version = "1.0" }
proxmox-schema = { path = "../proxmox-schema", version = "1.0" } proxmox-schema = { path = "../proxmox-schema", version = "1.1" }
[features] [features]
default = [ "cli" ] default = [ "cli" ]

2
proxmox-router/src/cli/getopts.rs
View File

@ -192,7 +192,7 @@ pub fn parse_arguments<T: AsRef<str>>(
data.push((name.to_string(), value.to_string())); data.push((name.to_string(), value.to_string()));
} }
let options = parse_parameter_strings(&data, schema, true)?; let options = schema.parse_parameter_strings(&data, true)?;
Ok((options, remaining)) Ok((options, remaining))
} }

2
proxmox-section-config/Cargo.toml
View File

@ -14,6 +14,6 @@ hex = "0.4"
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
proxmox-schema = { path = "../proxmox-schema", version = "1.0.0" } proxmox-schema = { path = "../proxmox-schema", version = "1.1" }
# FIXME: remove! # FIXME: remove!
proxmox-lang = { path = "../proxmox-lang", version = "1.0.0" } proxmox-lang = { path = "../proxmox-lang", version = "1.0.0" }

8
proxmox-section-config/src/lib.rs
View File

@ -325,13 +325,13 @@ impl SectionConfig {
let plugin = self.plugins.get(type_name).unwrap(); let plugin = self.plugins.get(type_name).unwrap();
let id_schema = plugin.get_id_schema().unwrap_or(self.id_schema); let id_schema = plugin.get_id_schema().unwrap_or(self.id_schema);
if let Err(err) = parse_simple_value(section_id, id_schema) { if let Err(err) = id_schema.parse_simple_value(section_id) {
bail!("syntax error in section identifier: {}", err.to_string()); bail!("syntax error in section identifier: {}", err.to_string());
} }
if section_id.chars().any(|c| c.is_control()) { if section_id.chars().any(|c| c.is_control()) {
bail!("detected unexpected control character in section ID."); bail!("detected unexpected control character in section ID.");
} }
if let Err(err) = verify_json_object(section_config, plugin.properties) { if let Err(err) = plugin.properties.verify_json(section_config) {
bail!("verify section '{}' failed - {}", section_id, err); bail!("verify section '{}' failed - {}", section_id, err);
} }
@ -405,7 +405,7 @@ impl SectionConfig {
if let Some(plugin) = self.plugins.get(&section_type) { if let Some(plugin) = self.plugins.get(&section_type) {
let id_schema = let id_schema =
plugin.get_id_schema().unwrap_or(self.id_schema); plugin.get_id_schema().unwrap_or(self.id_schema);
if let Err(err) = parse_simple_value(&section_id, id_schema) { if let Err(err) = id_schema.parse_simple_value(&section_id) {
bail!( bail!(
"syntax error in section identifier: {}", "syntax error in section identifier: {}",
err.to_string() err.to_string()
@ -449,7 +449,7 @@ impl SectionConfig {
None => bail!("unknown property '{}'", key), None => bail!("unknown property '{}'", key),
}; };
let value = match parse_simple_value(&value, prop_schema) { let value = match prop_schema.parse_simple_value(&value) {
Ok(value) => value, Ok(value) => value,
Err(err) => { Err(err) => {
bail!("property '{}': {}", key, err.to_string()); bail!("property '{}': {}", key, err.to_string());