Skip to content

fix(aqua): parse templates in version_filter #5341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdx merged 1 commit into from
Jun 13, 2025
Merged

fix(aqua): parse templates in version_filter #5341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/aqua/aqua_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ pub struct AquaPackage {
pub replacements: HashMap<String, String>,
pub version_prefix: Option<String>,
version_filter: Option<String>,
#[serde(skip)]
version_filter_expr: Option<Program>,
pub version_source: Option<String>,
pub checksum: Option<AquaChecksum>,
pub slsa_provenance: Option<AquaSlsaProvenance>,
Expand Down Expand Up @@ -211,16 +209,13 @@ impl AquaRegistry {
}
let path_id = id.split('/').join(std::path::MAIN_SEPARATOR_STR);
let path = self.path.join("pkgs").join(&path_id).join("registry.yaml");
let mut pkg = self
let pkg = self
.fetch_package_yaml(id, &path, &path_id)
.await?
.packages
.into_iter()
.next()
.wrap_err(format!("no package found for {id} in {path:?}"))?;
if let Some(version_filter) = &pkg.version_filter {
pkg.version_filter_expr = Some(expr::compile(version_filter)?);
}
CACHE.lock().await.insert(id.to_string(), pkg.clone());
Ok(pkg)
}
Expand Down Expand Up @@ -483,9 +478,10 @@ impl AquaPackage {
}

pub fn version_filter_ok(&self, v: &str) -> Result<bool> {
// TODO: precompile the expression
if let Some(filter) = self.version_filter_expr.clone() {
if let Value::Bool(expr) = self.expr(v, filter)? {
if let Some(filter) = self.version_filter.clone() {
let filter = self.parse_aqua_str(&filter, v, &Default::default())?;
let program = expr::compile(&filter)?;
if let Value::Bool(expr) = self.expr(v, program)? {
Ok(expr)
} else {
warn!(
Expand Down Expand Up @@ -849,7 +845,6 @@ impl Default for AquaPackage {
replacements: HashMap::new(),
version_prefix: None,
version_filter: None,
version_filter_expr: None,
version_source: None,
checksum: None,
slsa_provenance: None,
Expand Down
Loading