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>
123 lines
4.4 KiB
Python
123 lines
4.4 KiB
Python
"""Tests for bootstrap planning."""
|
|
|
|
import inspect
|
|
|
|
import pytest
|
|
|
|
from flow.core.errors import ConfigError
|
|
from flow.domain.bootstrap.models import Profile
|
|
from flow.domain.bootstrap.planning import parse_profile, plan_bootstrap
|
|
|
|
|
|
class TestParseProfile:
|
|
def test_basic(self):
|
|
raw = {
|
|
"os": "linux",
|
|
"hostname": "dev-box",
|
|
"shell": "zsh",
|
|
"packages": ["fd", "ripgrep"],
|
|
}
|
|
profile = parse_profile("work", raw)
|
|
assert profile.name == "work"
|
|
assert profile.os == "linux"
|
|
assert profile.hostname == "dev-box"
|
|
assert profile.shell == "zsh"
|
|
assert len(profile.packages) == 2
|
|
|
|
def test_missing_os_raises(self):
|
|
with pytest.raises(ConfigError, match=r"Profile 'minimal': required field 'os' is missing"):
|
|
parse_profile("minimal", {})
|
|
|
|
def test_optional_fields_default(self):
|
|
profile = parse_profile("minimal", {"os": "linux"})
|
|
assert profile.os == "linux"
|
|
assert profile.hostname is None
|
|
assert profile.packages == ()
|
|
|
|
def test_ssh_keys(self):
|
|
raw = {"os": "linux", "ssh-keys": [{"path": "~/.ssh/id_ed25519", "type": "ed25519"}]}
|
|
profile = parse_profile("test", raw)
|
|
assert len(profile.ssh_keys) == 1
|
|
|
|
def test_ssh_keys_with_filename(self):
|
|
raw = {"os": "linux", "ssh-keys": [{"filename": "id_work", "type": "ed25519"}]}
|
|
profile = parse_profile("test", raw)
|
|
assert profile.ssh_keys[0]["path"] == "~/.ssh/id_work"
|
|
|
|
def test_env_required(self):
|
|
profile = parse_profile("test", {"os": "linux", "env-required": ["USER_EMAIL"]})
|
|
assert profile.env_required == ("USER_EMAIL",)
|
|
|
|
def test_post_link_and_dotfiles_profile(self):
|
|
profile = parse_profile(
|
|
"test",
|
|
{"os": "linux", "dotfiles-profile": "linux-work", "post-link": "echo done"},
|
|
)
|
|
assert profile.dotfiles_profile == "linux-work"
|
|
assert profile.post_link == "echo done"
|
|
|
|
|
|
class TestPlanBootstrap:
|
|
def test_env_is_required_keyword(self):
|
|
sig = inspect.signature(plan_bootstrap)
|
|
param = sig.parameters["env"]
|
|
assert param.default is inspect.Parameter.empty
|
|
|
|
def test_basic_plan(self):
|
|
profile = Profile(
|
|
name="test", os="linux",
|
|
hostname="my-host", locale="en_US.UTF-8",
|
|
shell="zsh", ssh_keys=[], runcmd=[],
|
|
packages=["fd"], env_required=[],
|
|
)
|
|
manifest = {"packages": [{"name": "fd", "type": "pkg"}]}
|
|
plan = plan_bootstrap(profile, manifest, env={})
|
|
assert plan.profile == "test"
|
|
assert plan.total_steps > 0
|
|
phases = [a.phase for a in plan.actions]
|
|
assert "setup" in phases
|
|
assert "packages" in phases
|
|
assert "dotfiles" in phases
|
|
|
|
def test_missing_env_raises(self):
|
|
profile = Profile(
|
|
name="test", os="linux",
|
|
hostname=None, locale=None, shell=None,
|
|
ssh_keys=[], runcmd=[], packages=[],
|
|
env_required=["REQUIRED_VAR"],
|
|
)
|
|
with pytest.raises(ConfigError, match="REQUIRED_VAR"):
|
|
plan_bootstrap(profile, {}, env={})
|
|
|
|
def test_runcmd_produces_action(self):
|
|
profile = Profile(
|
|
name="test", os="linux",
|
|
hostname=None, locale=None, shell=None,
|
|
ssh_keys=[], runcmd=["echo hello", "echo world"],
|
|
packages=[], env_required=[],
|
|
)
|
|
plan = plan_bootstrap(profile, {}, env={})
|
|
runcmd_actions = [a for a in plan.actions if "custom command" in a.description.lower()]
|
|
assert len(runcmd_actions) == 1
|
|
|
|
def test_post_link_produces_action(self):
|
|
profile = Profile(
|
|
name="test", os="linux",
|
|
hostname=None, locale=None, shell=None,
|
|
ssh_keys=[], runcmd=[], packages=[], env_required=[],
|
|
post_link="echo done",
|
|
)
|
|
plan = plan_bootstrap(profile, {}, env={})
|
|
assert any(action.phase == "post-link" for action in plan.actions)
|
|
|
|
def test_ssh_keys_action(self):
|
|
profile = Profile(
|
|
name="test", os="linux",
|
|
hostname=None, locale=None, shell=None,
|
|
ssh_keys=[{"path": "~/.ssh/id", "type": "ed25519"}],
|
|
runcmd=[], packages=[], env_required=[],
|
|
)
|
|
plan = plan_bootstrap(profile, {}, env={})
|
|
ssh_actions = [a for a in plan.actions if "SSH" in a.description]
|
|
assert len(ssh_actions) == 1
|