github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 23:11:57 +00:00
Code Issues Projects Releases Wiki Activity

agent: Add context to errors when AgentConfig file is missing

Browse Source 
When the agent config file is missing, the panic message says "no such file or
directory" but doesn't inform the user about which file was missing. Add
context to the parsing (with filename) and to the from_config_file() calls
(with information where the path is coming from).

Fixes: #6771
Depends-on: github.com/kata-containers/tests#5627
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2023-05-03 16:16:57 +02:00
parent f5ff975560
commit 022a33de92
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/agent/src/config.rs
View File

@ -200,7 +200,7 @@ impl AgentConfig {
let config_position = args.iter().position(|a| a == "--config" || a == "-c"); let config_position = args.iter().position(|a| a == "--config" || a == "-c");
if let Some(config_position) = config_position { if let Some(config_position) = config_position {
if let Some(config_file) = args.get(config_position + 1) { if let Some(config_file) = args.get(config_position + 1) {
return AgentConfig::from_config_file(config_file); return AgentConfig::from_config_file(config_file).context("AgentConfig from args");
} else { } else {
panic!("The config argument wasn't formed properly: {:?}", args); panic!("The config argument wasn't formed properly: {:?}", args);
} }
@ -216,7 +216,8 @@ impl AgentConfig {
// or if it can't be parsed properly. // or if it can't be parsed properly.
if param.starts_with(format!("{}=", CONFIG_FILE).as_str()) { if param.starts_with(format!("{}=", CONFIG_FILE).as_str()) {
let config_file = get_string_value(param)?; let config_file = get_string_value(param)?;
return AgentConfig::from_config_file(&config_file); return AgentConfig::from_config_file(&config_file)
.context("AgentConfig from kernel cmdline");
} }
// parse cmdline flags // parse cmdline flags
@ -304,7 +305,8 @@ impl AgentConfig {
#[instrument] #[instrument]
pub fn from_config_file(file: &str) -> Result<AgentConfig> { pub fn from_config_file(file: &str) -> Result<AgentConfig> {
let config = fs::read_to_string(file)?; let config = fs::read_to_string(file)
.with_context(|| format!("Failed to read config file {}", file))?;
AgentConfig::from_str(&config) AgentConfig::from_str(&config)
} }