github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 14:58:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8929 from yaoyinnan/8838/fix/error-message

Browse Source 
runtime-rs: report error on missing or empty fields in configuration
This commit is contained in:
Alex Lyn
2024-02-01 11:02:30 +08:00
committed by GitHub
parent befef119ff 864389c524
commit 1b8f3ce28a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/kata-types/src/annotations/mod.rs
View File

@@ -12,9 +12,6 @@ use std::u32;
use serde::Deserialize; use serde::Deserialize;
use crate::config::default::DEFAULT_AGENT_TYPE_NAME;
use crate::config::default::DEFAULT_HYPERVISOR;
use crate::config::default::DEFAULT_RUNTIME_NAME;
use crate::config::hypervisor::{get_hypervisor_plugin, HugePageType}; use crate::config::hypervisor::{get_hypervisor_plugin, HugePageType};
use crate::config::TomlConfig; use crate::config::TomlConfig;
@@ -463,13 +460,22 @@ impl Annotation {
// set default values for runtime.name, runtime.hypervisor_name and runtime.agent // set default values for runtime.name, runtime.hypervisor_name and runtime.agent
if config.runtime.name.is_empty() { if config.runtime.name.is_empty() {
config.runtime.name = DEFAULT_RUNTIME_NAME.to_string() return Err(io::Error::new(
io::ErrorKind::InvalidData,
"Runtime name is missing in the configuration",
));
} }
if config.runtime.hypervisor_name.is_empty() { if config.runtime.hypervisor_name.is_empty() {
config.runtime.hypervisor_name = DEFAULT_HYPERVISOR.to_string() return Err(io::Error::new(
io::ErrorKind::InvalidData,
"Hypervisor name is missing in the configuration",
));
} }
if config.runtime.agent_name.is_empty() { if config.runtime.agent_name.is_empty() {
config.runtime.agent_name = DEFAULT_AGENT_TYPE_NAME.to_string() return Err(io::Error::new(
io::ErrorKind::InvalidData,
"Agent name is missing in the configuration",
));
} }
let hypervisor_name = &config.runtime.hypervisor_name; let hypervisor_name = &config.runtime.hypervisor_name;