CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 13:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix tests with pest parsing

Browse source
This commit is contained in:
Till Wegmueller 2021-04-20 19:57:47 -03:00
parent 48525d3122
commit 991ea1d86c
3 changed files with 83 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libips/src/actions/manifest.pest
View file

@ -61,7 +61,7 @@ transform_character = {
transform_action = @{ transform_character*}
transform = {"<transform " ~ action_name ~ property+ ~ " "? ~ "->" ~ " "? ~ transform_action ~ ">" }
property_name = @{ ( ASCII_ALPHANUMERIC | "." | "_" )+ }
property_name = @{ ( ASCII_ALPHANUMERIC | "." | "_" | "-" )+ }
property_value = @{ ( ASCII_ALPHANUMERIC | "/" | "," | "." | "_" | "-" | "%" | "*" | "@" | "(" | ")" | "$" | ":" | "+" )+ | quoted_string }
payload = @{ payload_character* }
property = { " "? ~ property_name ~ "=" ~ property_value }

104
libips/src/actions/mod.rs
View file

@ -72,17 +72,26 @@ pub struct Dir {
impl From<Action> for Dir {
fn from(act: Action) -> Self {
let mut dir = Dir::default();
for prop in act.properties {
let mut props = act.properties;
if !act.payload_string.is_empty() {
let p_str = split_property(act.payload_string);
props.push(Property{
key: p_str.0,
value: p_str.1.replace("\"", ""),
})
}
for prop in props {
let cleaned_value = prop.value.replace("\"", "");
match prop.key.as_str() {
"path" => dir.path = prop.value,
"owner" => dir.owner = prop.value,
"group" => dir.group = prop.value,
"mode" => dir.mode = prop.value,
"revert-tag" => dir.revert_tag = prop.value,
"salvage-from" => dir.salvage_from = prop.value,
"path" => dir.path = cleaned_value,
"owner" => dir.owner = cleaned_value,
"group" => dir.group = cleaned_value,
"mode" => dir.mode = cleaned_value,
"revert-tag" => dir.revert_tag = cleaned_value,
"salvage-from" => dir.salvage_from = cleaned_value,
_ => {
if is_facet(prop.key.clone()) {
dir.add_facet(Facet::from_key_value(prop.key, prop.value));
dir.add_facet(Facet::from_key_value(prop.key, cleaned_value));
}
}
}
@ -142,39 +151,44 @@ impl From<Action> for File {
if act.payload_string.contains("/") {
file.properties.push(Property{
key: "original-path".to_string(),
value: act.payload_string
value: act.payload_string.replace("\"", "")
});
} else {
p.primary_identifier = Digest::from_str(&act.payload_string).unwrap();
}
}
for prop in act.properties {
let cleaned_value = prop.value.replace("\"", "");
match prop.key.as_str() {
"path" => file.path = prop.value,
"owner" => file.owner = prop.value,
"group" => file.group = prop.value,
"mode" => file.mode = prop.value,
"revert-tag" => file.revert_tag = prop.value,
"original_name" => file.original_name = prop.value,
"sysattr" => file.sys_attr = prop.value,
"overlay" => file.overlay = match string_to_bool(&prop.value) {
"path" => file.path = cleaned_value,
"owner" => file.owner = cleaned_value,
"group" => file.group = cleaned_value,
"mode" => file.mode = cleaned_value,
"revert-tag" => file.revert_tag = cleaned_value,
"original_name" => file.original_name = cleaned_value,
"sysattr" => file.sys_attr = cleaned_value,
"overlay" => file.overlay = match string_to_bool(&cleaned_value) {
Ok(b) => b,
_ => false,
},
"preserve" => file.preserve = match string_to_bool(&prop.value) {
"preserve" => file.preserve = match string_to_bool(&cleaned_value) {
Ok(b) => b,
_ => false,
},
"chash" | "pkg.content-hash" => p.additional_identifiers.push(Digest::from_str(&prop.value).unwrap()),
"chash" | "pkg.content-hash" => p.additional_identifiers.push(Digest::from_str(&cleaned_value).unwrap()),
_ => {
if is_facet(prop.key.clone()) {
file.add_facet(Facet::from_key_value(prop.key, prop.value));
file.add_facet(Facet::from_key_value(prop.key, cleaned_value));
} else {
file.properties.push(prop.clone());
file.properties.push(Property{
key: prop.key,
value: prop.value.replace("\"", "")
});
}
}
}
}
file.payload = Some(p);
file
}
}
@ -209,15 +223,24 @@ pub struct Dependency {
impl From<Action> for Dependency {
fn from(act: Action) -> Self {
let mut dep = Dependency::default();
for prop in act.properties {
let mut props = act.properties;
if !act.payload_string.is_empty() {
let p_str = split_property(act.payload_string);
props.push(Property{
key: p_str.0,
value: p_str.1.replace("\"", ""),
})
}
for prop in props {
let cleaned_value = prop.value.replace("\"", "");
match prop.key.as_str() {
"fmri" => dep.fmri = prop.value,
"type" => dep.dependency_type = prop.value,
"predicate" => dep.predicate = prop.value,
"root-image" => dep.root_image = prop.value,
"fmri" => dep.fmri = cleaned_value,
"type" => dep.dependency_type = cleaned_value,
"predicate" => dep.predicate = cleaned_value,
"root-image" => dep.root_image = cleaned_value,
_ => {
if is_facet(prop.key.clone()) {
dep.add_facet(Facet::from_key_value(prop.key, prop.value));
dep.add_facet(Facet::from_key_value(prop.key, cleaned_value));
} else {
dep.optional.push(prop.clone());
}
@ -263,14 +286,23 @@ pub struct Attr {
impl From<Action> for Attr {
fn from(act: Action) -> Self {
let mut attr = Attr::default();
for prop in act.properties {
let mut props = act.properties;
if !act.payload_string.is_empty() {
let p_str = split_property(act.payload_string);
props.push(Property{
key: p_str.0,
value: p_str.1.replace("\"", ""),
})
}
for prop in props {
let cleaned_value = prop.value.replace("\"", "");
match prop.key.as_str() {
"name" => attr.key = prop.value,
"value" => attr.values.push(prop.value),
"name" => attr.key = cleaned_value,
"value" => attr.values.push(cleaned_value),
_ => {
attr.properties.insert(prop.key.clone(), Property{
key: prop.key,
value: prop.value
value: cleaned_value
});
}
}
@ -476,6 +508,16 @@ fn get_facet_key(facet_string: String) -> String {
}
}
fn split_property(property_string: String) -> (String, String) {
match property_string.find("=") {
Some(_) => {
let v :Vec <_> = property_string.split("=").collect();
(String::from(v[0]), String::from(v[1]))
},
None => (property_string.clone(), String::new())
}
}
pub fn parse_manifest_file(filename: String) -> Result<Manifest> {
let mut m = Manifest::new();
let f = OsFile::open(filename)?;

22
libips/src/lib.rs
View file

@ -165,10 +165,10 @@ mod tests {
#[test]
fn parse_direcory_actions() {
let manifest_string = String::from("dir group=bin mode=0755 owner=root path=etc/nginx
dir group=bin mode=0755 owner=root path=usr/share/nginx
dir group=bin mode=0755 owner=root path=usr/share/nginx/html
dir group=bin mode=0755 owner=webservd path=var/nginx/logs
dir group=bin mode=0755 owner=root path=\"var/nginx\"");
dir group=bin mode=0755 owner=root path=usr/share/nginx
dir group=bin mode=0755 owner=root path=usr/share/nginx/html
dir group=bin mode=0755 owner=webservd path=var/nginx/logs
dir group=bin mode=0755 owner=root path=\"var/nginx\"");
let test_results = vec![
Dir{
@ -204,14 +204,10 @@ mod tests {
},
];
let mut manifest = Manifest::new();
match parse_manifest_string(manifest_string) {
Ok(m) => manifest = m,
Err(e) => {
println!("{}", e);
assert!(false, "caught error");
}
};
let res = Manifest::parse_string(manifest_string);
assert!(res.is_ok(), "error during Manifest parsing: {:?}", res);
let manifest = res.unwrap();
assert_eq!(manifest.directories.len(), test_results.len());
@ -811,7 +807,7 @@ file 6d5f820bb1d67594c7b757c79ef6f9242df49e98 chash=3ab17dde089f1eac7abd37d8efd7
},
];
let res = parse_manifest_string(manifest_string);
let res = Manifest::parse_string(manifest_string);
assert!(res.is_ok(), "error during Manifest parsing: {:?}", res);
let manifest = res.unwrap();