github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 09:13:29 +00:00
Code Issues Projects Releases Wiki Activity

genpolicy: ignore empty YAML as input

Browse Source 
Kata CI's pod-sandbox-vcpus-allocation.yaml ends with "---", so the
empty YAML document following that line should be ignored.

To test this fix:

genpolicy -u -y pod-sandbox-vcpus-allocation.yaml

Fixes: #8895

Signed-off-by: Dan Mihai <dmihai@microsoft.com>
This commit is contained in:
Dan Mihai 2024-01-30 17:24:05 +00:00
parent befef119ff
commit 09ea0eed9d
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/tools/genpolicy/src/policy.rs
View File

@ -368,28 +368,29 @@ impl AgentPolicy {
for document in serde_yaml::Deserializer::from_str(&yaml_contents) { for document in serde_yaml::Deserializer::from_str(&yaml_contents) {
let doc_mapping = Value::deserialize(document)?; let doc_mapping = Value::deserialize(document)?;
let yaml_string = serde_yaml::to_string(&doc_mapping)?; if doc_mapping != Value::Null {
let yaml_string = serde_yaml::to_string(&doc_mapping)?;
let silent = config.silent_unsupported_fields;
let (mut resource, kind) = yaml::new_k8s_resource(&yaml_string, silent)?;
resource.init(config.use_cache, &doc_mapping, silent).await;
let silent = config.silent_unsupported_fields; // ConfigMap and Secret documents contain additional input for policy generation.
let (mut resource, kind) = yaml::new_k8s_resource(&yaml_string, silent)?; if kind.eq("ConfigMap") {
resource.init(config.use_cache, &doc_mapping, silent).await; let config_map: config_map::ConfigMap = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &config_map);
config_maps.push(config_map);
} else if kind.eq("Secret") {
let secret: secret::Secret = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &secret);
secrets.push(secret);
}
// ConfigMap and Secret documents contain additional input for policy generation. // Although copies of ConfigMap and Secret resources get created above,
if kind.eq("ConfigMap") { // those resources still have to be present in the resources vector, because
let config_map: config_map::ConfigMap = serde_yaml::from_str(&yaml_string)?; // the elements of this vector will eventually be used to create the output
debug!("{:#?}", &config_map); // YAML file.
config_maps.push(config_map); resources.push(resource);
} else if kind.eq("Secret") {
let secret: secret::Secret = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &secret);
secrets.push(secret);
} }
// Although copies of ConfigMap and Secret resources get created above,
// those resources still have to be present in the resources vector, because
// the elements of this vector will eventually be used to create the output
// YAML file.
resources.push(resource);
} }
let settings = settings::Settings::new(&config.json_settings_path); let settings = settings::Settings::new(&config.json_settings_path);