github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-12 20:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9811 from mkulke/mkulke/use-kebabcase-for-enum-values-in-config-file-parsing

Browse Source 
agent: convert enum vals to kebab-case in cfg file
This commit is contained in:
Steve Horsman
2024-06-11 14:49:30 +01:00
committed by GitHub
parent 1c8db85d54 abc704a720
commit 59ff40f054
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ const ERR_INVALID_GUEST_COMPONENTS_PROCS_VALUE: &str = "invalid guest components
#[derive(Clone, Copy, Debug, Default, Display, Deserialize, EnumString, PartialEq)] #[derive(Clone, Copy, Debug, Default, Display, Deserialize, EnumString, PartialEq)]
// Features seem to typically be in kebab-case format, but we only have single words at the moment // Features seem to typically be in kebab-case format, but we only have single words at the moment
#[strum(serialize_all = "kebab-case")] #[strum(serialize_all = "kebab-case")]
#[serde(rename_all = "kebab-case")]
pub enum GuestComponentsFeatures { pub enum GuestComponentsFeatures {
All, All,
Attestation, Attestation,
@@ -76,6 +77,7 @@ pub enum GuestComponentsFeatures {
#[derive(Clone, Copy, Debug, Default, Display, Deserialize, EnumString, PartialEq)] #[derive(Clone, Copy, Debug, Default, Display, Deserialize, EnumString, PartialEq)]
/// Attestation-related processes that we want to spawn as children of the agent /// Attestation-related processes that we want to spawn as children of the agent
#[strum(serialize_all = "kebab-case")] #[strum(serialize_all = "kebab-case")]
#[serde(rename_all = "kebab-case")]
pub enum GuestComponentsProcs { pub enum GuestComponentsProcs {
None, None,
/// ApiServerRest implies ConfidentialDataHub and AttestationAgent /// ApiServerRest implies ConfidentialDataHub and AttestationAgent
@@ -224,6 +226,7 @@ impl FromStr for AgentConfig {
agent_config, agent_config,
guest_components_rest_api guest_components_rest_api
); );
config_override!(agent_config_builder, agent_config, guest_components_procs);
Ok(agent_config) Ok(agent_config)
} }
@@ -1655,6 +1658,8 @@ Caused by:
r#" r#"
dev_mode = true dev_mode = true
server_addr = 'vsock://8:2048' server_addr = 'vsock://8:2048'
guest_components_procs = "api-server-rest"
guest_components_rest_api = "all"
"#, "#,
) )
.unwrap(); .unwrap();
@@ -1662,6 +1667,14 @@ Caused by:
// Verify that the override worked // Verify that the override worked
assert!(config.dev_mode); assert!(config.dev_mode);
assert_eq!(config.server_addr, "vsock://8:2048"); assert_eq!(config.server_addr, "vsock://8:2048");
assert_eq!(
config.guest_components_procs,
GuestComponentsProcs::ApiServerRest
);
assert_eq!(
config.guest_components_rest_api,
GuestComponentsFeatures::All
);
// Verify that the default values are valid // Verify that the default values are valid
assert_eq!(config.hotplug_timeout, DEFAULT_HOTPLUG_TIMEOUT); assert_eq!(config.hotplug_timeout, DEFAULT_HOTPLUG_TIMEOUT);