From 74a01a9fc4f78b33be9c66e4c68779f1921e6170 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 19:43:00 +1000 Subject: [PATCH 1/4] =?UTF-8?q?Revert=20"Revert=20"fix(aqua):=20improve=20?= =?UTF-8?q?warnings=20for=20packages=20without=20repo=5Fowner=20a=E2=80=A6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 11ecdca03f14258bf757c5ab73a77001639b7793. --- src/backend/aqua.rs | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs index 7903c34ae1..05e505f4ee 100644 --- a/src/backend/aqua.rs +++ b/src/backend/aqua.rs @@ -58,15 +58,19 @@ impl Backend for AquaBackend { } async fn _list_remote_versions(&self, _config: &Arc) -> Result> { - let version_tags = self.get_version_tags().await?; + let version_tags = self.get_version_tags().await; let mut versions = Vec::new(); - for (v, tag) in version_tags.iter() { - let pkg = AQUA_REGISTRY - .package_with_version(&self.id, &[tag]) - .await - .unwrap_or_default(); - if !pkg.no_asset && pkg.error_message.is_none() { - versions.push(v.clone()); + match version_tags { + Ok(tags) => { + for (version, tag) in tags.iter() { + if !version.starts_with('v') { + versions.push(version.clone()); + } + versions.push(tag.clone()); + } + } + Err(e) => { + warn!("Remote versions cannot be fetched: {}", e); } } Ok(versions) @@ -79,8 +83,10 @@ impl Backend for AquaBackend { ) -> Result { let tag = self .get_version_tags() - .await? - .iter() + .await + .ok() + .into_iter() + .flatten() .find(|(version, _)| version == &tv.version) .map(|(_, tag)| tag); let mut v = tag.cloned().unwrap_or_else(|| tv.version.clone()); @@ -287,7 +293,10 @@ impl AquaBackend { versions.push((version.to_string(), tag)); } } else { - warn!("no aqua registry found for {}", self.ba()); + bail!( + "aqua package {} does not have repo_owner and/or repo_name.", + self.id + ); } Ok(versions) }) From a0a679d5e72f2ec5c445807f047fe2c5ad39dcf8 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 20:20:28 +1000 Subject: [PATCH 2/4] test: add e2e test for ls-remote for aqua backend --- e2e/backend/test_aqua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/backend/test_aqua b/e2e/backend/test_aqua index 77ef00b3c7..330f7ecd4d 100644 --- a/e2e/backend/test_aqua +++ b/e2e/backend/test_aqua @@ -14,5 +14,7 @@ test aqua:biomejs/biome@2.0.0 "biome --version" "Version: 2.0.0" test aqua:biomejs/biome@@biomejs/biome@2.0.0 "biome --version" "Version: 2.0.0" test aqua:gruntwork-io/terragrunt@0.77.22 "terragrunt --version" "terragrunt version v0.77.22" -assert_contains "MISE_USE_VERSIONS_HOST=0 mise ls-remote aqua:sharkdp/hyperfine" "1.9.0 -1.10.0" +assert_contains "MISE_USE_VERSIONS_HOST=0 mise ls-remote aqua:sharkdp/hyperfine" "1.8.0 +1.9.0 +1.10.0 +1.11.0" From ce881ad2bbb0ff14cc30e56c2089f36816288054 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:06:16 +1000 Subject: [PATCH 3/4] fix: fix ls_remote for aqua --- src/backend/aqua.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs index 05e505f4ee..14456c819e 100644 --- a/src/backend/aqua.rs +++ b/src/backend/aqua.rs @@ -59,21 +59,16 @@ impl Backend for AquaBackend { async fn _list_remote_versions(&self, _config: &Arc) -> Result> { let version_tags = self.get_version_tags().await; - let mut versions = Vec::new(); match version_tags { - Ok(tags) => { - for (version, tag) in tags.iter() { - if !version.starts_with('v') { - versions.push(version.clone()); - } - versions.push(tag.clone()); - } - } + Ok(tags) => Ok(tags + .iter() + .map(|(version, _)| version.clone()) + .collect_vec()), Err(e) => { warn!("Remote versions cannot be fetched: {}", e); + Ok(vec![]) } } - Ok(versions) } async fn install_version_( From f9c980db22010b0c3dd5a5d66998d2d24fcc4d83 Mon Sep 17 00:00:00 2001 From: Risu <79110363+risu729@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:10:47 +1000 Subject: [PATCH 4/4] fix: revert filter logic --- src/backend/aqua.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs index 14456c819e..ad77ab5d15 100644 --- a/src/backend/aqua.rs +++ b/src/backend/aqua.rs @@ -59,16 +59,24 @@ impl Backend for AquaBackend { async fn _list_remote_versions(&self, _config: &Arc) -> Result> { let version_tags = self.get_version_tags().await; + let mut versions = Vec::new(); match version_tags { - Ok(tags) => Ok(tags - .iter() - .map(|(version, _)| version.clone()) - .collect_vec()), + Ok(tags) => { + for (v, tag) in tags.iter() { + let pkg = AQUA_REGISTRY + .package_with_version(&self.id, &[tag]) + .await + .unwrap_or_default(); + if !pkg.no_asset && pkg.error_message.is_none() { + versions.push(v.clone()); + } + } + } Err(e) => { warn!("Remote versions cannot be fetched: {}", e); - Ok(vec![]) } } + Ok(versions) } async fn install_version_(