Tomas Mirchev
a71742afee
Fail loud at the boundary:
- substitute_template raises ConfigError on unresolved {{...}}; no more
silent literal placeholders in download URLs.
- parse_profile raises ConfigError when 'os' is missing -- no
raw.get("os", "linux") default that silently masks typos.
- urllib download failures wrapped to FlowError.
- bootstrap _execute_action dispatches phases explicitly and raises
on unhandled phase; no more "anything else runs as shell".
Direct access over defensive wrapping:
- plan_bootstrap requires env; plan_install requires pm. Drop the
dead `or os.environ` / `or detect_package_manager()` fallbacks.
- InstalledState.from_dict raises ConfigError on missing fields
rather than .get(..., default).
- Replace `x or {}` chains with explicit `x if x is not None else {}`
in package resolution; catalog validates type/platform-map/install
shapes at parse.
One canonical form / direct access:
- Path.home() replaced with paths.HOME in services/packages.py and
commands/completion.py. paths.HOME is the single source now.
- Use Path.is_relative_to for install-path containment instead of
str.startswith.
Domain purity:
- domain/containers/resolution.resolve_mounts takes a filesystem_check
predicate; service passes the probe in. Domain no longer touches
the filesystem directly.
No speculative abstraction:
- Drop the `allow_sudo` field entirely. The _script_uses_sudo check
it gated was bypassable (substring match) and gave false confidence;
the manifest is fully user-trusted anyway.
- Delete dead terminfo_fix_command + RemoteService.fix_terminfo
(no command surface exposes them).
- FileSystem.remove_tree no longer swallows errors via ignore_errors;
callers opt into missing_ok if needed.
Typed enums:
- PackageDef.type, AppConfig.container_runtime as Literal[...].
container_runtime values validated at config parse.
Completion bypasses runtime no longer:
- complete(ctx, ...) threads context; ContainerRuntime and state-file
reads go through ctx.runtime instead of constructing primitives.
Tests added for: template raise, missing os raise, env/pm required,
unknown phase raise, no allow_sudo gate, URL download failure, install
path escape, corrupt installed.json, container_runtime Literal,
filesystem_check controls mounts.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
164 lines
5.0 KiB
Python
164 lines
5.0 KiB
Python
"""Tests for flow.core.config."""
|
|
|
|
from pathlib import Path
|
|
|
|
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)
|