Skip to content

Version refactor fix #321

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
DanielVoogsgerd merged 4 commits into from
Jan 13, 2026
Merged

Version refactor fix #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ffec22
fix: Solve temp docker-compose lifetime issue
DanielVoogsgerd Jan 7, 2026
6b35629
fix: Brane remote version format
DanielVoogsgerd Jan 8, 2026
567cf47
fix(cli): Hardcode scheme for version lookup
DanielVoogsgerd Jan 8, 2026
6975f88
Fix for hitting `todo!()` in `rustyline`
Lut99 Jan 13, 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
12 changes: 12 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion brane-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ indicatif = "0.17.0"
parking_lot = "0.12.1"
path-clean = "1.0.0"
prettytable = "0.10.0"
rustyline = { version = "15.0.0", default-features = false }
rustyline = { version = "15.0.0", default-features = false, features = ["with-file-history"] }
rustyline-derive = "0.11.0"
semver = "1.0.0"
tar = "0.4.21"
Expand Down
5 changes: 3 additions & 2 deletions brane-cli/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,18 @@
async fn from_instance_info(info: InstanceInfo) -> Result<Self, VersionError> {
// Use reqwest for the API call
debug!(" > Querying...");
let mut url: String = info.api.to_string();
let mut url: String = format!("http://{}", info.api);

Check warning

Code scanning / devskim

An HTTP-based URL without TLS was detected. Warning

Insecure URL
url.push_str("/version");
let response: Response = reqwest::get(&url).await.map_err(|source| VersionError::RequestError { url: url.clone(), source })?;
if response.status() != StatusCode::OK {
return Err(VersionError::RequestFailure { url, status: response.status() });
}
let version_body: String = response.text().await.map_err(|source| VersionError::RequestBodyError { url: url.clone(), source })?;
let version_str = version_body.strip_prefix("v").unwrap_or(&version_body);

// Try to parse the version
debug!(" > Parsing remote version...");
let version = BraneVersion::from_str(&version_body).map_err(|source| VersionError::VersionParseError { raw: version_body, source })?;
let version = BraneVersion::from_str(version_str).map_err(|source| VersionError::VersionParseError { raw: version_body, source })?;

// Done!
debug!("Remote version number: {}", &version);
Expand Down
10 changes: 5 additions & 5 deletions brane-ctl/src/lifetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ pub async fn start(
opts.compose_verbose,
resolve_exe(exe)?,
DockerComposeCommand::Up,
resolve_node(file, "central"),
resolve_node(&file, "central"),
&node_config.namespace,
overridefile,
envs,
Expand Down Expand Up @@ -864,7 +864,7 @@ pub async fn start(
opts.compose_verbose,
resolve_exe(exe)?,
DockerComposeCommand::Up,
resolve_node(file, "worker"),
resolve_node(&file, "worker"),
&node_config.namespace,
overridefile,
envs,
Expand Down Expand Up @@ -897,7 +897,7 @@ pub async fn start(
opts.compose_verbose,
resolve_exe(exe)?,
DockerComposeCommand::Up,
resolve_node(file, "proxy"),
resolve_node(&file, "proxy"),
&node_config.namespace,
overridefile,
envs,
Expand Down Expand Up @@ -949,7 +949,7 @@ pub fn stop(compose_verbose: bool, exe: impl AsRef<str>, file: Option<PathBuf>,
let envs: HashMap<&str, OsString> = construct_envs(&brane_version, &node_config_path, &node_config)?;

// Resolve the filename and deduce the project name
let file: PathBuf = resolve_node(file, match node_config.node.kind() {
let file: PathBuf = resolve_node(&file, match node_config.node.kind() {
NodeKind::Central => "central",
NodeKind::Worker => "worker",
NodeKind::Proxy => "proxy",
Expand Down Expand Up @@ -1020,7 +1020,7 @@ pub async fn logs(exe: impl AsRef<str>, file: Option<PathBuf>, node_config_path:
opts.compose_verbose,
resolve_exe(exe)?,
DockerComposeCommand::Logs,
resolve_node(file, "$NODE"),
resolve_node(&file, "$NODE"),
&node_config.namespace,
None,
envs,
Expand Down
Loading