Tomas Mirchev
6b7a48bb20
Independent re-audit surfaced 11 follow-ups across two layers of review
(my fresh-eyes read + a parallel agent pass). Bundled into a single
commit because changes are small and intertwined.
Symlink / state consistency:
- FileSystem.same_symlink now uses raw readlink() instead of resolve().
Aligns the three sites that ask "is this our link?" (_load_state,
_check_overwrite_safe, remove_symlink) on a single rule: exact-readlink
match. Following symlink chains would let externally-modified links
pass as ours and be silently overwritten.
- LinkedState.from_dict raises ConfigError on missing required fields
instead of .get(..., False) silent defaults. Matches InstalledState.
- LinkOp.source is now consistently None for remove_link ops; the
service derives expected_source from current.links. Removes the
asymmetry between in-state and orphan-broken removal ops.
- _apply_plan: rename shadowing local from link_target to spec.
Fail loud:
- _xdg() now treats XDG_CONFIG_HOME="" the same as unset. Previously
an empty env var produced Path("") and state files were written to
$PWD instead of ~/.local/state/flow.
- _resolve_target raises PlanConflict when a package contains a bare
_root entry (no path components) instead of silently dropping it.
- _strip_prefix raises FlowError when a declared install path does not
start with its section's expected prefix (e.g. etc/foo under install.bin).
Speculative abstraction removed (CLAUDE.md):
- core.template.substitute (the $VAR form) had no production callers --
deleted along with its tests; only the {{var}} form remains.
- SetupModule base class -- five subclasses, no shared behaviour, no
polymorphic call site. Deleted.
- Profile.arch -- parsed but never read. Deleted.
- PackagePlan.pm_command -- set but never read. Deleted (service
recomputes pm_install_command at the call site).
- FileSystem.ensure_dir(mode=...), .copy_file(sudo=...), .read_text(
default=...) -- no callers. Deleted along with their test.
- bootstrap _execute_action: the upfront `phase not in VALID_PHASES`
check duplicated the trailing exhaustive raise. Kept the trailing
raise as the single source of truth; phase set still documented in
VALID_PHASES.
Completion ctx threading:
- Removed _config()/_manifest() helpers that re-loaded from disk on
every completion call. _list_targets, _list_namespaces, _list_platforms,
_list_bootstrap_profiles, _list_manifest_packages now take ctx and
read from ctx.config / ctx.manifest.
Test coverage and e2e:
- e2e container test exercises a real `flow dotfiles link` (no dry-run)
and asserts the resulting symlinks point into the dotfiles dir;
reruns to verify idempotency.
- New tests: LinkedState corrupt-state ConfigError, LinkedState bad-version
ConfigError, bare-_root PlanConflict, service-level _root path routing
+ skip semantics.
- 11 stale test imports removed (pyflakes clean across src/ + tests/).
357 unit tests + 1 e2e (gated) all pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
162 lines
5.0 KiB
Python
162 lines
5.0 KiB
Python
"""Tests for flow.core.config."""
|
|
|
|
import pytest
|
|
|
|
from flow.core.config import AppConfig, load_config, load_manifest
|
|
from flow.core.errors import ConfigError
|
|
|
|
|
|
def test_load_config_missing_path(tmp_path):
|
|
cfg = load_config(tmp_path / "nonexistent")
|
|
assert isinstance(cfg, AppConfig)
|
|
assert cfg.dotfiles_url == ""
|
|
assert cfg.container_registry == "registry.tomastm.com"
|
|
assert cfg.container_runtime == "auto"
|
|
|
|
|
|
def test_load_config_from_yaml(tmp_path):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"repository:\n"
|
|
" url: git@github.com:user/dots.git\n"
|
|
" branch: dev\n"
|
|
"paths:\n"
|
|
" projects: ~/code\n"
|
|
"defaults:\n"
|
|
" container-registry: my.registry.com\n"
|
|
" tmux-session: main\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert cfg.dotfiles_url == "git@github.com:user/dots.git"
|
|
assert cfg.dotfiles_branch == "dev"
|
|
assert cfg.projects_dir == "~/code"
|
|
assert cfg.container_registry == "my.registry.com"
|
|
assert cfg.tmux_session == "main"
|
|
|
|
|
|
def test_load_config_parses_targets_shorthand(tmp_path):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"targets:\n"
|
|
" personal@orb: personal.orb\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert len(cfg.targets) == 1
|
|
assert cfg.targets[0].namespace == "personal"
|
|
assert cfg.targets[0].platform == "orb"
|
|
assert cfg.targets[0].host == "personal.orb"
|
|
|
|
|
|
def test_load_config_parses_targets_dict(tmp_path):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"targets:\n"
|
|
" work@ec2:\n"
|
|
" host: work.ec2.internal\n"
|
|
" identity: ~/.ssh/id_work\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert len(cfg.targets) == 1
|
|
assert cfg.targets[0].host == "work.ec2.internal"
|
|
assert cfg.targets[0].identity == "~/.ssh/id_work"
|
|
|
|
|
|
def test_load_manifest_returns_dict(tmp_path):
|
|
(tmp_path / "manifest.yaml").write_text(
|
|
"packages:\n"
|
|
" - name: fd\n"
|
|
" type: pkg\n"
|
|
)
|
|
data = load_manifest(tmp_path)
|
|
assert isinstance(data, dict)
|
|
assert "packages" in data
|
|
|
|
|
|
def test_load_manifest_merges_files(tmp_path):
|
|
(tmp_path / "01-packages.yaml").write_text("packages:\n - name: fd\n type: pkg\n")
|
|
(tmp_path / "02-profiles.yaml").write_text("profiles:\n work:\n os: linux\n")
|
|
data = load_manifest(tmp_path)
|
|
assert "packages" in data
|
|
assert "profiles" in data
|
|
|
|
|
|
def test_load_config_merges_local_and_overlay(tmp_path):
|
|
local = tmp_path / "local"
|
|
overlay = tmp_path / "overlay"
|
|
local.mkdir()
|
|
overlay.mkdir()
|
|
(local / "config.yaml").write_text(
|
|
"repository:\n"
|
|
" url: git@github.com:user/dots.git\n"
|
|
"targets:\n"
|
|
" personal@orb: personal.orb\n"
|
|
)
|
|
(overlay / "config.yaml").write_text(
|
|
"repository:\n"
|
|
" branch: dev\n"
|
|
"defaults:\n"
|
|
" tmux-session: main\n"
|
|
)
|
|
|
|
cfg = load_config(local, overlay)
|
|
assert cfg.dotfiles_url == "git@github.com:user/dots.git"
|
|
assert cfg.dotfiles_branch == "dev"
|
|
assert cfg.tmux_session == "main"
|
|
assert cfg.targets[0].host == "personal.orb"
|
|
|
|
|
|
def test_load_config_parses_legacy_targets(tmp_path):
|
|
(tmp_path / "01-targets.yaml").write_text(
|
|
"targets:\n"
|
|
" personal: orb personal.orb ~/.ssh/id_personal\n"
|
|
)
|
|
(tmp_path / "02-targets.yaml").write_text(
|
|
"targets:\n"
|
|
" - namespace: work\n"
|
|
" platform: ec2\n"
|
|
" host: work.ec2.internal\n"
|
|
" identity: ~/.ssh/id_work\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert len(cfg.targets) == 2
|
|
assert cfg.targets[0].platform == "orb"
|
|
assert cfg.targets[0].identity == "~/.ssh/id_personal"
|
|
assert cfg.targets[1].namespace == "work"
|
|
|
|
|
|
def test_load_manifest_merges_local_and_overlay(tmp_path):
|
|
local = tmp_path / "local"
|
|
overlay = tmp_path / "overlay"
|
|
local.mkdir()
|
|
overlay.mkdir()
|
|
(local / "manifest.yaml").write_text("profiles:\n local:\n os: linux\n")
|
|
(overlay / "packages.yaml").write_text("packages:\n - name: fd\n type: pkg\n")
|
|
data = load_manifest(local, overlay)
|
|
assert "profiles" in data
|
|
assert "packages" in data
|
|
|
|
|
|
def test_load_config_container_runtime(tmp_path):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"defaults:\n"
|
|
" container-runtime: podman-rootful\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert cfg.container_runtime == "podman-rootful"
|
|
|
|
|
|
@pytest.mark.parametrize("runtime", ["auto", "docker", "podman", "podman-rootful"])
|
|
def test_load_config_container_runtime_accepts_known_values(tmp_path, runtime):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"defaults:\n"
|
|
f" container-runtime: {runtime}\n"
|
|
)
|
|
cfg = load_config(tmp_path)
|
|
assert cfg.container_runtime == runtime
|
|
|
|
|
|
def test_load_config_container_runtime_rejects_unknown(tmp_path):
|
|
(tmp_path / "config.yaml").write_text(
|
|
"defaults:\n"
|
|
" container-runtime: nspawn\n"
|
|
)
|
|
with pytest.raises(ConfigError, match="Invalid container-runtime"):
|
|
load_config(tmp_path)
|