Skip to content

fix(cli): normalize upgrade version prefix #319

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

Open
OnlyYu1996 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): normalize upgrade version prefix #319

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
18 changes: 15 additions & 3 deletions src/cortex-cli/src/upgrade_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ impl UpgradeCli {
Ok(info) => Some(info),
Err(e) => {
// Check if user asked for current version (Issue #1968)
let normalized_version = version.trim_start_matches('v');
let normalized_current = CLI_VERSION.trim_start_matches('v');
let normalized_version = normalize_version_input(version);
let normalized_current = normalize_version_input(CLI_VERSION);
if normalized_version == normalized_current {
println!("\n✓ Already on version v{}. No action needed.", CLI_VERSION);
return Ok(());
Expand Down Expand Up @@ -217,8 +217,9 @@ impl UpgradeCli {
/// Check for a specific version
async fn check_specific_version(manager: &UpdateManager, version: &str) -> Result<UpdateInfo> {
let client = cortex_update::CortexSoftwareClient::new();
let normalized_version = normalize_version_input(version);
let release = client
.get_release(version)
.get_release(normalized_version)
.await
.context(format!("Version {} not found", version))?;

Expand All @@ -238,6 +239,10 @@ async fn check_specific_version(manager: &UpdateManager, version: &str) -> Resul
})
}

fn normalize_version_input(version: &str) -> &str {
version.trim_start_matches(['v', 'V'])
}

/// Perform the actual upgrade
async fn perform_upgrade(manager: &UpdateManager, info: &UpdateInfo) -> Result<()> {
println!("\nDownloading v{}...", info.latest_version);
Expand Down Expand Up @@ -492,4 +497,11 @@ mod tests {
assert_eq!(semver_compare("1.0.0", "2.0.0"), -1);
assert_eq!(semver_compare("v1.0.0", "1.0.0"), 0);
}

#[test]
fn test_normalize_version_input() {
assert_eq!(normalize_version_input("0.0.7"), "0.0.7");
assert_eq!(normalize_version_input("v0.0.7"), "0.0.7");
assert_eq!(normalize_version_input("V0.0.7"), "0.0.7");
}
}