Skip to content

fix(fleet-config): treat empty env paths as unset; resolve env broker socket under HOME (#5473) - #5475

Merged
dezren39 merged 1 commit into
mainfrom
creator-a/5473-fleet-config-env-paths
Nov 4, 2026
Merged

dezren39 merged 1 commit into
mainfrom
creator-a/5473-fleet-config-env-paths

Conversation

@dezren39

@dezren39 dezren39 commented Nov 4, 2026 •

Copy link
Copy Markdown
Member

Fixes #5473.

fleet-config took env-supplied paths literally, unlike its own config-file/default paths:

  • Empty XDG_CONFIG_HOME / XDG_STATE_HOME produced CWD-relative paths — Config::file_path() returned fleet/fleet.toml, so a planted ./fleet/fleet.toml in the working directory was actually loaded (verified by probe: [domains] queue = false took effect), and the state dir became ./fleet. Empty FLEET_CONFIG likewise named an empty path.
  • A relative FLEET_BROKER_SOCKET was returned CWD-relative, bypassing the resolve_under_home applied to the config-file value and the default — despite the documented rule that relative paths resolve under $HOME.

Fix (pkgs/fleet/crates/fleet-config only):

  • env_path() reads env vars through a non_empty_path filter: an empty value is unset (XDG base-directory semantics).
  • Path resolution is factored into pure helpers (file_path_from, state_dir_from, broker_socket_from, resolve_under) so the behavior is pinned by tests without mutating process env; the env socket now resolves under $HOME exactly like the other sources.

Verification:

  • Laptop probe (real crate, controlled env) before: relative/CWD outcomes as above; after: empty XDG → HOME-based absolutes, planted CWD config ignored, env socket identical to the default path.
  • cargo test -p fleet-config: 7 passed (new test env_paths_ignore_empty_values_and_resolve_under_home pins the empty-value filter and all three resolution paths); cargo fmt -p fleet-config applied.

Autofix with [code]smith
Open in [code]smith · Need help on this PR? Tag @codesmith-bot with what you need.

@dezren39
dezren39 requested a review from a team as a code owner November 4, 2026 13:43
@dezren39 dezren39 added kind/bug Something isn't working (prefixed form of the classic bug label) app/fleet pkgs/fleet multicall binary + platform crates labels Nov 4, 2026
@coderabbitai

coderabbitai Bot commented Nov 4, 2026

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 29 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 2880c941-f998-43d8-9439-8a5a0e4e3a67
Commits

Reviewing files that changed from the base of the PR and between 5a2df2f and d89b7e2.

Files selected for processing: 1
  • pkgs/fleet/crates/fleet-config/src/lib.rs
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-04T13:45:08.916369Z d89b7e2 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@dezren39
dezren39 merged commit 27c1c1c into main Nov 4, 2026
3 checks passed
@dezren39
dezren39 deleted the creator-a/5473-fleet-config-env-paths branch November 4, 2026 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

app/fleet pkgs/fleet multicall binary + platform crates kind/bug Something isn't working (prefixed form of the classic bug label)

Projects

None yet

1 participant