Skip to content

Simplify latesttag branch with early return, drop lifetime workaround #93

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
redpanda-f merged 2 commits into from
Mar 11, 2026
Merged

Simplify latesttag branch with early return, drop lifetime workaround #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ce1f6
Initial plan
Copilot Mar 11, 2026
f3f9d6c
Simplify latesttag handling with early return, drop lifetimes dance
Copilot Mar 11, 2026
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
10 changes: 4 additions & 6 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ impl Location {
// We need to do this setup in two steps since otherwise
// "gittag:https://github.com/orgs/repo:v1.2.0" would not be parseable
// and split the <url> string itself in two parts
let (mut location_type, remaining) = location.split_once(':').ok_or_else(|| {
let (location_type, remaining) = location.split_once(':').ok_or_else(|| {
format!(
"Invalid location format: '{}'. Expected \
'latesttag:<selector>', or 'gittag/gitcommit/gitbranch/local:...'",
Expand All @@ -135,18 +135,16 @@ impl Location {

// If the remaining part contains another ':', the portion before the last ':'
// is the URL and everything after is the value (handles HTTPS URLs with colons).
let (url, mut selector) = if let Some(colon_pos) = remaining.rfind(':') {
let (url, selector) = if let Some(colon_pos) = remaining.rfind(':') {
(&remaining[..colon_pos], &remaining[colon_pos + 1..])
} else {
(default_url, remaining)
};

// Special case: latesttag resolution into GitTag
let resolved_tag; // must outlive the match below
if location_type == "latesttag" {
resolved_tag = Self::resolve_latest_tag(url, selector)?;
selector = resolved_tag.as_str();
location_type = "gittag";
let tag = Self::resolve_latest_tag(url, selector)?;
return Ok(("gittag".into(), url.into(), tag));
}

Ok((location_type.into(), url.into(), selector.into()))
Expand Down