.forgejo/workflows/build-deb.yml

@@ -1,66 +0,0 @@
-name: CI
-
-on:
-  push:
-
-jobs:
-  test:
-    runs-on: docker
-
-    steps:
-      - name: Install system dependencies
-        run: |
-          apt-get update
-          DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-          build-essential \
-          devscripts \
-          debhelper \
-          dh-python \
-          pybuild-plugin-pyproject \
-          python3-all \
-          python3-poetry-core \
-          python3-yaml \
-          python3-paramiko \
-          python3-jsonschema \
-          rsync \
-          ca-certificates
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Build deb
-        run: |
-          mkdir /out
-
-          rsync -a --delete \
-            --exclude '.git' \
-            --exclude '.venv' \
-            --exclude 'dist' \
-            --exclude 'build' \
-            --exclude '__pycache__' \
-            --exclude '.pytest_cache' \
-            --exclude '.mypy_cache' \
-            ./ /out/
-
-          cd /out/
-          export DEBEMAIL="mig@mig5.net"
-          export DEBFULLNAME="Miguel Jacq"
-
-          dch --distribution "trixie" --local "~trixie" "CI build for trixie"
-          dpkg-buildpackage -us -uc -b
-
-      # Notify if any previous step in this job failed
-      - name: Notify on failure
-        if: ${{ failure() }}
-        env:
-          WEBHOOK_URL: ${{ secrets.NODERED_WEBHOOK_URL }}
-          REPOSITORY: ${{ forgejo.repository }}
-          RUN_NUMBER: ${{ forgejo.run_number }}
-          SERVER_URL: ${{ forgejo.server_url }}
-        run: |
-          curl -X POST \
-               -H "Content-Type: application/json" \
-               -d "{\"repository\":\"$REPOSITORY\",\"run_number\":\"$RUN_NUMBER\",\"status\":\"failure\",\"url\":\"$SERVER_URL/$REPOSITORY/actions/runs/$RUN_NUMBER\"}" \
-               "$WEBHOOK_URL"

.forgejo/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
         run: |
           apt-get update
           DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-            ansible ansible-lint python3-venv pipx systemctl python3-apt jq python3-jsonschema
+            ansible ansible-lint python3-venv pipx systemctl python3-apt
 
       - name: Install Poetry
         run: |

.forgejo/workflows/trivy.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Run trivy
         run: |
-          trivy fs --no-progress --ignore-unfixed --format table --disable-telemetry --skip-version-check --exit-code 1 .
+          trivy fs --no-progress --ignore-unfixed --format table --disable-telemetry .
 
       # Notify if any previous step in this job failed
       - name: Notify on failure

CHANGELOG.md

@@ -1,81 +1,3 @@
-# 0.4.3
-
- * Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
- * Update dependencies
-
-# 0.4.2
-
- * Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be set, but it can be an 'alias' represented by the 'Host' value in the ssh config.
-
-# 0.4.1
-
- * Add interactive output when 'enroll diff --enforce' is invoking Ansible.
-
-# 0.4.0
-
- * Introduce `enroll validate` - a tool to validate a harvest against the state schema, or check for missing or orphaned obsolete artifacts in a harvest.
- * Attempt to generate Jinja2 templates of systemd unit files and Postfix main.cf (now that JinjaTurtle supports it)
- * Update pynacl dependency to resolve CVE-2025-69277
- * Add `--exclude-path` to `enroll diff` command, so that you can ignore certain churn from the diff (stuff you still wanted to harvest as a baseline but don't care if it changes day to day)
- * Add `--ignore-package-versions` to `enroll diff` command, to optionally ignore package upgrades (e.g due to patching) from the diff.
- * Add tags to the playbook for each role, to allow easier targeting of specific roles during play later.
- * Add `--enforce` mode to `enroll diff`. If there is diff detected between the two harvests, and it can enforce restoring the state from the older harvest, it will manifest the state and apply it with ansible. Only the specific roles that had diffed will be applied (via the new tags capability)
-
-# 0.3.0
-
- * Introduce `enroll explain` - a tool to analyze and explain what's in (or not in) a harvest and why.
- * Centralise the cron and logrotate stuff into their respective roles, we had a bit of duplication between roles based on harvest discovery.
- * Capture other files in the user's home directory such as `.bashrc`, `.bash_aliases`, `.profile`, if these files differ from the `/etc/skel` defaults
- * Ignore files that end with a tilde or - (probably backup files generated by editors or shadow file changes)
- * Manage certain symlinks e.g for apache2/nginx sites-enabled and so on
-
-# 0.2.3
-
- * Introduce --ask-become-pass or -K to support password-required sudo on remote hosts, just like Ansible. It will also fall back to this prompt if a password is required but the arg wasn't passed in.
-
-# 0.2.2
-
- * Fix stat() of parent directory so that we set directory perms correct on --include paths.
- * Set pty for remote calls when sudo is required, to help systems with limits on sudo without pty
-
-# 0.2.1
-
- * Don't accidentally add `extra_paths` role to `usr_local_custom` list, resulting in `extra_paths` appearing twice in manifested playbook
- * Ensure directories in the tree of anything included with --include are defined in the state and manifest so we make dirs before we try to create files
-
-# 0.2.0
-
- * Add version CLI arg
- * Add ability to enroll RH-style systems (DNF5/DNF/RPM)
- * Refactor harvest state to track package versions
-
-# 0.1.7
-
- * Fix an attribution bug for certain files ending up in the wrong package/role.
-
-# 0.1.6
-
- * DRY up some code logic
- * More test coverage
-
-# 0.1.5
-
- * Consolidate logrotate and cron files into their main service/package roles if they exist.
- * Standardise on `MAX_FILES_CAP` in one place
- * Manage apt stuff in its own role, not in `etc_custom`
-
-# 0.1.4
-
- * Attempt to capture more stuff from /etc that might not be attributable to a specific package. This includes common singletons and systemd timers
- * Avoid duplicate apt data in package-specific roles.
-
-# 0.1.3
-
- * Allow the user to add extra paths to harvest, or paths to ignore, using `--exclude-path` and `--include-path`
-   arguments.
- * Add support for an enroll.ini config file to store arguments per subcommand, to avoid having to remember
-   them all for repetitive executions.
-
 # 0.1.2
 
  * Include files from `/usr/local/bin` and `/usr/local/etc` in harvest (assuming they aren't binaries or

CONTRIBUTORS.md

@@ -1,5 +0,0 @@
-## Contributors
-
-mig5 would like to thank the following people for their contributions to Enroll.
-
- * [slhck](https://slhck.info/)

Dockerfile.debbuild

@@ -26,7 +26,6 @@ RUN set -eux; \
       python3-poetry-core \
       python3-yaml \
       python3-paramiko \
-      python3-jsonschema \
       rsync \
       ca-certificates \
     ; \

Dockerfile.rpmbuild

@@ -1,88 +0,0 @@
-# syntax=docker/dockerfile:1
-ARG BASE_IMAGE=fedora:42
-FROM ${BASE_IMAGE}
-
-RUN set -eux; \
-    dnf -y update; \
-    dnf -y install \
-        rpm-build \
-        rpmdevtools \
-        redhat-rpm-config \
-        gcc \
-        make \
-        findutils \
-        tar \
-        gzip \
-        rsync \
-        python3 \
-        python3-devel \
-        python3-setuptools \
-        python3-wheel \
-        pyproject-rpm-macros \
-        python3-rpm-macros \
-        python3-yaml \
-        python3-paramiko \
-        python3-jsonschema \
-        openssl-devel \
-        python3-poetry-core ; \
-        dnf -y clean all
-
-# Build runner script (copies repo, tars, runs rpmbuild)
-RUN set -eux;   cat > /usr/local/bin/build-rpm <<'EOF'
-#!/usr/bin/env bash
-set -euo pipefail
-
-SRC="${SRC:-/src}"
-WORKROOT="${WORKROOT:-/work}"
-OUT="${OUT:-/out}"
-VERSION_ID="$(grep VERSION_ID /etc/os-release | cut -d= -f2)"
-echo "Version ID is ${VERSION_ID}"
-
-mkdir -p "${WORKROOT}" "${OUT}"
-WORK="${WORKROOT}/src"
-rm -rf "${WORK}"
-mkdir -p "${WORK}"
-
-rsync -a --delete \
-  --exclude '.git' \
-  --exclude '.venv' \
-  --exclude 'dist' \
-  --exclude 'build' \
-  --exclude '__pycache__' \
-  --exclude '.pytest_cache' \
-  --exclude '.mypy_cache' \
-  "${SRC}/" "${WORK}/"
-
-cd "${WORK}"
-
-# Determine version from pyproject.toml unless provided
-if [ -n "${VERSION:-}" ]; then
-  ver="${VERSION}"
-else
-  ver="$(grep -m1 '^version = ' pyproject.toml | sed -E 's/version = "([^"]+)".*/\1/')"
-fi
-
-TOPDIR="${WORKROOT}/rpmbuild"
-mkdir -p "${TOPDIR}"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
-
-tarball="${TOPDIR}/SOURCES/enroll-${ver}.tar.gz"
-tar -czf "${tarball}" --transform "s#^#enroll/#" .
-
-spec_src="rpm/enroll.spec"
-
-cp -v "${spec_src}" "${TOPDIR}/SPECS/enroll.spec"
-
-rpmbuild -ba "${TOPDIR}/SPECS/enroll.spec" \
-  --define "_topdir ${TOPDIR}" \
-  --define "upstream_version ${ver}"
-
-shopt -s nullglob
-cp -v "${TOPDIR}"/RPMS/*/*.rpm "${OUT}/" || true
-cp -v "${TOPDIR}"/SRPMS/*.src.rpm "${OUT}/" || true
-echo "Artifacts copied to ${OUT}"
-EOF
-
-RUN chmod +x /usr/local/bin/build-rpm
-
-WORKDIR /work
-ENTRYPOINT ["/usr/local/bin/build-rpm"]

README.md

@@ -4,16 +4,16 @@
   <img src="https://git.mig5.net/mig5/enroll/raw/branch/main/enroll.svg" alt="Enroll logo" width="240" />
 </div>
 
-**enroll** inspects a Linux machine (Debian-like or RedHat-like) and generates Ansible roles/playbooks (and optionally inventory) for what it finds.
+**enroll** inspects a Linux machine (currently Debian-only) and generates Ansible roles/playbooks (and optionally inventory) for what it finds.
 
+It aims to be **optimistic and noninteractive**:
 - Detects packages that have been installed.
-- Detects package ownership of `/etc` files where possible
+- Detects Debian package ownership of `/etc` files using dpkg’s local database.
-- Captures config that has **changed from packaged defaults** where possible (e.g dpkg conffile hashes + package md5sums when available).
+- Captures config that has **changed from packaged defaults** (dpkg conffile hashes + package md5sums when available).
 - Also captures **service-relevant custom/unowned files** under `/etc/<service>/...` (e.g. drop-in config includes).
 - Defensively excludes likely secrets (path denylist + content sniff + size caps).
-- Captures non-system users and their SSH public keys and any .bashrc or .bash_aliases or .profile files that deviate from the skel defaults.
+- Captures non-system users and their SSH public keys.
-- Captures miscellaneous `/etc` files it can't attribute to a package and installs them in an `etc_custom` role.
+- Captures miscellaneous `/etc` files it can’t attribute to a package and installs them in an `etc_custom` role.
-- Captures symlinks in common applications that rely on them, e.g apache2/nginx 'sites-enabled'
 - Ditto for /usr/local/bin (for non-binary files) and /usr/local/etc
 - Avoids trying to start systemd services that were detected as inactive during harvest.
 
@@ -26,10 +26,9 @@
 1) **Harvest**: collect host facts + relevant files into a harvest bundle (`state.json` + harvested artifacts)
 2) **Manifest**: turn that harvest into Ansible roles/playbooks (and optionally inventory)
 
-Additionally, some other functionalities exist:
+Additionally:
 
 - **Diff**: compare two harvests and report what changed (packages/services/users/files) since the previous snapshot.
-- **Single-shot mode**: run both harvest and manifest at once.
 
 ---
 
@@ -42,8 +41,8 @@ Use when enrolling **one server** (or generating a “golden” role set you int
 
 **Characteristics**
 - Roles are more self-contained.
-- Raw config files live in the role's `files/`.
+- Raw config files live in the role’s `files/`.
-- Template variables live in the role's `defaults/main.yml`.
+- Template variables live in the role’s `defaults/main.yml`.
 
 ### Multi-site mode (`--fqdn`)
 Use when enrolling **several existing servers** quickly, especially if they differ.
@@ -69,28 +68,17 @@ Harvest state about a host and write a harvest bundle.
 - “Manual” packages
 - Changed-from-default config (plus related custom/unowned files under service dirs)
 - Non-system users + SSH public keys
-- Misc `/etc` that can't be attributed to a package (`etc_custom` role)
+- Misc `/etc` that can’t be attributed to a package (`etc_custom` role)
-- Optional user-specified extra files/dirs via `--include-path` (emitted as an `extra_paths` role at manifest time)
 
 **Common flags**
 - Remote harvesting:
-  - `--remote-host`, `--remote-user`, `--remote-port`, `--remote-ssh-config`
+  - `--remote-host`, `--remote-user`, `--remote-port`
-  - `--no-sudo` (if you don't want/need sudo)
+  - `--no-sudo` (if you don’t want/need sudo)
 - Sensitive-data behaviour:
   - default: tries to avoid likely secrets
   - `--dangerous`: disables secret-safety checks (see “Sensitive data” below)
 - Encrypt bundles at rest:
   - `--sops <FINGERPRINT...>`: writes a single encrypted `harvest.tar.gz.sops` instead of a plaintext directory
-- Path selection (include/exclude):
-  - `--include-path <PATTERN>` (repeatable): add extra files/dirs to harvest (even from locations normally ignored, like `/home`). Still subject to secret-safety checks unless `--dangerous`.
-  - `--exclude-path <PATTERN>` (repeatable): skip files/dirs even if they would normally be harvested.
-  - Pattern syntax:
-    - plain path: matches that file; directories match the directory + everything under it
-    - glob (default): supports `*` and `**` (prefix with `glob:` to force)
-    - regex: prefix with `re:` or `regex:`
-  - Precedence: excludes win over includes.
-* Using remote mode and sudo requires password?
-  - `--ask-become-pass` (or `-K`) will prompt for the password. If you forget, and remote requires password for sudo, it'll still fall back to prompting for a password, but will be a bit slower to do so.
 
 ---
 
@@ -108,17 +96,6 @@ Generate Ansible output from an existing harvest bundle.
 **Common flags**
 - `--fqdn <host>`: enables **multi-site** output style
 
-**Role tags**
-Generated playbooks tag each role so you can target just the parts you need:
-
-- Tag format: `role_<role_name>` (e.g. `role_services`, `role_users`)
-- Fallback/safe tag: `role_other`
-
-Example:
-```bash
-ansible-playbook -i "localhost," -c local /tmp/enroll-ansible/playbook.yml --tags role_services,role_users
-```
-
 ---
 
 ### `enroll single-shot`
@@ -142,26 +119,6 @@ Compare two harvest bundles and report what changed.
 **Inputs**
 - `--old <harvest>` and `--new <harvest>` (directories or `state.json` paths)
 - `--sops` when comparing SOPS-encrypted harvest bundles
-- `--exclude-path <PATTERN>` (repeatable) to ignore file/dir drift under matching paths (same pattern syntax as harvest)
-- `--ignore-package-versions` to ignore package version-only drift (upgrades/downgrades)
-- `--enforce` to apply the **old** harvest state locally (requires `ansible-playbook` on `PATH`)
-
-**Noise suppression**
-- `--exclude-path` is useful for things that change often but you still want in the harvest baseline (e.g. `/var/anacron`).
-- `--ignore-package-versions` keeps routine upgrades from alerting; package add/remove drift is still reported.
-
-**Enforcement (`--enforce`)**
-If a diff exists and `ansible-playbook` is available, Enroll will:
-1) generate a manifest from the **old** harvest into a temporary directory
-2) run `ansible-playbook -i localhost, -c local <tmp>/playbook.yml` (often with `--tags role_<...>` to limit runtime)
-3) record in the diff report that the old harvest was enforced
-
-Enforcement is intentionally “safe”:
-- reinstalls packages that were removed (`state: present`), but does **not** attempt downgrades/pinning
-- restores users, files (contents + permissions/ownership), and service enable/start state
-
-If `ansible-playbook` is not on `PATH`, Enroll returns an error and does not enforce.
-
 
 **Output formats**
 - `--format json` (default for webhooks)
@@ -177,72 +134,6 @@ If `ansible-playbook` is not on `PATH`, Enroll returns an error and does not enf
 
 ---
 
-### `enroll explain`
-Analyze a harvest and provide user-friendly explanations for what's in it and why.
-
-This may also explain why something *wasn't* included (e.g a binary file, a file that was too large, unreadable due to permissions, or looked like a log file/secret.
-
-Provide either the path to the harvest or the path to its state.json. It can also handle SOPS-encrypted harvests.
-
-Output can be provided in plaintext or json.
-
----
-
-### `enroll validate`
-
-Validates a harvest by checking:
-
- * state.json exists and is valid JSON
- * state.json validates against a JSON Schema (by default the vendored one)
- * Every `managed_file` entry has a corresponding artifact at: `artifacts/<role_name>/<src_rel>`
- * That there are no **unreferenced files** sitting in `artifacts/` that aren't in the state.
-
-#### Schema location + overrides
-
-The master schema lives at: `enroll/schema/state.schema.json`.
-
-You can override with a local file or URL:
-
-```
-enroll validate /path/to/harvest --schema ./state.schema.json
-enroll validate /path/to/harvest --schema https://enroll.sh/schema/state.schema.json
-```
-
-Or skip schema checks (still does artifact consistency checks):
-
-```
-enroll validate /path/to/harvest --no-schema
-```
-
-#### CLI usage examples
-
-Validate a local harvest:
-
-```
-enroll validate ./harvest
-```
-
-Validate a harvest tarball or a sops bundle:
-
-```
-enroll validate ./harvest.tar.gz
-enroll validate ./harvest.sops --sops
-```
-
-JSON output + write to file:
-
-```
-enroll validate ./harvest --format json --out validate.json
-```
-
-Return exit code 1 for any warnings, not just errors (useful for CI):
-
-```
-enroll validate ./harvest --fail-on-warnings
-```
-
----
-
 ## Sensitive data
 
 By default, `enroll` does **not** assume how you handle secrets in Ansible. It will attempt to avoid harvesting likely sensitive data (private keys, passwords, tokens, etc.). This can mean it skips some config files you may ultimately want to manage.
@@ -291,25 +182,6 @@ sudo apt update
 sudo apt install enroll
 ```
 
-## Fedora
-
-```bash
-sudo rpm --import https://mig5.net/static/mig5.asc
-
-sudo tee /etc/yum.repos.d/mig5.repo > /dev/null << 'EOF'
-[mig5]
-name=mig5 Repository
-baseurl=https://rpm.mig5.net/$releasever/rpm/$basearch
-enabled=1
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://mig5.net/static/mig5.asc
-EOF
-
-sudo dnf upgrade --refresh
-sudo dnf install enroll
-```
-
 ## AppImage
 Download it from my Releases page, then:
 
@@ -333,7 +205,7 @@ poetry run enroll --help
 
 ## Found a bug / have a suggestion?
 
-My Forgejo doesn't currently support federation, so I haven't opened registration/login for issues.
+My Forgejo doesn’t currently support federation, so I haven’t opened registration/login for issues.
 
 Instead, email me (see `pyproject.toml`) or contact me on the Fediverse:
 
@@ -355,31 +227,6 @@ enroll harvest --out /tmp/enroll-harvest
 enroll harvest --remote-host myhost.example.com --remote-user myuser --out /tmp/enroll-harvest
 ```
 
-### Remote harvest over SSH, where the SSH configuration is in ~/.ssh/config (e.g a different SSH key)
-
-Note: you must still pass `--remote-host`, but in this case, its value can be the 'Host' alias of an entry in your `~/.ssh/config`.
-
-```bash
-enroll harvest --remote-host myhostalias --remote-ssh-config ~/.ssh/config --out /tmp/enroll-harvest
-```
-
-### Include paths (`--include-path`)
-```bash
-# Add a few dotfiles from /home (still secret-safe unless --dangerous)
-enroll harvest --out /tmp/enroll-harvest --include-path '/home/*/.bashrc' --include-path '/home/*/.profile'
-```
-
-### Exclude paths (`--exclude-path`)
-```bash
-# Skip specific /usr/local/bin entries (or patterns)
-enroll harvest --out /tmp/enroll-harvest --exclude-path '/usr/local/bin/docker-*' --exclude-path '/usr/local/bin/some-tool'
-```
-
-### Regex include
-```bash
-enroll harvest --out /tmp/enroll-harvest --include-path 're:^/home/[^/]+/\.config/myapp/.*$'
-```
-
 ### `--dangerous`
 ```bash
 enroll harvest --out /tmp/enroll-harvest --dangerous
@@ -438,7 +285,7 @@ enroll single-shot --remote-host myhost.example.com --remote-user myuser   --har
 
 ## Diff
 
-### Compare two harvest directories, output in json
+### Compare two harvest directories
 ```bash
 enroll diff --old /path/to/harvestA --new /path/to/harvestB --format json
 ```
@@ -450,82 +297,6 @@ enroll diff   --old /path/to/golden/harvest   --new /path/to/new/harvest   --web
 
 `diff` mode also supports email sending and text or markdown format, as well as `--exit-code` mode to trigger a return code of 2 (useful for crons or CI)
 
-### Ignore a specific directory or file from the diff
-```bash
-enroll diff --old /path/to/harvestA --new /path/to/harvestB --exclude-path /var/anacron
-```
-
-### Ignore package version drift (routine upgrades) but still alert on add/remove
-```bash
-enroll diff --old /path/to/harvestA --new /path/to/harvestB --ignore-package-versions
-```
-
-### Enforce the old harvest state when drift is detected (requires Ansible)
-```bash
-enroll diff --old /path/to/harvestA --new /path/to/harvestB --enforce --ignore-package-versions --exclude-path /var/anacron
-```
-
----
-
-## Explain
-
-### Explain a harvest
-
-All of these do the same thing:
-
-```bash
-enroll explain /path/to/state.json
-enroll explain /path/to/bundle_dir
-enroll explain /path/to/harvest.tar.gz
-```
-
-### Explain a SOPS-encrypted harvest
-
-```bash
-enroll explain /path/to/harvest.tar.gz.sops --sops
-```
-
-### Explain with JSON output and more examples
-
-```bash
-enroll explain /path/to/state.json --format json --max-examples 25
-```
-
-### Example output
-
-```
-❯ enroll explain /tmp/syrah.harvest
-Enroll explain: /tmp/syrah.harvest
-Host: syrah.mig5.net (os: debian, pkg: dpkg)
-Enroll: 0.2.3
-
-Inventory
-- Packages: 254
-- Why packages were included (observed_via):
-  - user_installed: 248 – Package appears explicitly installed (as opposed to only pulled in as a dependency).
-  - package_role: 232 – Package was referenced by an enroll packages snapshot/role. (e.g. acl, acpid, adduser)
-  - systemd_unit: 22 – Package is associated with a systemd unit that was harvested. (e.g. postfix.service, tor.service, apparmor.service)
-
-Roles collected
-- users: 1 user(s), 1 file(s), 0 excluded
-- services: 19 unit(s), 111 file(s), 6 excluded
-- packages: 232 package snapshot(s), 41 file(s), 0 excluded
-- apt_config: 26 file(s), 7 dir(s), 10 excluded
-- dnf_config: 0 file(s), 0 dir(s), 0 excluded
-- etc_custom: 70 file(s), 20 dir(s), 0 excluded
-- usr_local_custom: 35 file(s), 1 dir(s), 0 excluded
-- extra_paths: 0 file(s), 0 dir(s), 0 excluded
-
-Why files were included (managed_files.reason)
-- custom_unowned (179): A file not owned by any package (often custom/operator-managed).. Examples: /etc/apparmor.d/local/lsb_release, /etc/apparmor.d/local/nvidia_modprobe, /etc/apparmor.d/local/sbin.dhclient
-- usr_local_bin_script (35): Executable scripts under /usr/local/bin (often operator-installed).. Examples: /usr/local/bin/check_firewall, /usr/local/bin/awslogs
-- apt_keyring (13): Repository signing key material used by APT.. Examples: /etc/apt/keyrings/openvpn-repo-public.asc, /etc/apt/trusted.gpg, /etc/apt/trusted.gpg.d/deb.torproject.org-keyring.gpg
-- modified_conffile (10): A package-managed conffile differs from the packaged/default version.. Examples: /etc/dnsmasq.conf, /etc/ssh/moduli, /etc/tor/torrc
-- logrotate_snippet (9): logrotate snippets/configs referenced in system configuration.. Examples: /etc/logrotate.d/rsyslog, /etc/logrotate.d/tor, /etc/logrotate.d/apt
-- apt_config (7): APT configuration affecting package installation and repository behavior.. Examples: /etc/apt/apt.conf.d/01autoremove, /etc/apt/apt.conf.d/20listchanges, /etc/apt/apt.conf.d/70debconf
-[...]
-```
-
 ---
 
 ## Run Ansible
@@ -539,71 +310,3 @@ ansible-playbook -i "localhost," -c local /tmp/enroll-ansible/playbook.yml
 ```bash
 ansible-playbook /tmp/enroll-ansible/playbooks/"$(hostname -f)".yml
 ```
-
-### Run only specific roles (tags)
-Generated playbooks tag each role as `role_<name>` (e.g. `role_users`, `role_services`), so you can speed up targeted runs:
-```bash
-ansible-playbook -i "localhost," -c local /tmp/enroll-ansible/playbook.yml --tags role_users
-```
-
-## Configuration file
-
-As can be seen above, there are a lot of powerful 'permutations' available to all four subcommands.
-
-Sometimes, it can be easier to store them in a config file so you don't have to remember them!
-
-Enroll supports reading an ini-style file of all the arguments for each subcommand.
-
-### Location of the config file
-
-The path the config file can be specified with `-c` or `--config` on the command-line. Otherwise,
-Enroll will look for `./enroll.ini`, `./.enroll.ini` (in the current working directory),
-`~/.config/enroll/enroll.ini` (or `$XDG_CONFIG_HOME/enroll/enroll.ini`).
-
-You may also pass `--no-config` if you deliberately want to ignore the config file even if it existed.
-
-### Precedence
-
-Highest wins:
-
- * Explicit CLI flags
- * INI config ([cmd], [enroll])
- * argparse defaults
-
-### Example config file
-
-Here is an example.
-
-Whenever an argument on the command-line has a 'hyphen' in it, just be sure to change it to an underscore in the ini file.
-
-```ini
-[enroll]
-# (future global flags may live here)
-
-[harvest]
-dangerous = false
-include_path =
-  /home/*/.bashrc
-  /home/*/.profile
-exclude_path = /usr/local/bin/docker-*, /usr/local/bin/some-tool
-# remote_host = yourserver.example.com
-# remote_user = you
-# remote_port = 2222
-
-[manifest]
-# you can set defaults here too, e.g.
-no_jinjaturtle = true
-sops = 00AE817C24A10C2540461A9C1D7CDE0234DB458D
-
-[diff]
-# ignore noisy drift
-exclude_path = /var/anacron
-ignore_package_versions = true
-# enforce = true  # requires ansible-playbook on PATH
-
-[single-shot]
-# if you use single-shot, put its defaults here.
-# It does not inherit those of the subsections above, so you
-# may wish to repeat them here.
-include_path = re:^/home/[^/]+/\.config/myapp/.*$
-```

debian/changelog

@@ -1,106 +1,3 @@
-enroll (0.4.3) unstable; urgency=medium
-
- *  Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
-
- -- Miguel Jacq <mig@mig5.net>  Fri, 16 Jan 2026 11:00 +1100
-
-enroll (0.4.2) unstable; urgency=medium
-
- * Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be set, but it can be an 'alias' represented by the 'Host' value in the ssh config.
-
- -- Miguel Jacq <mig@mig5.net>  Tue, 13 Jan 2026 21:55:00 +1100
-
-enroll (0.4.1) unstable; urgency=medium
- * Add interactive output when 'enroll diff --enforce' is invoking Ansible.
-
- -- Miguel Jacq <mig@mig5.net>  Sun, 11 Jan 2026 10:00:00 +1100
-
-enroll (0.4.0) unstable; urgency=medium
- * Introduce `enroll validate` - a tool to validate a harvest against the state schema, or check for missing or orphaned obsolete artifacts in a harvest.
- * Attempt to generate Jinja2 templates of systemd unit files and Postfix main.cf (now that JinjaTurtle supports it)
- * Update pynacl dependency to resolve CVE-2025-69277
- * Add `--exclude-path` to `enroll diff` command, so that you can ignore certain churn from the diff (stuff you still wanted to harvest as a baseline but don't care if it changes day to day)
- * Add `--ignore-package-versions` to `enroll diff` command, to optionally ignore package upgrades (e.g due to patching) from the diff.
- * Add tags to the playbook for each role, to allow easier targeting of specific roles during play later.
- * Add `--enforce` mode to `enroll diff`. If there is diff detected between the two harvests, and it can enforce restoring the state from the older harvest, it will manifest the state and apply it with ansible.
-Only the specific roles that had diffed will be applied (via the new tags capability)
-
- -- Miguel Jacq <mig@mig5.net>  Sat, 10 Jan 2026 10:30:00 +1100
-
-enroll (0.3.0) unstable; urgency=medium
-
-  * Introduce `enroll explain` - a tool to analyze and explain what's in (or not in) a harvest and why.
-  * Centralise the cron and logrotate stuff into their respective roles, we had a bit of duplication between roles based on harvest discovery.
-  * Capture other files in the user's home directory such as `.bashrc`, `.bash_aliases`, `.profile`, if these files differ from the `/etc/skel` defaults
-  * Ignore files that end with a tilde or - (probably backup files generated by editors or shadow file changes)
-  * Manage certain symlinks e.g for apache2/nginx sites-enabled and so on
-
- -- Miguel Jacq <mig@mig5.net>  Mon, 05 Jan 2026 17:00:00 +1100
-
-enroll (0.2.3) unstable; urgency=medium
-
-  * Introduce --ask-become-pass or -K to support password-required sudo on remote hosts, just like Ansible. It will also fall back to this prompt if a password is required but the arg wasn't passed in.
-
- -- Miguel Jacq <mig@mig5.net>  Sun, 04 Jan 2026 20:38:00 +1100
-
-enroll (0.2.2) unstable; urgency=medium
-
-  * Fix stat() of parent directory so that we set directory perms correct on --include paths.
-  * Set pty for remote calls when sudo is required, to help systems with limits on sudo without pty
-
- -- Miguel Jacq <mig@mig5.net>  Sat, 03 Jan 2026 09:56:00 +1100
-
-enroll (0.2.1) unstable; urgency=medium
-
-  * Don't accidentally add extra_paths role to usr_local_custom list, resulting in extra_paths appearing twice in manifested playbook
-  * Ensure directories in the tree of anything included with --include are defined in the state and manifest so we make dirs before we try to create files
-
- -- Miguel Jacq <mig@mig5.net>  Fri, 02 Jan 2026 21:30:00 +1100
-
-enroll (0.2.0) unstable; urgency=medium
-
-  * Add version CLI arg
-  * Add ability to enroll RH-style systems (DNF5/DNF/RPM)
-  * Refactor harvest state to track package versions
-
- -- Miguel Jacq <mig@mig5.net>  Mon, 29 Dec 2025 17:30:00 +1100
-
-enroll (0.1.7) unstable; urgency=medium
-  * Fix an attribution bug for certain files ending up in the wrong package/role.
-
- -- Miguel Jacq <mig@mig5.net>  Sun, 28 Dec 2025 18:30:00 +1100
-
-enroll (0.1.6) unstable; urgency=medium
-
-  * DRY up some code logic
-  * More test coverage
-
- -- Miguel Jacq <mig@mig5.net>  Sun, 28 Dec 2025 15:30:00 +1100
-
-enroll (0.1.5) unstable; urgency=medium
-
-  * Consolidate logrotate and cron files into their main service/package roles if they exist.
-  * Standardise on MAX_FILES_CAP in one place
-  * Manage apt stuff in its own role, not in etc_custom
-
- -- Miguel Jacq <mig@mig5.net>  Sun, 28 Dec 2025 10:00:00 +1100
-
-enroll (0.1.4) unstable; urgency=medium
-
-  * Attempt to capture more stuff from /etc that might not be attributable to a specific package. This includes common singletons and systemd timers
-  * Avoid duplicate apt data in package-specific roles.
-
- -- Miguel Jacq <mig@mig5.net>  Sat, 27 Dec 2025 19:00:00 +1100
-
-enroll (0.1.3) unstable; urgency=medium
-
-  * Allow the user to add extra paths to harvest, or paths to ignore, using `--exclude-path` and `--include-path`
-    arguments.
-  * Add support for an enroll.ini config file to store arguments per subcommand, to avoid having to remember
-    them all for repetitive executions.
-
- -- Miguel Jacq <mig@mig5.net>  Sat, 20 Dec 2025 18:24:00 +1100
-
 enroll (0.1.2) unstable; urgency=medium
 
   * Include files from `/usr/local/bin` and `/usr/local/etc` in harvest (assuming they aren't binaries or

debian/control

@@ -10,13 +10,12 @@ Build-Depends:
  python3-all,
  python3-yaml,
  python3-poetry-core,
- python3-paramiko,
+ python3-paramiko
- python3-jsonschema
 Standards-Version: 4.6.2
 Homepage: https://git.mig5.net/mig5/enroll
 
 Package: enroll
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}, python3-yaml, python3-paramiko, python3-jsonschema
+Depends: ${misc:Depends}, ${python3:Depends}, python3-yaml, python3-paramiko
 Description: Harvest a host into Ansible roles
  A tool that inspects a system and emits Ansible roles/playbooks to reproduce it.

enroll/cli.py

@@ -1,257 +1,18 @@
 from __future__ import annotations
 
 import argparse
-import configparser
-import json
 import os
-import sys
 import tarfile
 import tempfile
 from pathlib import Path
 from typing import Optional
 
 from .cache import new_harvest_cache_dir
-from .diff import (
+from .diff import compare_harvests, format_report, post_webhook, send_email
-    compare_harvests,
-    enforce_old_harvest,
-    format_report,
-    has_enforceable_drift,
-    post_webhook,
-    send_email,
-)
-from .explain import explain_state
 from .harvest import harvest
 from .manifest import manifest
-from .remote import remote_harvest, RemoteSudoPasswordRequired
+from .remote import remote_harvest
 from .sopsutil import SopsError, encrypt_file_binary
-from .validate import validate_harvest
-from .version import get_enroll_version
-
-
-def _discover_config_path(argv: list[str]) -> Optional[Path]:
-    """Return the config path to use, if any.
-
-    Precedence:
-      1) --no-config disables loading.
-      2) --config PATH (or -c PATH)
-      3) $ENROLL_CONFIG
-      4) ./enroll.ini, ./.enroll.ini
-      5) $XDG_CONFIG_HOME/enroll/enroll.ini (or ~/.config/enroll/enroll.ini)
-
-    The config file is optional; if no file is found, returns None.
-    """
-
-    # Quick scan for explicit flags without needing to build the full parser.
-    if "--no-config" in argv:
-        return None
-
-    def _value_after(flag: str) -> Optional[str]:
-        try:
-            i = argv.index(flag)
-        except ValueError:
-            return None
-        if i + 1 >= len(argv):
-            return None
-        return argv[i + 1]
-
-    p = _value_after("--config") or _value_after("-c")
-    if p:
-        return Path(p).expanduser()
-
-    envp = os.environ.get("ENROLL_CONFIG")
-    if envp:
-        return Path(envp).expanduser()
-
-    cwd = Path.cwd()
-    for name in ("enroll.ini", ".enroll.ini"):
-        cp = cwd / name
-        if cp.exists() and cp.is_file():
-            return cp
-
-    xdg = os.environ.get("XDG_CONFIG_HOME")
-    if xdg:
-        base = Path(xdg).expanduser()
-    else:
-        base = Path.home() / ".config"
-    cp = base / "enroll" / "enroll.ini"
-    if cp.exists() and cp.is_file():
-        return cp
-
-    return None
-
-
-def _parse_bool(s: str) -> Optional[bool]:
-    v = str(s).strip().lower()
-    if v in {"1", "true", "yes", "y", "on"}:
-        return True
-    if v in {"0", "false", "no", "n", "off"}:
-        return False
-    return None
-
-
-def _action_lookup(p: argparse.ArgumentParser) -> dict[str, argparse.Action]:
-    """Map config keys -> argparse actions for a parser.
-
-    Accepts both dest names and long option names without leading dashes,
-    normalized with '-' -> '_'.
-    """
-
-    m: dict[str, argparse.Action] = {}
-    for a in p._actions:  # noqa: SLF001 (argparse internal)
-        if not getattr(a, "dest", None):
-            continue
-        dest = str(a.dest).strip().lower()
-        if dest:
-            m[dest] = a
-        for opt in getattr(a, "option_strings", []) or []:
-            k = opt.lstrip("-").strip().lower()
-            if k:
-                m[k.replace("-", "_")] = a
-                m[k] = a
-    return m
-
-
-def _choose_flag(a: argparse.Action) -> Optional[str]:
-    # Prefer a long flag if available (e.g. --dangerous over -d)
-    for s in getattr(a, "option_strings", []) or []:
-        if s.startswith("--"):
-            return s
-    for s in getattr(a, "option_strings", []) or []:
-        return s
-    return None
-
-
-def _split_list_value(v: str) -> list[str]:
-    # Support comma-separated and/or multi-line lists.
-    raw = str(v)
-    if "\n" in raw:
-        parts = [p.strip() for p in raw.splitlines()]
-        return [p for p in parts if p]
-    if "," in raw:
-        parts = [p.strip() for p in raw.split(",")]
-        return [p for p in parts if p]
-    raw = raw.strip()
-    return [raw] if raw else []
-
-
-def _section_to_argv(
-    p: argparse.ArgumentParser, cfg: configparser.ConfigParser, section: str
-) -> list[str]:
-    """Translate an INI section into argv tokens for this parser."""
-    if not cfg.has_section(section):
-        return []
-
-    lookup = _action_lookup(p)
-    out: list[str] = []
-
-    for k, v in cfg.items(section):
-        key = str(k).strip().lower().replace("-", "_")
-        # Avoid recursion / confusing self-configuration.
-        if key in {"config", "no_config"}:
-            continue
-
-        a = lookup.get(key)
-        if not a:
-            # Unknown keys are ignored (but we try to be helpful).
-            print(
-                f"warning: config [{section}] contains unknown option '{k}' (ignored)",
-                file=sys.stderr,
-            )
-            continue
-
-        flag = _choose_flag(a)
-        if not flag:
-            continue
-
-        # Boolean flags
-        if isinstance(a, argparse._StoreTrueAction):  # noqa: SLF001
-            b = _parse_bool(v)
-            if b is True:
-                out.append(flag)
-            continue
-        if isinstance(a, argparse._StoreFalseAction):  # noqa: SLF001
-            b = _parse_bool(v)
-            if b is False:
-                out.append(flag)
-            continue
-
-        # Repeated options
-        if isinstance(a, argparse._AppendAction):  # noqa: SLF001
-            for item in _split_list_value(v):
-                out.extend([flag, item])
-            continue
-
-        # Count flags (rare, but easy to support)
-        if isinstance(a, argparse._CountAction):  # noqa: SLF001
-            b = _parse_bool(v)
-            if b is True:
-                out.append(flag)
-            else:
-                try:
-                    n = int(str(v).strip())
-                except ValueError:
-                    n = 0
-                out.extend([flag] * max(0, n))
-            continue
-
-        # Standard scalar options
-        sval = str(v).strip()
-        if sval:
-            out.extend([flag, sval])
-
-    return out
-
-
-def _inject_config_argv(
-    argv: list[str],
-    *,
-    cfg_path: Optional[Path],
-    root_parser: argparse.ArgumentParser,
-    subparsers: dict[str, argparse.ArgumentParser],
-) -> list[str]:
-    """Return argv with config-derived tokens inserted.
-
-    We insert:
-      - [enroll] options before the subcommand
-      - [<subcommand>] options immediately after the subcommand token
-
-    CLI flags always win because they come later in argv.
-    """
-
-    if not cfg_path:
-        return argv
-    cfg_path = Path(cfg_path).expanduser()
-    if not (cfg_path.exists() and cfg_path.is_file()):
-        return argv
-
-    cfg = configparser.ConfigParser()
-    try:
-        cfg.read(cfg_path, encoding="utf-8")
-    except (OSError, configparser.Error) as e:
-        raise SystemExit(f"error: failed to read config file {cfg_path}: {e}")
-
-    global_tokens = _section_to_argv(root_parser, cfg, "enroll")
-
-    # Find the subcommand token position.
-    cmd_pos: Optional[int] = None
-    cmd_name: Optional[str] = None
-    for i, tok in enumerate(argv):
-        if tok in subparsers:
-            cmd_pos = i
-            cmd_name = tok
-            break
-    if cmd_pos is None or cmd_name is None:
-        # No subcommand found (argparse will handle the error); only apply global.
-        return global_tokens + argv
-
-    cmd_tokens = _section_to_argv(subparsers[cmd_name], cfg, cmd_name)
-    # Also accept section names with '_' in place of '-' (e.g. [single_shot])
-    if "-" in cmd_name:
-        alt = cmd_name.replace("-", "_")
-        if alt != cmd_name:
-            cmd_tokens += _section_to_argv(subparsers[cmd_name], cfg, alt)
-
-    return global_tokens + argv[: cmd_pos + 1] + cmd_tokens + argv[cmd_pos + 1 :]
 
 
 def _resolve_sops_out_file(out: Optional[str], *, hint: str) -> Path:
@@ -329,82 +90,29 @@ def _jt_mode(args: argparse.Namespace) -> str:
     return "auto"
 
 
-def _add_config_args(p: argparse.ArgumentParser) -> None:
-    p.add_argument(
-        "-c",
-        "--config",
-        help=(
-            "Path to an INI config file for default options. If omitted, enroll will look for "
-            "./enroll.ini, ./.enroll.ini, or ~/.config/enroll/enroll.ini (or $XDG_CONFIG_HOME/enroll/enroll.ini)."
-        ),
-    )
-    p.add_argument(
-        "--no-config",
-        action="store_true",
-        help="Do not load any INI config file (even if one would be auto-discovered).",
-    )
-
-
 def _add_remote_args(p: argparse.ArgumentParser) -> None:
     p.add_argument(
         "--remote-host",
         help="SSH host to run harvesting on (if set, harvest runs remotely and is pulled locally).",
     )
-    p.add_argument(
-        "--remote-ssh-config",
-        nargs="?",
-        const=str(Path.home() / ".ssh" / "config"),
-        default=None,
-        help=(
-            "Use OpenSSH-style ssh_config settings for --remote-host. "
-            "If provided without a value, defaults to ~/.ssh/config. "
-            "(Applies HostName/User/Port/IdentityFile/ProxyCommand/HostKeyAlias when supported.)"
-        ),
-    )
     p.add_argument(
         "--remote-port",
         type=int,
-        default=None,
+        default=22,
-        help=(
+        help="SSH port for --remote-host (default: 22).",
-            "SSH port for --remote-host. If omitted, defaults to 22, or a value from ssh_config when "
-            "--remote-ssh-config is set."
-        ),
     )
     p.add_argument(
         "--remote-user",
-        default=None,
+        default=os.environ.get("USER") or None,
-        help=(
+        help="SSH username for --remote-host (default: local $USER).",
-            "SSH username for --remote-host. If omitted, defaults to local $USER, or a value from ssh_config when "
-            "--remote-ssh-config is set."
-        ),
-    )
-
-    # Align terminology with Ansible: "become" == sudo.
-    p.add_argument(
-        "--ask-become-pass",
-        "-K",
-        action="store_true",
-        help=(
-            "Prompt for the remote sudo (become) password when using --remote-host "
-            "(similar to ansible --ask-become-pass)."
-        ),
     )
 
 
 def main() -> None:
     ap = argparse.ArgumentParser(prog="enroll")
-    ap.add_argument(
-        "-v",
-        "--version",
-        action="version",
-        version=f"{get_enroll_version()}",
-    )
-    _add_config_args(ap)
     sub = ap.add_subparsers(dest="cmd", required=True)
 
     h = sub.add_parser("harvest", help="Harvest service/package/config state")
-    _add_config_args(h)
-    _add_remote_args(h)
     h.add_argument(
         "--out",
         help=(
@@ -417,27 +125,6 @@ def main() -> None:
         action="store_true",
         help="Collect files more aggressively (may include secrets). Disables secret-avoidance checks.",
     )
-    h.add_argument(
-        "--include-path",
-        action="append",
-        default=[],
-        metavar="PATTERN",
-        help=(
-            "Include extra file paths to harvest (repeatable). Supports globs (including '**') and regex via 're:<regex>'. "
-            "Included files are still filtered by IgnorePolicy unless --dangerous is used."
-        ),
-    )
-    h.add_argument(
-        "--exclude-path",
-        action="append",
-        default=[],
-        metavar="PATTERN",
-        help=(
-            "Exclude file paths from harvesting (repeatable). Supports globs (including '**') and regex via 're:<regex>'. "
-            "Excludes apply to all harvesting, including defaults."
-        ),
-    )
-
     h.add_argument(
         "--sops",
         nargs="+",
@@ -452,9 +139,9 @@ def main() -> None:
         action="store_true",
         help="Don't use sudo on the remote host (when using --remote options). This may result in a limited harvest due to permission restrictions.",
     )
+    _add_remote_args(h)
 
     m = sub.add_parser("manifest", help="Render Ansible roles from a harvest")
-    _add_config_args(m)
     m.add_argument(
         "--harvest",
         required=True,
@@ -487,8 +174,6 @@ def main() -> None:
     s = sub.add_parser(
         "single-shot", help="Harvest state, then manifest Ansible code, in one shot"
     )
-    _add_config_args(s)
-    _add_remote_args(s)
     s.add_argument(
         "--harvest",
         help=(
@@ -501,34 +186,13 @@ def main() -> None:
         action="store_true",
         help="Collect files more aggressively (may include secrets). Disables secret-avoidance checks.",
     )
-    s.add_argument(
-        "--include-path",
-        action="append",
-        default=[],
-        metavar="PATTERN",
-        help=(
-            "Include extra file paths to harvest (repeatable). Supports globs (including '**') and regex via 're:<regex>'. "
-            "Included files are still filtered by IgnorePolicy unless --dangerous is used."
-        ),
-    )
-    s.add_argument(
-        "--exclude-path",
-        action="append",
-        default=[],
-        metavar="PATTERN",
-        help=(
-            "Exclude file paths from harvesting (repeatable). Supports globs (including '**') and regex via 're:<regex>'. "
-            "Excludes apply to all harvesting, including defaults."
-        ),
-    )
-
     s.add_argument(
         "--sops",
         nargs="+",
         metavar="GPG_FINGERPRINT",
         help=(
             "Encrypt the harvest as a SOPS-encrypted tarball, and bundle+encrypt the manifest output in --out "
-            "(same behaviour as `harvest --sops` and `manifest --sops`)."
+            "(same behavior as `harvest --sops` and `manifest --sops`)."
         ),
     )
     s.add_argument(
@@ -546,9 +210,9 @@ def main() -> None:
         ),
     )
     _add_common_manifest_args(s)
+    _add_remote_args(s)
 
     d = sub.add_parser("diff", help="Compare two harvests and report differences")
-    _add_config_args(d)
     d.add_argument(
         "--old",
         required=True,
@@ -574,33 +238,6 @@ def main() -> None:
         default="text",
         help="Report output format (default: text).",
     )
-    d.add_argument(
-        "--exclude-path",
-        action="append",
-        default=[],
-        metavar="PATTERN",
-        help=(
-            "Exclude file paths from the diff report (repeatable). Supports globs (including '**') and regex via 're:<regex>'. "
-            "This affects file drift reporting only (added/removed/changed files), not package/service/user diffs."
-        ),
-    )
-    d.add_argument(
-        "--ignore-package-versions",
-        action="store_true",
-        help=(
-            "Ignore package version changes in the diff report and exit status. "
-            "Package additions/removals are still reported. Useful when routine upgrades would otherwise create noisy drift."
-        ),
-    )
-    d.add_argument(
-        "--enforce",
-        action="store_true",
-        help=(
-            "If differences are detected, attempt to enforce the old harvest state locally by generating a manifest and "
-            "running ansible-playbook. Requires ansible-playbook on PATH. "
-            "Enroll does not attempt to downgrade packages; if the only drift is package version upgrades (or newly installed packages), enforcement is skipped."
-        ),
-    )
     d.add_argument(
         "--out",
         help="Write the report to this file instead of stdout.",
@@ -659,109 +296,16 @@ def main() -> None:
         help="Environment variable containing SMTP password (optional).",
     )
 
-    e = sub.add_parser("explain", help="Explain a harvest state.json")
+    args = ap.parse_args()
-    _add_config_args(e)
-    e.add_argument(
-        "harvest",
-        help=(
-            "Harvest input (directory, a path to state.json, a tarball, or a SOPS-encrypted bundle)."
-        ),
-    )
-    e.add_argument(
-        "--sops",
-        action="store_true",
-        help="Treat the input as a SOPS-encrypted bundle (auto-detected if the filename ends with .sops).",
-    )
-    e.add_argument(
-        "--format",
-        choices=["text", "json"],
-        default="text",
-        help="Output format.",
-    )
-    e.add_argument(
-        "--max-examples",
-        type=int,
-        default=3,
-        help="How many example paths/refs to show per reason.",
-    )
 
-    v = sub.add_parser(
+    remote_host: Optional[str] = getattr(args, "remote_host", None)
-        "validate", help="Validate a harvest bundle (state.json + artifacts)"
-    )
-    _add_config_args(v)
-    v.add_argument(
-        "harvest",
-        help=(
-            "Harvest input (directory, a path to state.json, a tarball, or a SOPS-encrypted bundle)."
-        ),
-    )
-    v.add_argument(
-        "--sops",
-        action="store_true",
-        help="Treat the input as a SOPS-encrypted bundle (auto-detected if the filename ends with .sops).",
-    )
-    v.add_argument(
-        "--schema",
-        help=(
-            "Optional JSON schema source (file path or https:// URL). "
-            "If omitted, uses the schema vendored in the enroll codebase."
-        ),
-    )
-    v.add_argument(
-        "--no-schema",
-        action="store_true",
-        help="Skip JSON schema validation and only perform bundle consistency checks.",
-    )
-    v.add_argument(
-        "--fail-on-warnings",
-        action="store_true",
-        help="Exit non-zero if validation produces warnings.",
-    )
-    v.add_argument(
-        "--format",
-        choices=["text", "json"],
-        default="text",
-        help="Output format.",
-    )
-    v.add_argument(
-        "--out",
-        help="Write the report to this file instead of stdout.",
-    )
-
-    argv = sys.argv[1:]
-    cfg_path = _discover_config_path(argv)
-    argv = _inject_config_argv(
-        argv,
-        cfg_path=cfg_path,
-        root_parser=ap,
-        subparsers={
-            "harvest": h,
-            "manifest": m,
-            "single-shot": s,
-            "diff": d,
-            "explain": e,
-            "validate": v,
-        },
-    )
-    args = ap.parse_args(argv)
-
-    # Preserve historical defaults for remote harvesting unless ssh_config lookup is enabled.
-    # This lets ssh_config values take effect when the user did not explicitly set
-    # --remote-user / --remote-port.
-    if hasattr(args, "remote_host"):
-        rsc = getattr(args, "remote_ssh_config", None)
-        if not rsc:
-            if getattr(args, "remote_port", None) is None:
-                setattr(args, "remote_port", 22)
-            if getattr(args, "remote_user", None) is None:
-                setattr(args, "remote_user", os.environ.get("USER") or None)
 
     try:
         if args.cmd == "harvest":
             sops_fps = getattr(args, "sops", None)
-            if args.remote_host:
+            if remote_host:
                 if sops_fps:
-                    out_file = _resolve_sops_out_file(args.out, hint=args.remote_host)
+                    out_file = _resolve_sops_out_file(args.out, hint=remote_host)
                     with tempfile.TemporaryDirectory(prefix="enroll-harvest-") as td:
                         tmp_bundle = Path(td) / "bundle"
                         tmp_bundle.mkdir(parents=True, exist_ok=True)
@@ -770,16 +314,12 @@ def main() -> None:
                         except OSError:
                             pass
                         remote_harvest(
-                            ask_become_pass=args.ask_become_pass,
                             local_out_dir=tmp_bundle,
-                            remote_host=args.remote_host,
+                            remote_host=remote_host,
-                            remote_port=args.remote_port,
+                            remote_port=int(args.remote_port),
                             remote_user=args.remote_user,
-                            remote_ssh_config=args.remote_ssh_config,
                             dangerous=bool(args.dangerous),
                             no_sudo=bool(args.no_sudo),
-                            include_paths=list(getattr(args, "include_path", []) or []),
-                            exclude_paths=list(getattr(args, "exclude_path", []) or []),
                         )
                         _encrypt_harvest_dir_to_sops(
                             tmp_bundle, out_file, list(sops_fps)
@@ -789,19 +329,15 @@ def main() -> None:
                     out_dir = (
                         Path(args.out)
                         if args.out
-                        else new_harvest_cache_dir(hint=args.remote_host).dir
+                        else new_harvest_cache_dir(hint=remote_host).dir
                     )
                     state = remote_harvest(
-                        ask_become_pass=args.ask_become_pass,
                         local_out_dir=out_dir,
-                        remote_host=args.remote_host,
+                        remote_host=remote_host,
-                        remote_port=args.remote_port,
+                        remote_port=int(args.remote_port),
                         remote_user=args.remote_user,
-                        remote_ssh_config=args.remote_ssh_config,
                         dangerous=bool(args.dangerous),
                         no_sudo=bool(args.no_sudo),
-                        include_paths=list(getattr(args, "include_path", []) or []),
-                        exclude_paths=list(getattr(args, "exclude_path", []) or []),
                     )
                     print(str(state))
             else:
@@ -814,68 +350,18 @@ def main() -> None:
                             os.chmod(tmp_bundle, 0o700)
                         except OSError:
                             pass
-                        harvest(
+                        harvest(str(tmp_bundle), dangerous=bool(args.dangerous))
-                            str(tmp_bundle),
-                            dangerous=bool(args.dangerous),
-                            include_paths=list(getattr(args, "include_path", []) or []),
-                            exclude_paths=list(getattr(args, "exclude_path", []) or []),
-                        )
                         _encrypt_harvest_dir_to_sops(
                             tmp_bundle, out_file, list(sops_fps)
                         )
                     print(str(out_file))
                 else:
-                    if args.out:
+                    if not args.out:
-                        out_dir = args.out
+                        raise SystemExit(
-                    else:
+                            "error: --out is required unless --remote-host is set"
-                        out_dir = (
-                            Path(args.out)
-                            if args.out
-                            else new_harvest_cache_dir(hint=args.remote_host).dir
                         )
-                    path = harvest(
+                    path = harvest(args.out, dangerous=bool(args.dangerous))
-                        out_dir,
-                        dangerous=bool(args.dangerous),
-                        include_paths=list(getattr(args, "include_path", []) or []),
-                        exclude_paths=list(getattr(args, "exclude_path", []) or []),
-                    )
                     print(path)
-        elif args.cmd == "explain":
-            out = explain_state(
-                args.harvest,
-                sops_mode=bool(getattr(args, "sops", False)),
-                fmt=str(getattr(args, "format", "text")),
-                max_examples=int(getattr(args, "max_examples", 3)),
-            )
-            sys.stdout.write(out)
-
-        elif args.cmd == "validate":
-            res = validate_harvest(
-                args.harvest,
-                sops_mode=bool(getattr(args, "sops", False)),
-                schema=getattr(args, "schema", None),
-                no_schema=bool(getattr(args, "no_schema", False)),
-            )
-
-            fmt = str(getattr(args, "format", "text"))
-            if fmt == "json":
-                txt = json.dumps(res.to_dict(), indent=2, sort_keys=True) + "\n"
-            else:
-                txt = res.to_text()
-
-            out_path = getattr(args, "out", None)
-            if out_path:
-                p = Path(out_path).expanduser()
-                p.parent.mkdir(parents=True, exist_ok=True)
-                p.write_text(txt, encoding="utf-8")
-            else:
-                sys.stdout.write(txt)
-
-            if res.errors:
-                raise SystemExit(1)
-            if res.warnings and bool(getattr(args, "fail_on_warnings", False)):
-                raise SystemExit(1)
-
         elif args.cmd == "manifest":
             out_enc = manifest(
                 args.harvest,
@@ -891,47 +377,8 @@ def main() -> None:
                 args.old,
                 args.new,
                 sops_mode=bool(getattr(args, "sops", False)),
-                exclude_paths=list(getattr(args, "exclude_path", []) or []),
-                ignore_package_versions=bool(
-                    getattr(args, "ignore_package_versions", False)
-                ),
             )
 
-            # Optional enforcement: if drift is detected, attempt to restore the
-            # system to the *old* (baseline) state using ansible-playbook.
-            if bool(getattr(args, "enforce", False)):
-                if has_changes:
-                    if not has_enforceable_drift(report):
-                        report["enforcement"] = {
-                            "requested": True,
-                            "status": "skipped",
-                            "reason": (
-                                "no enforceable drift detected (only additions and/or package version changes); "
-                                "enroll does not attempt to downgrade packages"
-                            ),
-                        }
-                    else:
-                        try:
-                            info = enforce_old_harvest(
-                                args.old,
-                                sops_mode=bool(getattr(args, "sops", False)),
-                                report=report,
-                            )
-                        except Exception as e:
-                            raise SystemExit(
-                                f"error: could not enforce old harvest state: {e}"
-                            ) from e
-                        report["enforcement"] = {
-                            "requested": True,
-                            **(info or {}),
-                        }
-                else:
-                    report["enforcement"] = {
-                        "requested": True,
-                        "status": "skipped",
-                        "reason": "no differences detected",
-                    }
-
             txt = format_report(report, fmt=str(getattr(args, "format", "text")))
             out_path = getattr(args, "out", None)
             if out_path:
@@ -982,11 +429,9 @@ def main() -> None:
                 raise SystemExit(2)
         elif args.cmd == "single-shot":
             sops_fps = getattr(args, "sops", None)
-            if args.remote_host:
+            if remote_host:
                 if sops_fps:
-                    out_file = _resolve_sops_out_file(
+                    out_file = _resolve_sops_out_file(args.harvest, hint=remote_host)
-                        args.harvest, hint=args.remote_host
-                    )
                     with tempfile.TemporaryDirectory(prefix="enroll-harvest-") as td:
                         tmp_bundle = Path(td) / "bundle"
                         tmp_bundle.mkdir(parents=True, exist_ok=True)
@@ -995,16 +440,12 @@ def main() -> None:
                         except OSError:
                             pass
                         remote_harvest(
-                            ask_become_pass=args.ask_become_pass,
                             local_out_dir=tmp_bundle,
-                            remote_host=args.remote_host,
+                            remote_host=remote_host,
-                            remote_port=args.remote_port,
+                            remote_port=int(args.remote_port),
                             remote_user=args.remote_user,
-                            remote_ssh_config=args.remote_ssh_config,
                             dangerous=bool(args.dangerous),
                             no_sudo=bool(args.no_sudo),
-                            include_paths=list(getattr(args, "include_path", []) or []),
-                            exclude_paths=list(getattr(args, "exclude_path", []) or []),
                         )
                         _encrypt_harvest_dir_to_sops(
                             tmp_bundle, out_file, list(sops_fps)
@@ -1023,19 +464,15 @@ def main() -> None:
                     harvest_dir = (
                         Path(args.harvest)
                         if args.harvest
-                        else new_harvest_cache_dir(hint=args.remote_host).dir
+                        else new_harvest_cache_dir(hint=remote_host).dir
                     )
                     remote_harvest(
-                        ask_become_pass=args.ask_become_pass,
                         local_out_dir=harvest_dir,
-                        remote_host=args.remote_host,
+                        remote_host=remote_host,
-                        remote_port=args.remote_port,
+                        remote_port=int(args.remote_port),
                         remote_user=args.remote_user,
-                        remote_ssh_config=args.remote_ssh_config,
                         dangerous=bool(args.dangerous),
                         no_sudo=bool(args.no_sudo),
-                        include_paths=list(getattr(args, "include_path", []) or []),
-                        exclude_paths=list(getattr(args, "exclude_path", []) or []),
                     )
                     manifest(
                         str(harvest_dir),
@@ -1056,12 +493,7 @@ def main() -> None:
                             os.chmod(tmp_bundle, 0o700)
                         except OSError:
                             pass
-                        harvest(
+                        harvest(str(tmp_bundle), dangerous=bool(args.dangerous))
-                            str(tmp_bundle),
-                            dangerous=bool(args.dangerous),
-                            include_paths=list(getattr(args, "include_path", []) or []),
-                            exclude_paths=list(getattr(args, "exclude_path", []) or []),
-                        )
                         _encrypt_harvest_dir_to_sops(
                             tmp_bundle, out_file, list(sops_fps)
                         )
@@ -1080,23 +512,62 @@ def main() -> None:
                         raise SystemExit(
                             "error: --harvest is required unless --remote-host is set"
                         )
-                    harvest(
+                    harvest(args.harvest, dangerous=bool(args.dangerous))
-                        args.harvest,
-                        dangerous=bool(args.dangerous),
-                        include_paths=list(getattr(args, "include_path", []) or []),
-                        exclude_paths=list(getattr(args, "exclude_path", []) or []),
-                    )
                     manifest(
                         args.harvest,
                         args.out,
                         fqdn=args.fqdn,
                         jinjaturtle=_jt_mode(args),
                     )
-    except RemoteSudoPasswordRequired:
+        elif args.cmd == "diff":
-        raise SystemExit(
+            report, has_changes = compare_harvests(
-            "error: remote sudo requires a password. Re-run with --ask-become-pass."
+                args.old, args.new, sops_mode=bool(getattr(args, "sops", False))
-        ) from None
+            )
-    except RuntimeError as e:
+
-        raise SystemExit(f"error: {e}") from None
+            rendered = format_report(report, fmt=str(args.format))
+            if args.out:
+                Path(args.out).expanduser().write_text(rendered, encoding="utf-8")
+            else:
+                print(rendered, end="")
+
+            do_notify = bool(has_changes or getattr(args, "notify_always", False))
+
+            if do_notify and getattr(args, "webhook", None):
+                wf = str(getattr(args, "webhook_format", "json"))
+                body = format_report(report, fmt=wf).encode("utf-8")
+                headers = {"User-Agent": "enroll"}
+                if wf == "json":
+                    headers["Content-Type"] = "application/json"
+                else:
+                    headers["Content-Type"] = "text/plain; charset=utf-8"
+                for hv in getattr(args, "webhook_header", []) or []:
+                    if ":" not in hv:
+                        raise SystemExit(
+                            "error: --webhook-header must be in the form 'K:V'"
+                        )
+                    k, v = hv.split(":", 1)
+                    headers[k.strip()] = v.strip()
+                status, _ = post_webhook(str(args.webhook), body, headers=headers)
+                if status and status >= 400:
+                    raise SystemExit(f"error: webhook returned HTTP {status}")
+
+            if do_notify and (getattr(args, "email_to", []) or []):
+                subject = getattr(args, "email_subject", None) or "enroll diff report"
+                smtp_password = None
+                pw_env = getattr(args, "smtp_password_env", None)
+                if pw_env:
+                    smtp_password = os.environ.get(str(pw_env))
+                send_email(
+                    to_addrs=list(getattr(args, "email_to", []) or []),
+                    subject=str(subject),
+                    body=rendered,
+                    from_addr=getattr(args, "email_from", None),
+                    smtp=getattr(args, "smtp", None),
+                    smtp_user=getattr(args, "smtp_user", None),
+                    smtp_password=smtp_password,
+                )
+
+            if getattr(args, "exit_code", False) and has_changes:
+                raise SystemExit(2)
     except SopsError as e:
-        raise SystemExit(f"error: {e}") from None
+        raise SystemExit(f"error: {e}")

enroll/debian.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import glob
+import hashlib
 import os
 import subprocess  # nosec
 from typing import Dict, List, Optional, Set, Tuple
@@ -63,50 +64,6 @@ def list_manual_packages() -> List[str]:
     return sorted(set(pkgs))
 
 
-def list_installed_packages() -> Dict[str, List[Dict[str, str]]]:
-    """Return mapping of installed package name -> installed instances.
-
-    Uses dpkg-query and is expected to work on Debian/Ubuntu-like systems.
-
-    Output format:
-      {"pkg": [{"version": "...", "arch": "..."}, ...], ...}
-    """
-
-    try:
-        p = subprocess.run(
-            [
-                "dpkg-query",
-                "-W",
-                "-f=${Package}\t${Version}\t${Architecture}\n",
-            ],
-            text=True,
-            capture_output=True,
-            check=False,
-        )  # nosec
-    except Exception:
-        return {}
-
-    out: Dict[str, List[Dict[str, str]]] = {}
-    for raw in (p.stdout or "").splitlines():
-        line = raw.strip("\n")
-        if not line:
-            continue
-        parts = line.split("\t")
-        if len(parts) < 3:
-            continue
-        name, ver, arch = parts[0].strip(), parts[1].strip(), parts[2].strip()
-        if not name:
-            continue
-        out.setdefault(name, []).append({"version": ver, "arch": arch})
-
-    # Stable ordering for deterministic JSON dumps.
-    for k in list(out.keys()):
-        out[k] = sorted(
-            out[k], key=lambda x: (x.get("arch") or "", x.get("version") or "")
-        )
-    return out
-
-
 def build_dpkg_etc_index(
     info_dir: str = "/var/lib/dpkg/info",
 ) -> Tuple[Set[str], Dict[str, str], Dict[str, Set[str]], Dict[str, List[str]]]:
@@ -197,9 +154,7 @@ def parse_status_conffiles(
                 if ":" in line:
                     k, v = line.split(":", 1)
                     key = k
-                    # Preserve leading spaces in continuation lines, but strip
+                    cur[key] = v.lstrip()
-                    # the trailing newline from the initial key line value.
-                    cur[key] = v.lstrip().rstrip("\n")
 
     if cur:
         flush()
@@ -223,3 +178,28 @@ def read_pkg_md5sums(pkg: str) -> Dict[str, str]:
             md5, rel = line.split(None, 1)
             m[rel.strip()] = md5.strip()
     return m
+
+
+def file_md5(path: str) -> str:
+    h = hashlib.md5()  # nosec
+    with open(path, "rb") as f:
+        for chunk in iter(lambda: f.read(1024 * 1024), b""):
+            h.update(chunk)
+    return h.hexdigest()
+
+
+def stat_triplet(path: str) -> Tuple[str, str, str]:
+    st = os.stat(path, follow_symlinks=True)
+    mode = oct(st.st_mode & 0o777)[2:].zfill(4)
+
+    import pwd, grp
+
+    try:
+        owner = pwd.getpwuid(st.st_uid).pw_name
+    except KeyError:
+        owner = str(st.st_uid)
+    try:
+        group = grp.getgrgid(st.st_gid).gr_name
+    except KeyError:
+        group = str(st.st_gid)
+    return owner, group, mode

enroll/diff.py

@@ -3,15 +3,10 @@ from __future__ import annotations
 import hashlib
 import json
 import os
-import re
 import shutil
 import subprocess  # nosec
 import tarfile
 import tempfile
-import sys
-import threading
-import time
-import itertools
 import urllib.request
 from contextlib import ExitStack
 from dataclasses import dataclass
@@ -21,73 +16,9 @@ from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 from .remote import _safe_extract_tar
-from .pathfilter import PathFilter
 from .sopsutil import decrypt_file_binary_to, require_sops_cmd
 
 
-def _progress_enabled() -> bool:
-    """Return True if we should display interactive progress UI on the CLI.
-
-    We only emit progress when stderr is a TTY, so it won't pollute JSON/text reports
-    captured by systemd, CI, webhooks, etc. Users can also disable this explicitly via
-    ENROLL_NO_PROGRESS=1.
-    """
-    if os.environ.get("ENROLL_NO_PROGRESS", "").strip() in {"1", "true", "yes"}:
-        return False
-    try:
-        return sys.stderr.isatty()
-    except Exception:
-        return False
-
-
-class _Spinner:
-    """A tiny terminal spinner with an elapsed-time counter (stderr-only)."""
-
-    def __init__(self, message: str, *, interval: float = 0.12) -> None:
-        self.message = message.rstrip()
-        self.interval = interval
-        self._stop = threading.Event()
-        self._thread: Optional[threading.Thread] = None
-        self._last_len = 0
-        self._start = 0.0
-
-    def start(self) -> None:
-        if self._thread is not None:
-            return
-        self._start = time.monotonic()
-        self._thread = threading.Thread(
-            target=self._run, name="enroll-spinner", daemon=True
-        )
-        self._thread.start()
-
-    def stop(self, final_line: Optional[str] = None) -> None:
-        self._stop.set()
-        if self._thread is not None:
-            self._thread.join(timeout=1.0)
-
-        # Clear spinner line.
-        try:
-            sys.stderr.write("\r" + (" " * max(self._last_len, 0)) + "\r")
-            if final_line:
-                sys.stderr.write(final_line.rstrip() + "\n")
-            sys.stderr.flush()
-        except Exception:
-            pass  # nosec
-
-    def _run(self) -> None:
-        frames = itertools.cycle("|/-\\")
-        while not self._stop.is_set():
-            elapsed = time.monotonic() - self._start
-            line = f"{self.message} {next(frames)} {elapsed:0.1f}s"
-            try:
-                sys.stderr.write("\r" + line)
-                sys.stderr.flush()
-                self._last_len = max(self._last_len, len(line))
-            except Exception:
-                return
-            self._stop.wait(self.interval)
-
-
 def _utc_now_iso() -> str:
     return datetime.now(tz=timezone.utc).isoformat()
 
@@ -195,62 +126,18 @@ def _load_state(bundle_dir: Path) -> Dict[str, Any]:
         return json.load(f)
 
 
-def _packages_inventory(state: Dict[str, Any]) -> Dict[str, Any]:
-    return (state.get("inventory") or {}).get("packages") or {}
-
-
 def _all_packages(state: Dict[str, Any]) -> List[str]:
-    return sorted(_packages_inventory(state).keys())
+    pkgs = set(state.get("manual_packages", []) or [])
-
+    pkgs |= set(state.get("manual_packages_skipped", []) or [])
-
+    for s in state.get("services", []) or []:
-def _roles(state: Dict[str, Any]) -> Dict[str, Any]:
+        for p in s.get("packages", []) or []:
-    return state.get("roles") or {}
+            pkgs.add(p)
-
+    return sorted(pkgs)
-
-def _pkg_version_key(entry: Dict[str, Any]) -> Optional[str]:
-    """Return a stable string used for version comparison."""
-    installs = entry.get("installations") or []
-    if isinstance(installs, list) and installs:
-        parts: List[str] = []
-        for inst in installs:
-            if not isinstance(inst, dict):
-                continue
-            arch = str(inst.get("arch") or "")
-            ver = str(inst.get("version") or "")
-            if not ver:
-                continue
-            parts.append(f"{arch}:{ver}" if arch else ver)
-        if parts:
-            return "|".join(sorted(parts))
-    v = entry.get("version")
-    if v:
-        return str(v)
-    return None
-
-
-def _pkg_version_display(entry: Dict[str, Any]) -> Optional[str]:
-    v = entry.get("version")
-    if v:
-        return str(v)
-    installs = entry.get("installations") or []
-    if isinstance(installs, list) and installs:
-        parts: List[str] = []
-        for inst in installs:
-            if not isinstance(inst, dict):
-                continue
-            arch = str(inst.get("arch") or "")
-            ver = str(inst.get("version") or "")
-            if not ver:
-                continue
-            parts.append(f"{ver} ({arch})" if arch else ver)
-        if parts:
-            return ", ".join(sorted(parts))
-    return None
 
 
 def _service_units(state: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
     out: Dict[str, Dict[str, Any]] = {}
-    for s in _roles(state).get("services") or []:
+    for s in state.get("services", []) or []:
         unit = s.get("unit")
         if unit:
             out[str(unit)] = s
@@ -258,7 +145,7 @@ def _service_units(state: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
 
 
 def _users_by_name(state: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
-    users = (_roles(state).get("users") or {}).get("users") or []
+    users = (state.get("users") or {}).get("users") or []
     out: Dict[str, Dict[str, Any]] = {}
     for u in users:
         name = u.get("name")
@@ -280,47 +167,35 @@ class FileRec:
 
 def _iter_managed_files(state: Dict[str, Any]) -> Iterable[Tuple[str, Dict[str, Any]]]:
     # Services
-    for s in _roles(state).get("services") or []:
+    for s in state.get("services", []) or []:
         role = s.get("role_name") or "unknown"
         for mf in s.get("managed_files", []) or []:
             yield str(role), mf
 
     # Package roles
-    for p in _roles(state).get("packages") or []:
+    for p in state.get("package_roles", []) or []:
         role = p.get("role_name") or "unknown"
         for mf in p.get("managed_files", []) or []:
             yield str(role), mf
 
     # Users
-    u = _roles(state).get("users") or {}
+    u = state.get("users") or {}
     u_role = u.get("role_name") or "users"
     for mf in u.get("managed_files", []) or []:
         yield str(u_role), mf
 
-    # apt_config
-    ac = _roles(state).get("apt_config") or {}
-    ac_role = ac.get("role_name") or "apt_config"
-    for mf in ac.get("managed_files", []) or []:
-        yield str(ac_role), mf
-
     # etc_custom
-    ec = _roles(state).get("etc_custom") or {}
+    ec = state.get("etc_custom") or {}
     ec_role = ec.get("role_name") or "etc_custom"
     for mf in ec.get("managed_files", []) or []:
         yield str(ec_role), mf
 
     # usr_local_custom
-    ul = _roles(state).get("usr_local_custom") or {}
+    ul = state.get("usr_local_custom") or {}
     ul_role = ul.get("role_name") or "usr_local_custom"
     for mf in ul.get("managed_files", []) or []:
         yield str(ul_role), mf
 
-    # extra_paths
-    xp = _roles(state).get("extra_paths") or {}
-    xp_role = xp.get("role_name") or "extra_paths"
-    for mf in xp.get("managed_files", []) or []:
-        yield str(xp_role), mf
-
 
 def _file_index(bundle_dir: Path, state: Dict[str, Any]) -> Dict[str, FileRec]:
     """Return mapping of absolute path -> FileRec.
@@ -358,8 +233,6 @@ def compare_harvests(
     new_path: str,
     *,
     sops_mode: bool = False,
-    exclude_paths: Optional[List[str]] = None,
-    ignore_package_versions: bool = False,
 ) -> Tuple[Dict[str, Any], bool]:
     """Compare two harvests.
 
@@ -376,32 +249,12 @@ def compare_harvests(
         old_state = _load_state(old_b.dir)
         new_state = _load_state(new_b.dir)
 
-        old_inv = _packages_inventory(old_state)
+        old_pkgs = set(_all_packages(old_state))
-        new_inv = _packages_inventory(new_state)
+        new_pkgs = set(_all_packages(new_state))
-
-        old_pkgs = set(old_inv.keys())
-        new_pkgs = set(new_inv.keys())
 
         pkgs_added = sorted(new_pkgs - old_pkgs)
         pkgs_removed = sorted(old_pkgs - new_pkgs)
 
-        pkgs_version_changed: List[Dict[str, Any]] = []
-        pkgs_version_changed_ignored_count = 0
-        for pkg in sorted(old_pkgs & new_pkgs):
-            a = old_inv.get(pkg) or {}
-            b = new_inv.get(pkg) or {}
-            if _pkg_version_key(a) != _pkg_version_key(b):
-                if ignore_package_versions:
-                    pkgs_version_changed_ignored_count += 1
-                else:
-                    pkgs_version_changed.append(
-                        {
-                            "package": pkg,
-                            "old": _pkg_version_display(a),
-                            "new": _pkg_version_display(b),
-                        }
-                    )
-
         old_units = _service_units(old_state)
         new_units = _service_units(new_state)
         units_added = sorted(set(new_units) - set(old_units))
@@ -462,17 +315,6 @@ def compare_harvests(
 
         old_files = _file_index(old_b.dir, old_state)
         new_files = _file_index(new_b.dir, new_state)
-
-        # Optional user-supplied path exclusions (same semantics as harvest --exclude-path),
-        # applied only to file drift reporting.
-        diff_filter = PathFilter(include=(), exclude=exclude_paths or ())
-        if exclude_paths:
-            old_files = {
-                p: r for p, r in old_files.items() if not diff_filter.is_excluded(p)
-            }
-            new_files = {
-                p: r for p, r in new_files.items() if not diff_filter.is_excluded(p)
-            }
         old_paths_set = set(old_files)
         new_paths_set = set(new_files)
 
@@ -526,7 +368,6 @@ def compare_harvests(
             [
                 pkgs_added,
                 pkgs_removed,
-                pkgs_version_changed,
                 units_added,
                 units_removed,
                 units_changed,
@@ -548,10 +389,6 @@ def compare_harvests(
 
         report: Dict[str, Any] = {
             "generated_at": _utc_now_iso(),
-            "filters": {
-                "exclude_paths": list(exclude_paths or []),
-                "ignore_package_versions": bool(ignore_package_versions),
-            },
             "old": {
                 "input": old_path,
                 "bundle_dir": str(old_b.dir),
@@ -564,14 +401,7 @@ def compare_harvests(
                 "state_mtime": _mtime_iso(new_b.state_path),
                 "host": (new_state.get("host") or {}).get("hostname"),
             },
-            "packages": {
+            "packages": {"added": pkgs_added, "removed": pkgs_removed},
-                "added": pkgs_added,
-                "removed": pkgs_removed,
-                "version_changed": pkgs_version_changed,
-                "version_changed_ignored_count": int(
-                    pkgs_version_changed_ignored_count
-                ),
-            },
             "services": {
                 "enabled_added": units_added,
                 "enabled_removed": units_removed,
@@ -606,302 +436,6 @@ def compare_harvests(
         return report, has_changes
 
 
-def has_enforceable_drift(report: Dict[str, Any]) -> bool:
-    """Return True if the diff report contains drift that is safe/meaningful to enforce.
-
-    Enforce mode is intended to restore *state* (files/users/services) and to
-    reinstall packages that were removed.
-
-    It is deliberately conservative about package drift:
-      - Package *version* changes alone are not enforced (no downgrades).
-      - Newly installed packages are not removed.
-
-    This helper lets the CLI decide whether `--enforce` should actually run.
-    """
-
-    pk = report.get("packages", {}) or {}
-    if pk.get("removed"):
-        return True
-
-    sv = report.get("services", {}) or {}
-    # We do not try to disable newly-enabled services; we only restore units
-    # that were enabled in the baseline but are now missing.
-    if sv.get("enabled_removed") or []:
-        return True
-
-    for ch in sv.get("changed", []) or []:
-        changes = ch.get("changes") or {}
-        # Ignore package set drift for enforceability decisions; package
-        # enforcement is handled via reinstalling removed packages, and we
-        # avoid trying to "undo" upgrades/renames.
-        for k in changes.keys():
-            if k != "packages":
-                return True
-
-    us = report.get("users", {}) or {}
-    # We restore baseline users (missing/changed). We do not remove newly-added users.
-    if (us.get("removed") or []) or (us.get("changed") or []):
-        return True
-
-    fl = report.get("files", {}) or {}
-    # We restore baseline files (missing/changed). We do not delete newly-managed files.
-    if (fl.get("removed") or []) or (fl.get("changed") or []):
-        return True
-
-    return False
-
-
-def _role_tag(role: str) -> str:
-    """Return the Ansible tag name for a role (must match manifest generation)."""
-    r = str(role or "").strip()
-    safe = re.sub(r"[^A-Za-z0-9_-]+", "_", r).strip("_")
-    if not safe:
-        safe = "other"
-    return f"role_{safe}"
-
-
-def _enforcement_plan(
-    report: Dict[str, Any],
-    old_state: Dict[str, Any],
-    old_bundle_dir: Path,
-) -> Dict[str, Any]:
-    """Return a best-effort enforcement plan (roles/tags) for this diff report.
-
-    We only plan for drift that the baseline manifest can safely restore:
-      - packages that were removed (reinstall, no downgrades)
-      - baseline users that were removed/changed
-      - baseline files that were removed/changed
-      - baseline systemd units that were disabled/changed
-
-    We do NOT plan to remove newly-added packages/users/files/services.
-    """
-    roles: set[str] = set()
-
-    # --- Packages (only removals)
-    pk = report.get("packages", {}) or {}
-    removed_pkgs = set(pk.get("removed") or [])
-    if removed_pkgs:
-        pkg_to_roles: Dict[str, set[str]] = {}
-
-        for svc in _roles(old_state).get("services") or []:
-            r = str(svc.get("role_name") or "").strip()
-            for p in svc.get("packages", []) or []:
-                if p:
-                    pkg_to_roles.setdefault(str(p), set()).add(r)
-
-        for pr in _roles(old_state).get("packages") or []:
-            r = str(pr.get("role_name") or "").strip()
-            p = pr.get("package")
-            if p:
-                pkg_to_roles.setdefault(str(p), set()).add(r)
-
-        for p in removed_pkgs:
-            for r in pkg_to_roles.get(str(p), set()):
-                if r:
-                    roles.add(r)
-
-    # --- Users (removed/changed)
-    us = report.get("users", {}) or {}
-    if (us.get("removed") or []) or (us.get("changed") or []):
-        u = _roles(old_state).get("users") or {}
-        u_role = str(u.get("role_name") or "users")
-        if u_role:
-            roles.add(u_role)
-
-    # --- Files (removed/changed)
-    fl = report.get("files", {}) or {}
-    file_paths: List[str] = []
-    for e in fl.get("removed", []) or []:
-        if isinstance(e, dict):
-            p = e.get("path")
-        else:
-            p = e
-        if p:
-            file_paths.append(str(p))
-    for e in fl.get("changed", []) or []:
-        if isinstance(e, dict):
-            p = e.get("path")
-        else:
-            p = e
-        if p:
-            file_paths.append(str(p))
-
-    if file_paths:
-        idx = _file_index(old_bundle_dir, old_state)
-        for p in file_paths:
-            rec = idx.get(p)
-            if rec and rec.role:
-                roles.add(str(rec.role))
-
-    # --- Services (enabled_removed + meaningful changes)
-    sv = report.get("services", {}) or {}
-    units: List[str] = []
-    for u in sv.get("enabled_removed", []) or []:
-        if u:
-            units.append(str(u))
-    for ch in sv.get("changed", []) or []:
-        if not isinstance(ch, dict):
-            continue
-        unit = ch.get("unit")
-        changes = ch.get("changes") or {}
-        if unit and any(k != "packages" for k in changes.keys()):
-            units.append(str(unit))
-
-    if units:
-        old_units = _service_units(old_state)
-        for u in units:
-            snap = old_units.get(u)
-            if snap and snap.get("role_name"):
-                roles.add(str(snap.get("role_name")))
-
-    # Drop empty/unknown roles.
-    roles = {r for r in roles if r and str(r).strip() and str(r).strip() != "unknown"}
-
-    tags = sorted({_role_tag(r) for r in roles})
-    return {
-        "roles": sorted(roles),
-        "tags": tags,
-    }
-
-
-def enforce_old_harvest(
-    old_path: str,
-    *,
-    sops_mode: bool = False,
-    report: Optional[Dict[str, Any]] = None,
-) -> Dict[str, Any]:
-    """Enforce the *old* (baseline) harvest state on the current machine.
-
-    When Ansible is available, this:
-      1) renders a temporary manifest from the old harvest, and
-      2) runs ansible-playbook locally to apply it.
-
-    Returns a dict suitable for attaching to the diff report under
-    report['enforcement'].
-    """
-
-    ansible_playbook = shutil.which("ansible-playbook")
-    if not ansible_playbook:
-        raise RuntimeError(
-            "ansible-playbook not found on PATH (cannot enforce; install Ansible)"
-        )
-
-    # Import lazily to avoid heavy import cost and potential CLI cycles.
-    from .manifest import manifest
-
-    started_at = _utc_now_iso()
-
-    with ExitStack() as stack:
-        old_b = _bundle_from_input(old_path, sops_mode=sops_mode)
-        if old_b.tempdir:
-            stack.callback(old_b.tempdir.cleanup)
-
-        old_state = _load_state(old_b.dir)
-
-        plan: Optional[Dict[str, Any]] = None
-        tags: Optional[List[str]] = None
-        roles: List[str] = []
-        if report is not None:
-            plan = _enforcement_plan(report, old_state, old_b.dir)
-            roles = list(plan.get("roles") or [])
-            t = list(plan.get("tags") or [])
-            tags = t if t else None
-
-        with tempfile.TemporaryDirectory(prefix="enroll-enforce-") as td:
-            td_path = Path(td)
-            try:
-                os.chmod(td_path, 0o700)
-            except OSError:
-                pass
-
-            # 1) Generate a manifest in a temp directory.
-            manifest(str(old_b.dir), str(td_path))
-
-            playbook = td_path / "playbook.yml"
-            if not playbook.exists():
-                raise RuntimeError(
-                    f"manifest did not produce expected playbook.yml at {playbook}"
-                )
-
-            # 2) Apply it locally.
-            env = dict(os.environ)
-            cfg = td_path / "ansible.cfg"
-            if cfg.exists():
-                env["ANSIBLE_CONFIG"] = str(cfg)
-
-            cmd = [
-                ansible_playbook,
-                "-i",
-                "localhost,",
-                "-c",
-                "local",
-                str(playbook),
-            ]
-            if tags:
-                cmd.extend(["--tags", ",".join(tags)])
-
-            spinner: Optional[_Spinner] = None
-            p: Optional[subprocess.CompletedProcess[str]] = None
-            t0 = time.monotonic()
-            if _progress_enabled():
-                if tags:
-                    sys.stderr.write(
-                        f"Enforce: running ansible-playbook (tags: {','.join(tags)})\n",
-                    )
-                else:
-                    sys.stderr.write("Enforce: running ansible-playbook\n")
-                sys.stderr.flush()
-                spinner = _Spinner("  ansible-playbook")
-                spinner.start()
-
-            try:
-                p = subprocess.run(
-                    cmd,
-                    cwd=str(td_path),
-                    env=env,
-                    capture_output=True,
-                    text=True,
-                    check=False,
-                )  # nosec
-            finally:
-                if spinner:
-                    elapsed = time.monotonic() - t0
-                    rc = p.returncode if p is not None else None
-                    spinner.stop(
-                        final_line=(
-                            f"Enforce: ansible-playbook finished in {elapsed:0.1f}s"
-                            + (f" (rc={rc})" if rc is not None else ""),
-                        ),
-                    )
-
-            finished_at = _utc_now_iso()
-
-            info: Dict[str, Any] = {
-                "status": "applied" if p.returncode == 0 else "failed",
-                "started_at": started_at,
-                "finished_at": finished_at,
-                "ansible_playbook": ansible_playbook,
-                "command": cmd,
-                "returncode": int(p.returncode),
-            }
-
-            # Record tag selection (if we could attribute drift to specific roles).
-            info["roles"] = roles
-            info["tags"] = list(tags or [])
-            if not tags:
-                info["scope"] = "full_playbook"
-
-            if p.returncode != 0:
-                err = (p.stderr or p.stdout or "").strip()
-                raise RuntimeError(
-                    "ansible-playbook failed"
-                    + (f" (rc={p.returncode})" if p.returncode is not None else "")
-                    + (f": {err}" if err else "")
-                )
-
-            return info
-
-
 def format_report(report: Dict[str, Any], *, fmt: str = "text") -> str:
     fmt = (fmt or "text").lower()
     if fmt == "json":
@@ -921,66 +455,14 @@ def _report_text(report: Dict[str, Any]) -> str:
         f"new: {new.get('input')} (host={new.get('host')}, state_mtime={new.get('state_mtime')})"
     )
 
-    filt = report.get("filters", {}) or {}
-    ex_paths = filt.get("exclude_paths", []) or []
-    if ex_paths:
-        lines.append(f"file exclude patterns: {', '.join(str(p) for p in ex_paths)}")
-
-    if filt.get("ignore_package_versions"):
-        ignored = int(
-            (report.get("packages", {}) or {}).get("version_changed_ignored_count") or 0
-        )
-        msg = "package version drift: ignored (--ignore-package-versions)"
-        if ignored:
-            msg += f" (ignored {ignored} change{'s' if ignored != 1 else ''})"
-        lines.append(msg)
-
-    enf = report.get("enforcement") or {}
-    if enf:
-        lines.append("\nEnforcement")
-        status = str(enf.get("status") or "").strip().lower()
-        if status == "applied":
-            extra = ""
-            tags = enf.get("tags") or []
-            scope = enf.get("scope")
-            if tags:
-                extra = f" (tags={','.join(str(t) for t in tags)})"
-            elif scope:
-                extra = f" ({scope})"
-            lines.append(
-                f"  applied old harvest via ansible-playbook (rc={enf.get('returncode')})"
-                + extra
-                + (
-                    f" (finished {enf.get('finished_at')})"
-                    if enf.get("finished_at")
-                    else ""
-                )
-            )
-        elif status == "failed":
-            lines.append(
-                f"  attempted enforcement but ansible-playbook failed (rc={enf.get('returncode')})"
-            )
-        elif status == "skipped":
-            r = enf.get("reason")
-            lines.append("  skipped" + (f": {r}" if r else ""))
-        else:
-            # Best-effort formatting for future fields.
-            lines.append("  " + json.dumps(enf, sort_keys=True))
-
     pk = report.get("packages", {})
     lines.append("\nPackages")
     lines.append(f"  added:   {len(pk.get('added', []) or [])}")
     lines.append(f"  removed: {len(pk.get('removed', []) or [])}")
-    ignored_v = int(pk.get("version_changed_ignored_count") or 0)
-    vc = len(pk.get("version_changed", []) or [])
-    suffix = f" (ignored {ignored_v})" if ignored_v else ""
-    lines.append(f"  version_changed: {vc}{suffix}")
     for p in pk.get("added", []) or []:
         lines.append(f"    + {p}")
     for p in pk.get("removed", []) or []:
         lines.append(f"    - {p}")
-    for ch in pk.get("version_changed", []) or []:
-        lines.append(f"    ~ {ch.get('package')}: {ch.get('old')} -> {ch.get('new')}")
 
     sv = report.get("services", {})
     lines.append("\nServices (enabled systemd units)")
@@ -1048,7 +530,6 @@ def _report_text(report: Dict[str, Any]) -> str:
         [
             (pk.get("added") or []),
             (pk.get("removed") or []),
-            (pk.get("version_changed") or []),
             (sv.get("enabled_added") or []),
             (sv.get("enabled_removed") or []),
             (sv.get("changed") or []),
@@ -1076,67 +557,6 @@ def _report_markdown(report: Dict[str, Any]) -> str:
         f"- **New**: `{new.get('input')}` (host={new.get('host')}, state_mtime={new.get('state_mtime')})\n"
     )
 
-    filt = report.get("filters", {}) or {}
-    ex_paths = filt.get("exclude_paths", []) or []
-    if ex_paths:
-        out.append(
-            "- **File exclude patterns**: "
-            + ", ".join(f"`{p}`" for p in ex_paths)
-            + "\n"
-        )
-
-    if filt.get("ignore_package_versions"):
-        ignored = int(
-            (report.get("packages", {}) or {}).get("version_changed_ignored_count") or 0
-        )
-        msg = "- **Package version drift**: ignored (`--ignore-package-versions`)"
-        if ignored:
-            msg += f" (ignored {ignored} change{'s' if ignored != 1 else ''})"
-        out.append(msg + "\n")
-
-    enf = report.get("enforcement") or {}
-    if enf:
-        out.append("\n## Enforcement\n")
-        status = str(enf.get("status") or "").strip().lower()
-        if status == "applied":
-            extra = ""
-            tags = enf.get("tags") or []
-            scope = enf.get("scope")
-            if tags:
-                extra = " (tags=" + ",".join(str(t) for t in tags) + ")"
-            elif scope:
-                extra = f" ({scope})"
-            out.append(
-                "- ✅ Applied old harvest via ansible-playbook"
-                + extra
-                + (
-                    f" (rc={enf.get('returncode')})"
-                    if enf.get("returncode") is not None
-                    else ""
-                )
-                + (
-                    f" (finished `{enf.get('finished_at')}`)"
-                    if enf.get("finished_at")
-                    else ""
-                )
-                + "\n"
-            )
-        elif status == "failed":
-            out.append(
-                "- ⚠️ Attempted enforcement but ansible-playbook failed"
-                + (
-                    f" (rc={enf.get('returncode')})"
-                    if enf.get("returncode") is not None
-                    else ""
-                )
-                + "\n"
-            )
-        elif status == "skipped":
-            r = enf.get("reason")
-            out.append("- Skipped" + (f": {r}" if r else "") + "\n")
-        else:
-            out.append(f"- {json.dumps(enf, sort_keys=True)}\n")
-
     pk = report.get("packages", {})
     out.append("## Packages\n")
     out.append(f"- Added: {len(pk.get('added', []) or [])}\n")
@@ -1146,15 +566,6 @@ def _report_markdown(report: Dict[str, Any]) -> str:
     for p in pk.get("removed", []) or []:
         out.append(f"  - `- {p}`\n")
 
-    ignored_v = int(pk.get("version_changed_ignored_count") or 0)
-    vc = len(pk.get("version_changed", []) or [])
-    suffix = f" (ignored {ignored_v})" if ignored_v else ""
-    out.append(f"- Version changed: {vc}{suffix}\n")
-    for ch in pk.get("version_changed", []) or []:
-        out.append(
-            f"  - `~ {ch.get('package')}`: `{ch.get('old')}` → `{ch.get('new')}`\n"
-        )
-
     sv = report.get("services", {})
     out.append("## Services (enabled systemd units)\n")
     if sv.get("enabled_added"):
@@ -1249,7 +660,6 @@ def _report_markdown(report: Dict[str, Any]) -> str:
         [
             (pk.get("added") or []),
             (pk.get("removed") or []),
-            (pk.get("version_changed") or []),
             (sv.get("enabled_added") or []),
             (sv.get("enabled_removed") or []),
             (sv.get("changed") or []),

enroll/explain.py

@@ -1,578 +0,0 @@
-from __future__ import annotations
-
-import json
-from collections import Counter, defaultdict
-from dataclasses import dataclass
-from typing import Any, Dict, Iterable, List, Tuple
-
-from .diff import _bundle_from_input, _load_state  # reuse existing bundle handling
-
-
-@dataclass(frozen=True)
-class ReasonInfo:
-    title: str
-    why: str
-
-
-_MANAGED_FILE_REASONS: Dict[str, ReasonInfo] = {
-    # Package manager / repo config
-    "apt_config": ReasonInfo(
-        "APT configuration",
-        "APT configuration affecting package installation and repository behavior.",
-    ),
-    "apt_source": ReasonInfo(
-        "APT repository source",
-        "APT source list entries (e.g. sources.list or sources.list.d).",
-    ),
-    "apt_keyring": ReasonInfo(
-        "APT keyring",
-        "Repository signing key material used by APT.",
-    ),
-    "apt_signed_by_keyring": ReasonInfo(
-        "APT Signed-By keyring",
-        "Keyring referenced via a Signed-By directive in an APT source.",
-    ),
-    "yum_conf": ReasonInfo(
-        "YUM/DNF main config",
-        "Primary YUM configuration (often /etc/yum.conf).",
-    ),
-    "yum_config": ReasonInfo(
-        "YUM/DNF config",
-        "YUM/DNF configuration files (including conf.d).",
-    ),
-    "yum_repo": ReasonInfo(
-        "YUM/DNF repository",
-        "YUM/DNF repository definitions (e.g. yum.repos.d).",
-    ),
-    "dnf_config": ReasonInfo(
-        "DNF configuration",
-        "DNF configuration affecting package installation and repositories.",
-    ),
-    "rpm_gpg_key": ReasonInfo(
-        "RPM GPG key",
-        "Repository signing keys used by RPM/YUM/DNF.",
-    ),
-    # SSH
-    "authorized_keys": ReasonInfo(
-        "SSH authorized keys",
-        "User authorized_keys files (controls who can log in with SSH keys).",
-    ),
-    "ssh_public_key": ReasonInfo(
-        "SSH public key",
-        "SSH host/user public keys relevant to authentication.",
-    ),
-    # System config / security
-    "system_security": ReasonInfo(
-        "Security configuration",
-        "Security-sensitive configuration (SSH, sudoers, PAM, auth, etc.).",
-    ),
-    "system_network": ReasonInfo(
-        "Network configuration",
-        "Network configuration (interfaces, resolv.conf, network managers, etc.).",
-    ),
-    "system_firewall": ReasonInfo(
-        "Firewall configuration",
-        "Firewall rules/configuration (ufw, nftables, iptables, etc.).",
-    ),
-    "system_sysctl": ReasonInfo(
-        "sysctl configuration",
-        "Kernel sysctl tuning (sysctl.conf / sysctl.d).",
-    ),
-    "system_modprobe": ReasonInfo(
-        "modprobe configuration",
-        "Kernel module configuration (modprobe.d).",
-    ),
-    "system_mounts": ReasonInfo(
-        "Mount configuration",
-        "Mount configuration (e.g. /etc/fstab and related).",
-    ),
-    "system_rc": ReasonInfo(
-        "Startup/rc configuration",
-        "Startup scripts / rc configuration that can affect boot behavior.",
-    ),
-    # systemd + timers
-    "systemd_dropin": ReasonInfo(
-        "systemd drop-in",
-        "systemd override/drop-in files that modify a unit's behavior.",
-    ),
-    "systemd_envfile": ReasonInfo(
-        "systemd EnvironmentFile",
-        "Files referenced by systemd units via EnvironmentFile.",
-    ),
-    "related_timer": ReasonInfo(
-        "Related systemd timer",
-        "A systemd timer captured because it is related to a unit/service.",
-    ),
-    # cron / logrotate
-    "system_cron": ReasonInfo(
-        "System cron",
-        "System cron configuration (crontab, cron.d, etc.).",
-    ),
-    "cron_snippet": ReasonInfo(
-        "Cron snippet",
-        "Cron snippets referenced/used by harvested services or configs.",
-    ),
-    "system_logrotate": ReasonInfo(
-        "System logrotate",
-        "System logrotate configuration.",
-    ),
-    "logrotate_snippet": ReasonInfo(
-        "logrotate snippet",
-        "logrotate snippets/configs referenced in system configuration.",
-    ),
-    # Custom paths / drift signals
-    "modified_conffile": ReasonInfo(
-        "Modified package conffile",
-        "A package-managed conffile differs from the packaged/default version.",
-    ),
-    "modified_packaged_file": ReasonInfo(
-        "Modified packaged file",
-        "A file owned by a package differs from the packaged version.",
-    ),
-    "custom_unowned": ReasonInfo(
-        "Unowned custom file",
-        "A file not owned by any package (often custom/operator-managed).",
-    ),
-    "custom_specific_path": ReasonInfo(
-        "Custom specific path",
-        "A specific path included by a custom rule or snapshot.",
-    ),
-    "usr_local_bin_script": ReasonInfo(
-        "/usr/local/bin script",
-        "Executable scripts under /usr/local/bin (often operator-installed).",
-    ),
-    "usr_local_etc_custom": ReasonInfo(
-        "/usr/local/etc custom",
-        "Custom configuration under /usr/local/etc.",
-    ),
-    # User includes
-    "user_include": ReasonInfo(
-        "User-included path",
-        "Included because you specified it via --include-path / include patterns.",
-    ),
-}
-
-_MANAGED_DIR_REASONS: Dict[str, ReasonInfo] = {
-    "parent_of_managed_file": ReasonInfo(
-        "Parent directory",
-        "Included so permissions/ownership can be recreated for managed files.",
-    ),
-    "user_include_dir": ReasonInfo(
-        "User-included directory",
-        "Included because you specified it via --include-path / include patterns.",
-    ),
-}
-
-_EXCLUDED_REASONS: Dict[str, ReasonInfo] = {
-    "user_excluded": ReasonInfo(
-        "User excluded",
-        "Excluded because you explicitly excluded it (e.g. --exclude-path / patterns).",
-    ),
-    "unreadable": ReasonInfo(
-        "Unreadable",
-        "Enroll could not read this path with the permissions it had.",
-    ),
-    "log_file": ReasonInfo(
-        "Log file",
-        "Excluded because it appears to be a log file (usually noisy/large).",
-    ),
-    "denied_path": ReasonInfo(
-        "Denied path",
-        "Excluded because the path is in a denylist for safety.",
-    ),
-    "too_large": ReasonInfo(
-        "Too large",
-        "Excluded because it exceeded the size limit for harvested files.",
-    ),
-    "not_regular_file": ReasonInfo(
-        "Not a regular file",
-        "Excluded because it was not a regular file (device, socket, etc.).",
-    ),
-    "binary_like": ReasonInfo(
-        "Binary-like",
-        "Excluded because it looked like binary content (not useful for config management).",
-    ),
-    "sensitive_content": ReasonInfo(
-        "Sensitive content",
-        "Excluded because it likely contains secrets (e.g. shadow, private keys).",
-    ),
-}
-
-_OBSERVED_VIA: Dict[str, ReasonInfo] = {
-    "user_installed": ReasonInfo(
-        "User-installed",
-        "Package appears explicitly installed (as opposed to only pulled in as a dependency).",
-    ),
-    "systemd_unit": ReasonInfo(
-        "Referenced by systemd unit",
-        "Package is associated with a systemd unit that was harvested.",
-    ),
-    "package_role": ReasonInfo(
-        "Referenced by package role",
-        "Package was referenced by an enroll packages snapshot/role.",
-    ),
-}
-
-
-def _ri(mapping: Dict[str, ReasonInfo], key: str) -> ReasonInfo:
-    return mapping.get(key) or ReasonInfo(key, f"Captured with reason '{key}'")
-
-
-def _role_common_counts(role_obj: Dict[str, Any]) -> Tuple[int, int, int, int]:
-    """Return (managed_files, managed_dirs, excluded, notes) counts for a RoleCommon object."""
-    mf = len(role_obj.get("managed_files") or [])
-    md = len(role_obj.get("managed_dirs") or [])
-    ex = len(role_obj.get("excluded") or [])
-    nt = len(role_obj.get("notes") or [])
-    return mf, md, ex, nt
-
-
-def _summarize_reasons(
-    items: Iterable[Dict[str, Any]],
-    reason_key: str,
-    *,
-    mapping: Dict[str, ReasonInfo],
-    max_examples: int,
-) -> List[Dict[str, Any]]:
-    by_reason: Dict[str, List[str]] = defaultdict(list)
-    counts: Counter[str] = Counter()
-
-    for it in items:
-        if not isinstance(it, dict):
-            continue
-        r = it.get(reason_key)
-        if not r:
-            continue
-        r = str(r)
-        counts[r] += 1
-        p = it.get("path")
-        if (
-            max_examples > 0
-            and isinstance(p, str)
-            and p
-            and len(by_reason[r]) < max_examples
-        ):
-            by_reason[r].append(p)
-
-    out: List[Dict[str, Any]] = []
-    for reason, count in counts.most_common():
-        info = _ri(mapping, reason)
-        out.append(
-            {
-                "reason": reason,
-                "count": count,
-                "title": info.title,
-                "why": info.why,
-                "examples": by_reason.get(reason, []),
-            }
-        )
-    return out
-
-
-def explain_state(
-    harvest: str,
-    *,
-    sops_mode: bool = False,
-    fmt: str = "text",
-    max_examples: int = 3,
-) -> str:
-    """Explain a harvest bundle's state.json.
-
-    `harvest` may be:
-      - a bundle directory
-      - a path to state.json
-      - a tarball (.tar.gz/.tgz)
-      - a SOPS-encrypted bundle (.sops)
-    """
-    bundle = _bundle_from_input(harvest, sops_mode=sops_mode)
-    state = _load_state(bundle.dir)
-
-    host = state.get("host") or {}
-    enroll = state.get("enroll") or {}
-    roles = state.get("roles") or {}
-    inv = state.get("inventory") or {}
-    inv_pkgs = (inv.get("packages") or {}) if isinstance(inv, dict) else {}
-
-    role_summaries: List[Dict[str, Any]] = []
-
-    # Users
-    users_obj = roles.get("users") or {}
-    user_entries = users_obj.get("users") or []
-    mf, md, ex, _nt = (
-        _role_common_counts(users_obj) if isinstance(users_obj, dict) else (0, 0, 0, 0)
-    )
-    role_summaries.append(
-        {
-            "role": "users",
-            "summary": f"{len(user_entries)} user(s), {mf} file(s), {ex} excluded",
-            "notes": users_obj.get("notes") or [],
-        }
-    )
-
-    # Services
-    services_list = roles.get("services") or []
-    if isinstance(services_list, list):
-        total_mf = sum(
-            len((s.get("managed_files") or []))
-            for s in services_list
-            if isinstance(s, dict)
-        )
-        total_ex = sum(
-            len((s.get("excluded") or [])) for s in services_list if isinstance(s, dict)
-        )
-        role_summaries.append(
-            {
-                "role": "services",
-                "summary": f"{len(services_list)} unit(s), {total_mf} file(s), {total_ex} excluded",
-                "units": [
-                    {
-                        "unit": s.get("unit"),
-                        "active_state": s.get("active_state"),
-                        "sub_state": s.get("sub_state"),
-                        "unit_file_state": s.get("unit_file_state"),
-                        "condition_result": s.get("condition_result"),
-                    }
-                    for s in services_list
-                    if isinstance(s, dict)
-                ],
-            }
-        )
-
-    # Package snapshots
-    pkgs_list = roles.get("packages") or []
-    if isinstance(pkgs_list, list):
-        total_mf = sum(
-            len((p.get("managed_files") or []))
-            for p in pkgs_list
-            if isinstance(p, dict)
-        )
-        total_ex = sum(
-            len((p.get("excluded") or [])) for p in pkgs_list if isinstance(p, dict)
-        )
-        role_summaries.append(
-            {
-                "role": "packages",
-                "summary": f"{len(pkgs_list)} package snapshot(s), {total_mf} file(s), {total_ex} excluded",
-                "packages": [
-                    p.get("package") for p in pkgs_list if isinstance(p, dict)
-                ],
-            }
-        )
-
-    # Single snapshots
-    for rname in [
-        "apt_config",
-        "dnf_config",
-        "etc_custom",
-        "usr_local_custom",
-        "extra_paths",
-    ]:
-        robj = roles.get(rname) or {}
-        if not isinstance(robj, dict):
-            continue
-        mf, md, ex, _nt = _role_common_counts(robj)
-        extra: Dict[str, Any] = {}
-        if rname == "extra_paths":
-            extra = {
-                "include_patterns": robj.get("include_patterns") or [],
-                "exclude_patterns": robj.get("exclude_patterns") or [],
-            }
-        role_summaries.append(
-            {
-                "role": rname,
-                "summary": f"{mf} file(s), {md} dir(s), {ex} excluded",
-                "notes": robj.get("notes") or [],
-                **extra,
-            }
-        )
-
-    # Flatten managed/excluded across roles
-    all_managed_files: List[Dict[str, Any]] = []
-    all_managed_dirs: List[Dict[str, Any]] = []
-    all_excluded: List[Dict[str, Any]] = []
-
-    def _consume_role(role_obj: Dict[str, Any]) -> None:
-        for f in role_obj.get("managed_files") or []:
-            if isinstance(f, dict):
-                all_managed_files.append(f)
-        for d in role_obj.get("managed_dirs") or []:
-            if isinstance(d, dict):
-                all_managed_dirs.append(d)
-        for e in role_obj.get("excluded") or []:
-            if isinstance(e, dict):
-                all_excluded.append(e)
-
-    if isinstance(users_obj, dict):
-        _consume_role(users_obj)
-    if isinstance(services_list, list):
-        for s in services_list:
-            if isinstance(s, dict):
-                _consume_role(s)
-    if isinstance(pkgs_list, list):
-        for p in pkgs_list:
-            if isinstance(p, dict):
-                _consume_role(p)
-    for rname in [
-        "apt_config",
-        "dnf_config",
-        "etc_custom",
-        "usr_local_custom",
-        "extra_paths",
-    ]:
-        robj = roles.get(rname)
-        if isinstance(robj, dict):
-            _consume_role(robj)
-
-    managed_file_reasons = _summarize_reasons(
-        all_managed_files,
-        "reason",
-        mapping=_MANAGED_FILE_REASONS,
-        max_examples=max_examples,
-    )
-    managed_dir_reasons = _summarize_reasons(
-        all_managed_dirs,
-        "reason",
-        mapping=_MANAGED_DIR_REASONS,
-        max_examples=max_examples,
-    )
-    excluded_reasons = _summarize_reasons(
-        all_excluded,
-        "reason",
-        mapping=_EXCLUDED_REASONS,
-        max_examples=max_examples,
-    )
-
-    # Inventory observed_via breakdown (count packages that contain at least one entry for that kind)
-    observed_kinds: Counter[str] = Counter()
-    observed_refs: Dict[str, Counter[str]] = defaultdict(Counter)
-    for _pkg, entry in inv_pkgs.items():
-        if not isinstance(entry, dict):
-            continue
-        seen_kinds = set()
-        for ov in entry.get("observed_via") or []:
-            if not isinstance(ov, dict):
-                continue
-            kind = ov.get("kind")
-            if not kind:
-                continue
-            kind = str(kind)
-            seen_kinds.add(kind)
-            ref = ov.get("ref")
-            if isinstance(ref, str) and ref:
-                observed_refs[kind][ref] += 1
-        for k in seen_kinds:
-            observed_kinds[k] += 1
-
-    observed_via_summary: List[Dict[str, Any]] = []
-    for kind, cnt in observed_kinds.most_common():
-        info = _ri(_OBSERVED_VIA, kind)
-        top_refs = [
-            r for r, _ in observed_refs.get(kind, Counter()).most_common(max_examples)
-        ]
-        observed_via_summary.append(
-            {
-                "kind": kind,
-                "count": cnt,
-                "title": info.title,
-                "why": info.why,
-                "top_refs": top_refs,
-            }
-        )
-
-    report: Dict[str, Any] = {
-        "bundle_dir": str(bundle.dir),
-        "host": host,
-        "enroll": enroll,
-        "inventory": {
-            "package_count": len(inv_pkgs),
-            "observed_via": observed_via_summary,
-        },
-        "roles": role_summaries,
-        "reasons": {
-            "managed_files": managed_file_reasons,
-            "managed_dirs": managed_dir_reasons,
-            "excluded": excluded_reasons,
-        },
-    }
-
-    if fmt == "json":
-        return json.dumps(report, indent=2, sort_keys=True)
-
-    # Text rendering
-    out: List[str] = []
-    out.append(f"Enroll explained: {harvest}")
-    hn = host.get("hostname") or "(unknown host)"
-    os_family = host.get("os") or "unknown"
-    pkg_backend = host.get("pkg_backend") or "?"
-    ver = enroll.get("version") or "?"
-    out.append(f"Host: {hn} (os: {os_family}, pkg: {pkg_backend})")
-    out.append(f"Enroll: {ver}")
-    out.append("")
-
-    out.append("Inventory")
-    out.append(f"- Packages: {len(inv_pkgs)}")
-    if observed_via_summary:
-        out.append("- Why packages were included (observed_via):")
-        for ov in observed_via_summary:
-            extra = ""
-            if ov.get("top_refs"):
-                extra = f" (e.g. {', '.join(ov['top_refs'])})"
-            out.append(f"  - {ov['kind']}: {ov['count']} – {ov['why']}{extra}")
-    out.append("")
-
-    out.append("Roles collected")
-    for rs in role_summaries:
-        out.append(f"- {rs['role']}: {rs['summary']}")
-        if rs["role"] == "extra_paths":
-            inc = rs.get("include_patterns") or []
-            exc = rs.get("exclude_patterns") or []
-            if inc:
-                suffix = "…" if len(inc) > max_examples else ""
-                out.append(
-                    f"    include_patterns: {', '.join(map(str, inc[:max_examples]))}{suffix}"
-                )
-            if exc:
-                suffix = "…" if len(exc) > max_examples else ""
-                out.append(
-                    f"    exclude_patterns: {', '.join(map(str, exc[:max_examples]))}{suffix}"
-                )
-        notes = rs.get("notes") or []
-        if notes:
-            for n in notes[:max_examples]:
-                out.append(f"    note: {n}")
-            if len(notes) > max_examples:
-                out.append(
-                    f"    note: (+{len(notes) - max_examples} more. Use --format json to see them all)"
-                )
-    out.append("")
-
-    out.append("Why files were included (managed_files.reason)")
-    if managed_file_reasons:
-        for r in managed_file_reasons[:15]:
-            exs = r.get("examples") or []
-            ex_txt = f" Examples: {', '.join(exs)}" if exs else ""
-            out.append(f"- {r['reason']} ({r['count']}): {r['why']}.{ex_txt}")
-        if len(managed_file_reasons) > 15:
-            out.append(
-                f"- (+{len(managed_file_reasons) - 15} more reasons. Use --format json to see them all)"
-            )
-    else:
-        out.append("- (no managed files)")
-
-    if managed_dir_reasons:
-        out.append("")
-        out.append("Why directories were included (managed_dirs.reason)")
-        for r in managed_dir_reasons:
-            out.append(f"- {r['reason']} ({r['count']}): {r['why']}")
-
-    out.append("")
-    out.append("Why paths were excluded")
-    if excluded_reasons:
-        for r in excluded_reasons:
-            exs = r.get("examples") or []
-            ex_txt = f" Examples: {', '.join(exs)}" if exs else ""
-            out.append(f"- {r['reason']} ({r['count']}): {r['why']}.{ex_txt}")
-    else:
-        out.append("- (no excluded paths)")
-
-    return "\n".join(out) + "\n"

enroll/fsutil.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import os
-from typing import Tuple
-
-
-def file_md5(path: str) -> str:
-    """Return hex MD5 of a file.
-
-    Used for Debian dpkg baseline comparisons.
-    """
-    h = hashlib.md5()  # nosec
-    with open(path, "rb") as f:
-        for chunk in iter(lambda: f.read(1024 * 1024), b""):
-            h.update(chunk)
-    return h.hexdigest()
-
-
-def stat_triplet(path: str) -> Tuple[str, str, str]:
-    """Return (owner, group, mode) for a path.
-
-    owner/group are usernames/group names when resolvable, otherwise numeric ids.
-    mode is a zero-padded octal string (e.g. "0644").
-    """
-    st = os.stat(path, follow_symlinks=True)
-    mode = oct(st.st_mode & 0o7777)[2:].zfill(4)
-
-    import grp
-    import pwd
-
-    try:
-        owner = pwd.getpwuid(st.st_uid).pw_name
-    except KeyError:
-        owner = str(st.st_uid)
-    try:
-        group = grp.getgrgid(st.st_gid).gr_name
-    except KeyError:
-        group = str(st.st_gid)
-    return owner, group, mode

enroll/ignore.py

@@ -30,22 +30,6 @@ DEFAULT_DENY_GLOBS = [
     "/usr/local/etc/letsencrypt/*",
 ]
 
-
-# Allow a small set of binary config artifacts that are commonly required to
-# reproduce system configuration (notably APT keyrings). These are still subject
-# to size and readability limits, but are exempt from the "binary_like" denial.
-DEFAULT_ALLOW_BINARY_GLOBS = [
-    "/etc/apt/trusted.gpg",
-    "/etc/apt/trusted.gpg.d/*.gpg",
-    "/etc/apt/keyrings/*.gpg",
-    "/etc/apt/keyrings/*.pgp",
-    "/etc/apt/keyrings/*.asc",
-    "/usr/share/keyrings/*.gpg",
-    "/usr/share/keyrings/*.pgp",
-    "/usr/share/keyrings/*.asc",
-    "/etc/pki/rpm-gpg/*",
-]
-
 SENSITIVE_CONTENT_PATTERNS = [
     re.compile(rb"-----BEGIN (RSA |EC |OPENSSH |)PRIVATE KEY-----"),
     re.compile(rb"(?i)\bpassword\s*="),
@@ -60,7 +44,6 @@ BLOCK_END = b"*/"
 @dataclass
 class IgnorePolicy:
     deny_globs: Optional[list[str]] = None
-    allow_binary_globs: Optional[list[str]] = None
     max_file_bytes: int = 256_000
     sample_bytes: int = 64_000
     # If True, be much less conservative about collecting potentially
@@ -71,8 +54,6 @@ class IgnorePolicy:
     def __post_init__(self) -> None:
         if self.deny_globs is None:
             self.deny_globs = list(DEFAULT_DENY_GLOBS)
-        if self.allow_binary_globs is None:
-            self.allow_binary_globs = list(DEFAULT_ALLOW_BINARY_GLOBS)
 
     def iter_effective_lines(self, content: bytes):
         in_block = False
@@ -100,12 +81,6 @@ class IgnorePolicy:
         # Always ignore plain *.log files (rarely useful as config, often noisy).
         if path.endswith(".log"):
             return "log_file"
-        # Ignore editor/backup files that end with a trailing tilde.
-        if path.endswith("~"):
-            return "backup_file"
-        # Ignore backup shadow files
-        if path.startswith("/etc/") and path.endswith("-"):
-            return "backup_file"
 
         if not self.dangerous:
             for g in self.deny_globs or []:
@@ -130,10 +105,6 @@ class IgnorePolicy:
             return "unreadable"
 
         if b"\x00" in data:
-            for g in self.allow_binary_globs or []:
-                if fnmatch.fnmatch(path, g):
-                    # Binary is acceptable for explicitly-allowed paths.
-                    return None
             return "binary_like"
 
         if not self.dangerous:
@@ -143,75 +114,3 @@ class IgnorePolicy:
                         return "sensitive_content"
 
         return None
-
-    def deny_reason_dir(self, path: str) -> Optional[str]:
-        """Directory-specific deny logic.
-
-        deny_reason() is file-oriented (it rejects directories as "not_regular_file").
-        For directory metadata capture (so roles can recreate directory trees), we need
-        a lighter-weight check:
-          - apply deny_globs (unless dangerous)
-          - require the path to be a real directory (no symlink)
-          - ensure it's stat'able/readable
-
-        No size checks or content scanning are performed for directories.
-        """
-        if not self.dangerous:
-            for g in self.deny_globs or []:
-                if fnmatch.fnmatch(path, g):
-                    return "denied_path"
-
-        try:
-            os.stat(path, follow_symlinks=True)
-        except OSError:
-            return "unreadable"
-
-        if os.path.islink(path):
-            return "symlink"
-
-        if not os.path.isdir(path):
-            return "not_directory"
-
-        return None
-
-    def deny_reason_link(self, path: str) -> Optional[str]:
-        """Symlink-specific deny logic.
-
-        Symlinks are meaningful configuration state (e.g. Debian-style
-        *-enabled directories). deny_reason() is file-oriented and rejects
-        symlinks as "not_regular_file".
-
-        For symlinks we:
-          - apply the usual deny_globs (unless dangerous)
-          - ensure the path is a symlink and we can readlink() it
-
-        No size checks or content scanning are performed for symlinks.
-        """
-
-        # Keep the same fast-path filename ignores as deny_reason().
-        if path.endswith(".log"):
-            return "log_file"
-        if path.endswith("~"):
-            return "backup_file"
-        if path.startswith("/etc/") and path.endswith("-"):
-            return "backup_file"
-
-        if not self.dangerous:
-            for g in self.deny_globs or []:
-                if fnmatch.fnmatch(path, g):
-                    return "denied_path"
-
-        try:
-            os.lstat(path)
-        except OSError:
-            return "unreadable"
-
-        if not os.path.islink(path):
-            return "not_symlink"
-
-        try:
-            os.readlink(path)
-        except OSError:
-            return "unreadable"
-
-        return None

enroll/jinjaturtle.py

@@ -8,45 +8,7 @@ from pathlib import Path
 from typing import Optional
 
 
-SYSTEMD_SUFFIXES = {
+SUPPORTED_EXTS = {".ini", ".json", ".toml", ".yaml", ".yml", ".xml"}
-    ".service",
-    ".socket",
-    ".target",
-    ".timer",
-    ".path",
-    ".mount",
-    ".automount",
-    ".slice",
-    ".swap",
-    ".scope",
-    ".link",
-    ".netdev",
-    ".network",
-}
-
-SUPPORTED_SUFFIXES = {
-    ".ini",
-    ".cfg",
-    ".json",
-    ".toml",
-    ".yaml",
-    ".yml",
-    ".xml",
-    ".repo",
-} | SYSTEMD_SUFFIXES
-
-
-def infer_other_formats(dest_path: str) -> Optional[str]:
-    p = Path(dest_path)
-    name = p.name.lower()
-    suffix = p.suffix.lower()
-    # postfix
-    if name == "main.cf":
-        return "postfix"
-    # systemd units
-    if suffix in SYSTEMD_SUFFIXES:
-        return "systemd"
-    return None
 
 
 @dataclass(frozen=True)
@@ -60,15 +22,9 @@ def find_jinjaturtle_cmd() -> Optional[str]:
     return shutil.which("jinjaturtle")
 
 
-def can_jinjify_path(dest_path: str) -> bool:
+def can_jinjify_path(path: str) -> bool:
-    p = Path(dest_path)
+    p = Path(path)
-    suffix = p.suffix.lower()
+    return p.suffix.lower() in SUPPORTED_EXTS
-    if infer_other_formats(dest_path):
-        return True
-    # allow unambiguous structured formats
-    if suffix in SUPPORTED_SUFFIXES:
-        return True
-    return False
 
 
 def run_jinjaturtle(

enroll/manifest.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import json
 import os
-import re
 import shutil
 import stat
 import tarfile
@@ -11,9 +10,8 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Set, Tuple
 
 from .jinjaturtle import (
-    can_jinjify_path,
     find_jinjaturtle_cmd,
-    infer_other_formats,
+    can_jinjify_path,
     run_jinjaturtle,
 )
 
@@ -140,6 +138,7 @@ def _copy_artifacts(
 
             # If a file was successfully templatised by JinjaTurtle, do NOT
             # also materialise the raw copy in the destination files dir.
+            # (This keeps the output minimal and avoids redundant "raw" files.)
             if exclude_rels and rel in exclude_rels:
                 try:
                     if os.path.isfile(dst):
@@ -163,31 +162,16 @@ def _write_role_scaffold(role_dir: str) -> None:
     os.makedirs(os.path.join(role_dir, "templates"), exist_ok=True)
 
 
-def _role_tag(role: str) -> str:
-    """Return a stable Ansible tag name for a role.
-
-    Used by `enroll diff --enforce` to run only the roles needed to repair drift.
-    """
-    r = str(role or "").strip()
-    # Ansible tag charset is fairly permissive, but keep it portable and consistent.
-    safe = re.sub(r"[^A-Za-z0-9_-]+", "_", r).strip("_")
-    if not safe:
-        safe = "other"
-    return f"role_{safe}"
-
-
 def _write_playbook_all(path: str, roles: List[str]) -> None:
     pb_lines = [
         "---",
-        "- name: Apply all roles on all hosts",
+        "- name: Apply all roles on host",
-        "  gather_facts: true",
         "  hosts: all",
         "  become: true",
         "  roles:",
     ]
     for r in roles:
-        pb_lines.append(f"    - role: {r}")
+        pb_lines.append(f"    - {r}")
-        pb_lines.append(f"      tags: [{_role_tag(r)}]")
     with open(path, "w", encoding="utf-8") as f:
         f.write("\n".join(pb_lines) + "\n")
 
@@ -195,15 +179,13 @@ def _write_playbook_all(path: str, roles: List[str]) -> None:
 def _write_playbook_host(path: str, fqdn: str, roles: List[str]) -> None:
     pb_lines = [
         "---",
-        f"- name: Apply all roles on {fqdn}",
+        f"- name: Apply enroll roles on {fqdn}",
         f"  hosts: {fqdn}",
-        "  gather_facts: true",
         "  become: true",
         "  roles:",
     ]
     for r in roles:
-        pb_lines.append(f"    - role: {r}")
+        pb_lines.append(f"    - {r}")
-        pb_lines.append(f"      tags: [{_role_tag(r)}]")
     with open(path, "w", encoding="utf-8") as f:
         f.write("\n".join(pb_lines) + "\n")
 
@@ -287,7 +269,9 @@ def _write_hostvars(site_root: str, fqdn: str, role: str, data: Dict[str, Any])
 
     merged = _merge_mappings_overwrite(existing_map, data)
 
-    out = "---\n" + _yaml_dump_mapping(merged, sort_keys=True)
+    out = "# Generated by enroll (host-specific vars)\n---\n" + _yaml_dump_mapping(
+        merged, sort_keys=True
+    )
     with open(path, "w", encoding="utf-8") as f:
         f.write(out)
 
@@ -325,10 +309,7 @@ def _jinjify_managed_files(
             continue
 
         try:
-            force_fmt = infer_other_formats(dest_path)
+            res = run_jinjaturtle(jt_exe, artifact_path, role_name=role)
-            res = run_jinjaturtle(
-                jt_exe, artifact_path, role_name=role, force_format=force_fmt
-            )
         except Exception:
             # If jinjaturtle cannot process a file for any reason, skip silently.
             # (Enroll's core promise is to be optimistic and non-interactive.)
@@ -363,29 +344,6 @@ def _write_role_defaults(role_dir: str, mapping: Dict[str, Any]) -> None:
         f.write(out)
 
 
-def _build_managed_dirs_var(
-    managed_dirs: List[Dict[str, Any]],
-) -> List[Dict[str, Any]]:
-    """Convert enroll managed_dirs into an Ansible-friendly list of dicts.
-
-    Each dict drives a role task loop and is safe across hosts.
-    """
-    out: List[Dict[str, Any]] = []
-    for d in managed_dirs:
-        dest = d.get("path") or ""
-        if not dest:
-            continue
-        out.append(
-            {
-                "dest": dest,
-                "owner": d.get("owner") or "root",
-                "group": d.get("group") or "root",
-                "mode": d.get("mode") or "0755",
-            }
-        )
-    return out
-
-
 def _build_managed_files_var(
     managed_files: List[Dict[str, Any]],
     templated_src_rels: Set[str],
@@ -425,20 +383,6 @@ def _build_managed_files_var(
     return out
 
 
-def _build_managed_links_var(
-    managed_links: List[Dict[str, Any]],
-) -> List[Dict[str, Any]]:
-    """Convert enroll managed_links into an Ansible-friendly list of dicts."""
-    out: List[Dict[str, Any]] = []
-    for ml in managed_links or []:
-        dest = ml.get("path") or ""
-        src = ml.get("target") or ""
-        if not dest or not src:
-            continue
-        out.append({"dest": dest, "src": src})
-    return out
-
-
 def _render_generic_files_tasks(
     var_prefix: str, *, include_restart_notify: bool
 ) -> str:
@@ -446,16 +390,9 @@ def _render_generic_files_tasks(
     # Using first_found makes roles work in both modes:
     # - site-mode: inventory/host_vars/<host>/<role>/.files/...
     # - non-site: roles/<role>/files/...
-    return f"""- name: Ensure managed directories exist (preserve owner/group/mode)
+    return f"""# Generated by enroll (data-driven tasks)
-  ansible.builtin.file:
-    path: "{{{{ item.dest }}}}"
-    state: directory
-    owner: "{{{{ item.owner }}}}"
-    group: "{{{{ item.group }}}}"
-    mode: "{{{{ item.mode }}}}"
-  loop: "{{{{ {var_prefix}_managed_dirs | default([]) }}}}"
 
-- name: Deploy any systemd unit files (templates)
+- name: Deploy systemd unit files (templates)
   ansible.builtin.template:
     src: "{{{{ item.src_rel }}}}.j2"
     dest: "{{{{ item.dest }}}}"
@@ -469,7 +406,7 @@ def _render_generic_files_tasks(
       | list }}}}
   notify: "{{{{ item.notify | default([]) }}}}"
 
-- name: Deploy any systemd unit files (raw files)
+- name: Deploy systemd unit files (copies)
   vars:
     _enroll_ff:
       files:
@@ -496,7 +433,7 @@ def _render_generic_files_tasks(
       | list
       | length) > 0
 
-- name: Deploy any other managed files (templates)
+- name: Deploy other managed files (templates)
   ansible.builtin.template:
     src: "{{{{ item.src_rel }}}}.j2"
     dest: "{{{{ item.dest }}}}"
@@ -510,7 +447,7 @@ def _render_generic_files_tasks(
       | list }}}}
   notify: "{{{{ item.notify | default([]) }}}}"
 
-- name: Deploy any other managed files (raw files)
+- name: Deploy other managed files (copies)
   vars:
     _enroll_ff:
       files:
@@ -528,57 +465,6 @@ def _render_generic_files_tasks(
       | selectattr('kind', 'equalto', 'copy')
       | list }}}}
   notify: "{{{{ item.notify | default([]) }}}}"
-
-- name: Ensure managed symlinks exist
-  ansible.builtin.file:
-    src: "{{{{ item.src }}}}"
-    dest: "{{{{ item.dest }}}}"
-    state: link
-    force: true
-  loop: "{{{{ {var_prefix}_managed_links | default([]) }}}}"
-"""
-
-
-def _render_install_packages_tasks(role: str, var_prefix: str) -> str:
-    """Render cross-distro package installation tasks.
-
-    We generate conditional tasks for apt/dnf/yum, falling back to the
-    generic `package` module. This keeps generated roles usable on both
-    Debian-like and RPM-like systems.
-    """
-    return f"""- name: Install packages for {role} (APT)
-  ansible.builtin.apt:
-    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
-    state: present
-    update_cache: true
-  when:
-    - ({var_prefix}_packages | default([])) | length > 0
-    - ansible_facts.pkg_mgr | default('') == 'apt'
-
-- name: Install packages for {role} (DNF5)
-  ansible.builtin.dnf5:
-    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
-    state: present
-  when:
-    - ({var_prefix}_packages | default([])) | length > 0
-    - ansible_facts.pkg_mgr | default('') == 'dnf5'
-
-- name: Install packages for {role} (DNF/YUM)
-  ansible.builtin.dnf:
-    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
-    state: present
-  when:
-    - ({var_prefix}_packages | default([])) | length > 0
-    - ansible_facts.pkg_mgr | default('') in ['dnf', 'yum']
-
-- name: Install packages for {role} (generic fallback)
-  ansible.builtin.package:
-    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
-    state: present
-  when:
-    - ({var_prefix}_packages | default([])) | length > 0
-    - ansible_facts.pkg_mgr | default('') not in ['apt', 'dnf', 'dnf5', 'yum']
-
 """
 
 
@@ -739,16 +625,11 @@ def _manifest_from_bundle_dir(
     with open(state_path, "r", encoding="utf-8") as f:
         state = json.load(f)
 
-    roles: Dict[str, Any] = state.get("roles") or {}
+    services: List[Dict[str, Any]] = state.get("services", [])
-
+    package_roles: List[Dict[str, Any]] = state.get("package_roles", [])
-    services: List[Dict[str, Any]] = roles.get("services", [])
+    users_snapshot: Dict[str, Any] = state.get("users", {})
-    package_roles: List[Dict[str, Any]] = roles.get("packages", [])
+    etc_custom_snapshot: Dict[str, Any] = state.get("etc_custom", {})
-    users_snapshot: Dict[str, Any] = roles.get("users", {})
+    usr_local_custom_snapshot: Dict[str, Any] = state.get("usr_local_custom", {})
-    apt_config_snapshot: Dict[str, Any] = roles.get("apt_config", {})
-    dnf_config_snapshot: Dict[str, Any] = roles.get("dnf_config", {})
-    etc_custom_snapshot: Dict[str, Any] = roles.get("etc_custom", {})
-    usr_local_custom_snapshot: Dict[str, Any] = roles.get("usr_local_custom", {})
-    extra_paths_snapshot: Dict[str, Any] = roles.get("extra_paths", {})
 
     site_mode = fqdn is not None and fqdn != ""
 
@@ -780,14 +661,16 @@ def _manifest_from_bundle_dir(
         _ensure_ansible_cfg(os.path.join(out_dir, "ansible.cfg"))
 
     manifested_users_roles: List[str] = []
-    manifested_apt_config_roles: List[str] = []
-    manifested_dnf_config_roles: List[str] = []
     manifested_etc_custom_roles: List[str] = []
     manifested_usr_local_custom_roles: List[str] = []
-    manifested_extra_paths_roles: List[str] = []
     manifested_service_roles: List[str] = []
     manifested_pkg_roles: List[str] = []
 
+    # In site_mode, raw harvested files are stored under host-specific inventory
+    # to avoid cross-host clobber while still sharing a role definition.
+
+    # -------------------------
+
     # -------------------------
     # Users role (non-system users)
     # -------------------------
@@ -860,12 +743,7 @@ def _manifest_from_bundle_dir(
                     group = str(u.get("primary_group") or owner)
                     break
 
-            # Prefer the harvested file mode so we preserve any deliberate
+            mode = "0600" if mf.get("reason") == "authorized_keys" else "0644"
-            # permissions (e.g. 0600 for certain dotfiles). For authorized_keys,
-            # enforce 0600 regardless.
-            mode = mf.get("mode") or "0644"
-            if mf.get("reason") == "authorized_keys":
-                mode = "0600"
             ssh_files.append(
                 {
                     "dest": dest,
@@ -913,6 +791,7 @@ def _manifest_from_bundle_dir(
 
         # tasks (data-driven)
         users_tasks = """---
+# Generated by enroll (data-driven tasks)
 
 - name: Ensure groups exist
   ansible.builtin.group:
@@ -1013,324 +892,6 @@ Generated non-system user accounts and SSH public material.
         manifested_users_roles.append(role)
 
     # -------------------------
-    # apt_config role (APT sources, pinning, and keyrings)
-    # -------------------------
-    if apt_config_snapshot and apt_config_snapshot.get("managed_files"):
-        role = apt_config_snapshot.get("role_name", "apt_config")
-        role_dir = os.path.join(roles_root, role)
-        _write_role_scaffold(role_dir)
-
-        var_prefix = role
-
-        managed_files = apt_config_snapshot.get("managed_files", [])
-        managed_dirs = apt_config_snapshot.get("managed_dirs", []) or []
-        excluded = apt_config_snapshot.get("excluded", [])
-        notes = apt_config_snapshot.get("notes", [])
-
-        templated, jt_vars = _jinjify_managed_files(
-            bundle_dir,
-            role,
-            role_dir,
-            managed_files,
-            jt_exe=jt_exe,
-            jt_enabled=jt_enabled,
-            overwrite_templates=not site_mode,
-        )
-
-        # Copy only the non-templated artifacts (templates live in the role).
-        if site_mode:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                _host_role_files_dir(out_dir, fqdn or "", role),
-                exclude_rels=templated,
-            )
-        else:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                os.path.join(role_dir, "files"),
-                exclude_rels=templated,
-            )
-
-        files_var = _build_managed_files_var(
-            managed_files,
-            templated,
-            notify_other=None,
-            notify_systemd=None,
-        )
-
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
-        jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
-        vars_map: Dict[str, Any] = {
-            f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-        }
-        vars_map = _merge_mappings_overwrite(vars_map, jt_map)
-
-        if site_mode:
-            _write_role_defaults(
-                role_dir,
-                {f"{var_prefix}_managed_files": [], f"{var_prefix}_managed_dirs": []},
-            )
-            _write_hostvars(out_dir, fqdn or "", role, vars_map)
-        else:
-            _write_role_defaults(role_dir, vars_map)
-
-        tasks = "---\n" + _render_generic_files_tasks(
-            var_prefix, include_restart_notify=False
-        )
-        with open(
-            os.path.join(role_dir, "tasks", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write(tasks.rstrip() + "\n")
-
-        with open(
-            os.path.join(role_dir, "meta", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write("---\ndependencies: []\n")
-
-        # README: summarise repos and keyrings
-        source_paths: List[str] = []
-        keyring_paths: List[str] = []
-        repo_hosts: Set[str] = set()
-
-        url_re = re.compile(r"(?:https?|ftp)://([^/\s]+)", re.IGNORECASE)
-
-        for mf in managed_files:
-            p = str(mf.get("path") or "")
-            src_rel = str(mf.get("src_rel") or "")
-            if not p or not src_rel:
-                continue
-
-            if p == "/etc/apt/sources.list" or p.startswith("/etc/apt/sources.list.d/"):
-                source_paths.append(p)
-                art_path = os.path.join(bundle_dir, "artifacts", role, src_rel)
-                try:
-                    with open(art_path, "r", encoding="utf-8", errors="replace") as sf:
-                        for line in sf:
-                            line = line.strip()
-                            if not line or line.startswith("#"):
-                                continue
-                            for m in url_re.finditer(line):
-                                repo_hosts.add(m.group(1))
-                except OSError:
-                    pass  # nosec
-
-            if (
-                p.startswith("/etc/apt/trusted.gpg")
-                or p.startswith("/etc/apt/keyrings/")
-                or p.startswith("/usr/share/keyrings/")
-            ):
-                keyring_paths.append(p)
-
-        source_paths = sorted(set(source_paths))
-        keyring_paths = sorted(set(keyring_paths))
-        repos = sorted(repo_hosts)
-
-        readme = (
-            """# apt_config
-
-APT configuration harvested from the system (sources, pinning, and keyrings).
-
-## Repository hosts
-"""
-            + ("\n".join([f"- {h}" for h in repos]) or "- (none)")
-            + """\n
-## Source files
-"""
-            + ("\n".join([f"- {p}" for p in source_paths]) or "- (none)")
-            + """\n
-## Keyrings
-"""
-            + ("\n".join([f"- {p}" for p in keyring_paths]) or "- (none)")
-            + """\n
-## Managed files
-"""
-            + (
-                "\n".join(
-                    [f"- {mf.get('path')} ({mf.get('reason')})" for mf in managed_files]
-                )
-                or "- (none)"
-            )
-            + """\n
-## Excluded
-"""
-            + (
-                "\n".join([f"- {e.get('path')} ({e.get('reason')})" for e in excluded])
-                or "- (none)"
-            )
-            + """\n
-## Notes
-"""
-            + ("\n".join([f"- {n}" for n in notes]) or "- (none)")
-            + """\n"""
-        )
-        with open(os.path.join(role_dir, "README.md"), "w", encoding="utf-8") as f:
-            f.write(readme)
-
-        manifested_apt_config_roles.append(role)
-
-    # -------------------------
-    # dnf_config role (DNF/YUM repos, config, and RPM GPG keys)
-    # -------------------------
-    if dnf_config_snapshot and dnf_config_snapshot.get("managed_files"):
-        role = dnf_config_snapshot.get("role_name", "dnf_config")
-        role_dir = os.path.join(roles_root, role)
-        _write_role_scaffold(role_dir)
-
-        var_prefix = role
-
-        managed_files = dnf_config_snapshot.get("managed_files", [])
-        managed_dirs = dnf_config_snapshot.get("managed_dirs", []) or []
-        excluded = dnf_config_snapshot.get("excluded", [])
-        notes = dnf_config_snapshot.get("notes", [])
-
-        templated, jt_vars = _jinjify_managed_files(
-            bundle_dir,
-            role,
-            role_dir,
-            managed_files,
-            jt_exe=jt_exe,
-            jt_enabled=jt_enabled,
-            overwrite_templates=not site_mode,
-        )
-
-        if site_mode:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                _host_role_files_dir(out_dir, fqdn or "", role),
-                exclude_rels=templated,
-            )
-        else:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                os.path.join(role_dir, "files"),
-                exclude_rels=templated,
-            )
-
-        files_var = _build_managed_files_var(
-            managed_files,
-            templated,
-            notify_other=None,
-            notify_systemd=None,
-        )
-
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
-        jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
-        vars_map: Dict[str, Any] = {
-            f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-        }
-        vars_map = _merge_mappings_overwrite(vars_map, jt_map)
-
-        if site_mode:
-            _write_role_defaults(
-                role_dir,
-                {f"{var_prefix}_managed_files": [], f"{var_prefix}_managed_dirs": []},
-            )
-            _write_hostvars(out_dir, fqdn or "", role, vars_map)
-        else:
-            _write_role_defaults(role_dir, vars_map)
-
-        tasks = "---\n" + _render_generic_files_tasks(
-            var_prefix, include_restart_notify=False
-        )
-        with open(
-            os.path.join(role_dir, "tasks", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write(tasks.rstrip() + "\n")
-
-        with open(
-            os.path.join(role_dir, "meta", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write("---\ndependencies: []\n")
-
-        # README: summarise repos and GPG key material
-        repo_paths: List[str] = []
-        key_paths: List[str] = []
-        repo_hosts: Set[str] = set()
-
-        url_re = re.compile(r"(?:https?|ftp)://([^/\s]+)", re.IGNORECASE)
-        file_url_re = re.compile(r"file://(/[^\s]+)")
-
-        for mf in managed_files:
-            p = str(mf.get("path") or "")
-            src_rel = str(mf.get("src_rel") or "")
-            if not p or not src_rel:
-                continue
-
-            if p.startswith("/etc/yum.repos.d/") and p.endswith(".repo"):
-                repo_paths.append(p)
-                art_path = os.path.join(bundle_dir, "artifacts", role, src_rel)
-                try:
-                    with open(art_path, "r", encoding="utf-8", errors="replace") as rf:
-                        for line in rf:
-                            s = line.strip()
-                            if not s or s.startswith("#") or s.startswith(";"):
-                                continue
-                            # Collect hostnames from URLs (baseurl, mirrorlist, metalink, gpgkey...)
-                            for m in url_re.finditer(s):
-                                repo_hosts.add(m.group(1))
-                            # Collect local gpgkey file paths referenced as file:///...
-                            for m in file_url_re.finditer(s):
-                                key_paths.append(m.group(1))
-                except OSError:
-                    pass  # nosec
-
-            if p.startswith("/etc/pki/rpm-gpg/"):
-                key_paths.append(p)
-
-        repo_paths = sorted(set(repo_paths))
-        key_paths = sorted(set(key_paths))
-        repos = sorted(repo_hosts)
-
-        readme = (
-            """# dnf_config
-
-DNF/YUM configuration harvested from the system (repos, config files, and RPM GPG keys).
-
-## Repository hosts
-"""
-            + ("\n".join([f"- {h}" for h in repos]) or "- (none)")
-            + """\n
-## Repo files
-"""
-            + ("\n".join([f"- {p}" for p in repo_paths]) or "- (none)")
-            + """\n
-## GPG keys
-"""
-            + ("\n".join([f"- {p}" for p in key_paths]) or "- (none)")
-            + """\n
-## Managed files
-"""
-            + (
-                "\n".join(
-                    [f"- {mf.get('path')} ({mf.get('reason')})" for mf in managed_files]
-                )
-                or "- (none)"
-            )
-            + """\n
-## Excluded
-"""
-            + (
-                "\n".join([f"- {e.get('path')} ({e.get('reason')})" for e in excluded])
-                or "- (none)"
-            )
-            + """\n
-## Notes
-"""
-            + ("\n".join([f"- {n}" for n in notes]) or "- (none)")
-            + """\n"""
-        )
-        with open(os.path.join(role_dir, "README.md"), "w", encoding="utf-8") as f:
-            f.write(readme)
-
-        manifested_dnf_config_roles.append(role)
 
     # -------------------------
     # etc_custom role (unowned /etc not already attributed)
@@ -1343,7 +904,6 @@ DNF/YUM configuration harvested from the system (repos, config files, and RPM GP
         var_prefix = role
 
         managed_files = etc_custom_snapshot.get("managed_files", [])
-        managed_dirs = etc_custom_snapshot.get("managed_dirs", []) or []
         excluded = etc_custom_snapshot.get("excluded", [])
         notes = etc_custom_snapshot.get("notes", [])
 
@@ -1380,25 +940,17 @@ DNF/YUM configuration harvested from the system (repos, config files, and RPM GP
             notify_systemd="Run systemd daemon-reload",
         )
 
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
         jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
-        vars_map: Dict[str, Any] = {
+        vars_map: Dict[str, Any] = {f"{var_prefix}_managed_files": files_var}
-            f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-        }
         vars_map = _merge_mappings_overwrite(vars_map, jt_map)
 
         if site_mode:
-            _write_role_defaults(
+            _write_role_defaults(role_dir, {f"{var_prefix}_managed_files": []})
-                role_dir,
-                {f"{var_prefix}_managed_files": [], f"{var_prefix}_managed_dirs": []},
-            )
             _write_hostvars(out_dir, fqdn or "", role, vars_map)
         else:
             _write_role_defaults(role_dir, vars_map)
 
-        tasks = "---\n" + _render_generic_files_tasks(
+        tasks = """---\n""" + _render_generic_files_tasks(
             var_prefix, include_restart_notify=False
         )
         with open(
@@ -1462,7 +1014,6 @@ Unowned /etc config files not attributed to packages or services.
         var_prefix = role
 
         managed_files = usr_local_custom_snapshot.get("managed_files", [])
-        managed_dirs = usr_local_custom_snapshot.get("managed_dirs", []) or []
         excluded = usr_local_custom_snapshot.get("excluded", [])
         notes = usr_local_custom_snapshot.get("notes", [])
 
@@ -1499,20 +1050,12 @@ Unowned /etc config files not attributed to packages or services.
             notify_systemd=None,
         )
 
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
         jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
-        vars_map: Dict[str, Any] = {
+        vars_map: Dict[str, Any] = {f"{var_prefix}_managed_files": files_var}
-            f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-        }
         vars_map = _merge_mappings_overwrite(vars_map, jt_map)
 
         if site_mode:
-            _write_role_defaults(
+            _write_role_defaults(role_dir, {f"{var_prefix}_managed_files": []})
-                role_dir,
-                {f"{var_prefix}_managed_files": [], f"{var_prefix}_managed_dirs": []},
-            )
             _write_hostvars(out_dir, fqdn or "", role, vars_map)
         else:
             _write_role_defaults(role_dir, vars_map)
@@ -1556,133 +1099,6 @@ Unowned /etc config files not attributed to packages or services.
         manifested_usr_local_custom_roles.append(role)
 
     # -------------------------
-    # extra_paths role (user-requested includes)
-    # -------------------------
-    if extra_paths_snapshot and (
-        extra_paths_snapshot.get("managed_files")
-        or extra_paths_snapshot.get("managed_dirs")
-    ):
-        role = extra_paths_snapshot.get("role_name", "extra_paths")
-        role_dir = os.path.join(roles_root, role)
-        _write_role_scaffold(role_dir)
-
-        var_prefix = role
-
-        managed_dirs = extra_paths_snapshot.get("managed_dirs", []) or []
-        managed_files = extra_paths_snapshot.get("managed_files", [])
-        excluded = extra_paths_snapshot.get("excluded", [])
-        notes = extra_paths_snapshot.get("notes", [])
-        include_pats = extra_paths_snapshot.get("include_patterns", []) or []
-        exclude_pats = extra_paths_snapshot.get("exclude_patterns", []) or []
-
-        templated, jt_vars = _jinjify_managed_files(
-            bundle_dir,
-            role,
-            role_dir,
-            managed_files,
-            jt_exe=jt_exe,
-            jt_enabled=jt_enabled,
-            overwrite_templates=not site_mode,
-        )
-
-        if site_mode:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                _host_role_files_dir(out_dir, fqdn or "", role),
-                exclude_rels=templated,
-            )
-        else:
-            _copy_artifacts(
-                bundle_dir,
-                role,
-                os.path.join(role_dir, "files"),
-                exclude_rels=templated,
-            )
-
-        files_var = _build_managed_files_var(
-            managed_files,
-            templated,
-            notify_other=None,
-            notify_systemd=None,
-        )
-
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
-        jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
-        vars_map: Dict[str, Any] = {
-            f"{var_prefix}_managed_dirs": dirs_var,
-            f"{var_prefix}_managed_files": files_var,
-        }
-        vars_map = _merge_mappings_overwrite(vars_map, jt_map)
-
-        if site_mode:
-            _write_role_defaults(
-                role_dir,
-                {
-                    f"{var_prefix}_managed_dirs": [],
-                    f"{var_prefix}_managed_files": [],
-                },
-            )
-            _write_hostvars(out_dir, fqdn or "", role, vars_map)
-        else:
-            _write_role_defaults(role_dir, vars_map)
-
-        tasks = "---\n" + _render_generic_files_tasks(
-            var_prefix, include_restart_notify=False
-        )
-        with open(
-            os.path.join(role_dir, "tasks", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write(tasks.rstrip() + "\n")
-
-        with open(
-            os.path.join(role_dir, "handlers", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write("---\n")
-
-        with open(
-            os.path.join(role_dir, "meta", "main.yml"), "w", encoding="utf-8"
-        ) as f:
-            f.write("---\ndependencies: []\n")
-
-        readme = (
-            f"""# {role}
-
-User-requested extra file harvesting.
-
-## Include patterns
-"""
-            + ("\n".join([f"- {p}" for p in include_pats]) or "- (none)")
-            + """\n
-## Exclude patterns
-"""
-            + ("\n".join([f"- {p}" for p in exclude_pats]) or "- (none)")
-            + """\n
-## Managed directories
-"""
-            + ("\n".join([f"- {d.get('path')}" for d in managed_dirs]) or "- (none)")
-            + """\n
-## Managed files
-"""
-            + ("\n".join([f"- {mf.get('path')}" for mf in managed_files]) or "- (none)")
-            + """\n
-## Excluded
-"""
-            + (
-                "\n".join([f"- {e.get('path')} ({e.get('reason')})" for e in excluded])
-                or "- (none)"
-            )
-            + """\n
-## Notes
-"""
-            + ("\n".join([f"- {n}" for n in notes]) or "- (none)")
-            + """\n"""
-        )
-        with open(os.path.join(role_dir, "README.md"), "w", encoding="utf-8") as f:
-            f.write(readme)
-
-        manifested_extra_paths_roles.append(role)
 
     # -------------------------
     # Service roles
@@ -1692,8 +1108,6 @@ User-requested extra file harvesting.
         unit = svc["unit"]
         pkgs = svc.get("packages", []) or []
         managed_files = svc.get("managed_files", []) or []
-        managed_dirs = svc.get("managed_dirs", []) or []
-        managed_links = svc.get("managed_links", []) or []
 
         role_dir = os.path.join(roles_root, role)
         _write_role_scaffold(role_dir)
@@ -1738,17 +1152,11 @@ User-requested extra file harvesting.
             notify_systemd="Run systemd daemon-reload",
         )
 
-        links_var = _build_managed_links_var(managed_links)
-
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
         jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
         base_vars: Dict[str, Any] = {
             f"{var_prefix}_unit_name": unit,
             f"{var_prefix}_packages": pkgs,
             f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-            f"{var_prefix}_managed_links": links_var,
             f"{var_prefix}_manage_unit": True,
             f"{var_prefix}_systemd_enabled": bool(enabled_at_harvest),
             f"{var_prefix}_systemd_state": desired_state,
@@ -1763,8 +1171,6 @@ User-requested extra file harvesting.
                     f"{var_prefix}_unit_name": unit,
                     f"{var_prefix}_packages": [],
                     f"{var_prefix}_managed_files": [],
-                    f"{var_prefix}_managed_dirs": [],
-                    f"{var_prefix}_managed_links": [],
                     f"{var_prefix}_manage_unit": False,
                     f"{var_prefix}_systemd_enabled": False,
                     f"{var_prefix}_systemd_state": "stopped",
@@ -1793,14 +1199,27 @@ User-requested extra file harvesting.
             f.write(handlers)
 
         task_parts: List[str] = []
-        task_parts.append("---\n" + _render_install_packages_tasks(role, var_prefix))
+        task_parts.append(
+            f"""---
+# Generated by enroll (data-driven tasks)
+
+- name: Install packages for {role}
+  ansible.builtin.apt:
+    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
+    state: present
+    update_cache: true
+  when: ({var_prefix}_packages | default([])) | length > 0
+
+"""
+        )
 
         task_parts.append(
             _render_generic_files_tasks(var_prefix, include_restart_notify=True)
         )
 
         task_parts.append(
-            f"""- name: Probe whether systemd unit exists and is manageable
+            f"""
+- name: Probe whether systemd unit exists and is manageable
   ansible.builtin.systemd:
     name: "{{{{ {var_prefix}_unit_name }}}}"
   check_mode: true
@@ -1850,9 +1269,6 @@ Generated from `{unit}`.
 ## Managed files
 {os.linesep.join("- " + mf["path"] + " (" + mf["reason"] + ")" for mf in managed_files) or "- (none)"}
 
-## Managed symlinks
-{os.linesep.join("- " + ml["path"] + " -> " + ml["target"] + " (" + ml.get("reason", "") + ")" for ml in managed_links) or "- (none)"}
-
 ## Excluded (possible secrets / unsafe)
 {os.linesep.join("- " + e["path"] + " (" + e["reason"] + ")" for e in excluded) or "- (none)"}
 
@@ -1871,8 +1287,6 @@ Generated from `{unit}`.
         role = pr["role_name"]
         pkg = pr.get("package") or ""
         managed_files = pr.get("managed_files", []) or []
-        managed_dirs = pr.get("managed_dirs", []) or []
-        managed_links = pr.get("managed_links", []) or []
 
         role_dir = os.path.join(roles_root, role)
         _write_role_scaffold(role_dir)
@@ -1914,16 +1328,10 @@ Generated from `{unit}`.
             notify_systemd="Run systemd daemon-reload",
         )
 
-        links_var = _build_managed_links_var(managed_links)
-
-        dirs_var = _build_managed_dirs_var(managed_dirs)
-
         jt_map = _yaml_load_mapping(jt_vars) if jt_vars.strip() else {}
         base_vars: Dict[str, Any] = {
             f"{var_prefix}_packages": pkgs,
             f"{var_prefix}_managed_files": files_var,
-            f"{var_prefix}_managed_dirs": dirs_var,
-            f"{var_prefix}_managed_links": links_var,
         }
         base_vars = _merge_mappings_overwrite(base_vars, jt_map)
 
@@ -1933,8 +1341,6 @@ Generated from `{unit}`.
                 {
                     f"{var_prefix}_packages": [],
                     f"{var_prefix}_managed_files": [],
-                    f"{var_prefix}_managed_dirs": [],
-                    f"{var_prefix}_managed_links": [],
                 },
             )
             _write_hostvars(out_dir, fqdn or "", role, base_vars)
@@ -1952,7 +1358,19 @@ Generated from `{unit}`.
             f.write(handlers)
 
         task_parts: List[str] = []
-        task_parts.append("---\n" + _render_install_packages_tasks(role, var_prefix))
+        task_parts.append(
+            f"""---
+# Generated by enroll (data-driven tasks)
+
+- name: Install packages for {role}
+  ansible.builtin.apt:
+    name: "{{{{ {var_prefix}_packages | default([]) }}}}"
+    state: present
+    update_cache: true
+  when: ({var_prefix}_packages | default([])) | length > 0
+
+"""
+        )
         task_parts.append(
             _render_generic_files_tasks(var_prefix, include_restart_notify=False)
         )
@@ -1977,9 +1395,6 @@ Generated for package `{pkg}`.
 ## Managed files
 {os.linesep.join("- " + mf["path"] + " (" + mf["reason"] + ")" for mf in managed_files) or "- (none)"}
 
-## Managed symlinks
-{os.linesep.join("- " + ml["path"] + " -> " + ml["target"] + " (" + ml.get("reason", "") + ")" for ml in managed_links) or "- (none)"}
-
 ## Excluded (possible secrets / unsafe)
 {os.linesep.join("- " + e["path"] + " (" + e["reason"] + ")" for e in excluded) or "- (none)"}
 
@@ -1992,26 +1407,12 @@ Generated for package `{pkg}`.
             f.write(readme)
 
         manifested_pkg_roles.append(role)
-    # Place cron/logrotate at the end of the playbook so:
-    #   - users exist before we restore per-user crontabs in /var/spool
-    #   - most packages/services are installed/configured first
-    tail_roles: List[str] = []
-    for r in ("cron", "logrotate"):
-        if r in manifested_pkg_roles:
-            tail_roles.append(r)
-
-    main_pkg_roles = [r for r in manifested_pkg_roles if r not in set(tail_roles)]
-
     all_roles = (
-        manifested_apt_config_roles
+        manifested_pkg_roles
-        + manifested_dnf_config_roles
-        + main_pkg_roles
         + manifested_service_roles
         + manifested_etc_custom_roles
         + manifested_usr_local_custom_roles
-        + manifested_extra_paths_roles
         + manifested_users_roles
-        + tail_roles
     )
 
     if site_mode:

enroll/pathfilter.py

@@ -1,293 +0,0 @@
-from __future__ import annotations
-
-import glob
-import os
-import re
-from dataclasses import dataclass
-from pathlib import PurePosixPath
-from typing import List, Optional, Sequence, Set, Tuple
-
-
-_REGEX_PREFIXES = ("re:", "regex:")
-
-
-def _has_glob_chars(s: str) -> bool:
-    return any(ch in s for ch in "*?[")
-
-
-def _norm_abs(p: str) -> str:
-    """Normalise a path-ish string to an absolute POSIX path.
-
-    We treat inputs that don't start with '/' as being relative to '/'.
-    """
-
-    p = p.strip()
-    if not p:
-        return "/"
-    if not p.startswith("/"):
-        p = "/" + p
-    # `normpath` keeps a leading '/' for absolute paths.
-    return os.path.normpath(p)
-
-
-def _posix_match(path: str, pattern: str) -> bool:
-    """Path matching with glob semantics.
-
-    Uses PurePosixPath.match which:
-      - treats '/' as a segment separator
-      - supports '**' for recursive matching
-
-    Both `path` and `pattern` are treated as absolute paths.
-    """
-
-    # PurePosixPath.match is anchored and works best on relative strings.
-    p = path.lstrip("/")
-    pat = pattern.lstrip("/")
-    try:
-        return PurePosixPath(p).match(pat)
-    except Exception:
-        # If the pattern is somehow invalid, fail closed.
-        return False
-
-
-def _regex_literal_prefix(regex: str) -> str:
-    """Best-effort literal prefix extraction for a regex.
-
-    This lets us pick a starting directory to walk when expanding regex-based
-    include patterns.
-    """
-
-    s = regex
-    if s.startswith("^"):
-        s = s[1:]
-    out: List[str] = []
-    escaped = False
-    meta = set(".^$*+?{}[]\\|()")
-    for ch in s:
-        if escaped:
-            out.append(ch)
-            escaped = False
-            continue
-        if ch == "\\":
-            escaped = True
-            continue
-        if ch in meta:
-            break
-        out.append(ch)
-    return "".join(out)
-
-
-@dataclass(frozen=True)
-class CompiledPathPattern:
-    raw: str
-    kind: str  # 'prefix' | 'glob' | 'regex'
-    value: str
-    regex: Optional[re.Pattern[str]] = None
-
-    def matches(self, path: str) -> bool:
-        p = _norm_abs(path)
-
-        if self.kind == "regex":
-            if not self.regex:
-                return False
-            # Search (not match) so users can write unanchored patterns.
-            return self.regex.search(p) is not None
-
-        if self.kind == "glob":
-            return _posix_match(p, self.value)
-
-        # prefix
-        pref = self.value.rstrip("/")
-        return p == pref or p.startswith(pref + "/")
-
-
-def compile_path_pattern(raw: str) -> CompiledPathPattern:
-    s = raw.strip()
-    for pre in _REGEX_PREFIXES:
-        if s.startswith(pre):
-            rex = s[len(pre) :].strip()
-            try:
-                return CompiledPathPattern(
-                    raw=raw, kind="regex", value=rex, regex=re.compile(rex)
-                )
-            except re.error:
-                # Treat invalid regexes as non-matching.
-                return CompiledPathPattern(raw=raw, kind="regex", value=rex, regex=None)
-
-    # If the user explicitly says glob:, honour it.
-    if s.startswith("glob:"):
-        pat = s[len("glob:") :].strip()
-        return CompiledPathPattern(raw=raw, kind="glob", value=_norm_abs(pat))
-
-    # Heuristic: if it contains glob metacharacters, treat as a glob.
-    if _has_glob_chars(s) or "**" in s:
-        return CompiledPathPattern(raw=raw, kind="glob", value=_norm_abs(s))
-
-    # Otherwise treat as an exact path-or-prefix (dir subtree).
-    return CompiledPathPattern(raw=raw, kind="prefix", value=_norm_abs(s))
-
-
-@dataclass
-class PathFilter:
-    """User-provided path filters.
-
-    Semantics:
-      - exclude patterns always win
-      - include patterns are used only to expand *additional* files to harvest
-        (they do not restrict the default harvest set)
-
-    Patterns:
-      - By default: glob-like (supports '**')
-      - Regex: prefix with 're:' or 'regex:'
-      - Force glob: prefix with 'glob:'
-      - A plain path without wildcards matches that path and everything under it
-        (directory-prefix behaviour).
-
-    Examples:
-      --exclude-path /usr/local/bin/docker-*
-      --include-path /home/*/.bashrc
-      --include-path 're:^/home/[^/]+/.config/myapp/.*$'
-    """
-
-    include: Sequence[str] = ()
-    exclude: Sequence[str] = ()
-
-    def __post_init__(self) -> None:
-        self._include = [
-            compile_path_pattern(p) for p in self.include if str(p).strip()
-        ]
-        self._exclude = [
-            compile_path_pattern(p) for p in self.exclude if str(p).strip()
-        ]
-
-    def is_excluded(self, path: str) -> bool:
-        for pat in self._exclude:
-            if pat.matches(path):
-                return True
-        return False
-
-    def iter_include_patterns(self) -> List[CompiledPathPattern]:
-        return list(self._include)
-
-
-def expand_includes(
-    patterns: Sequence[CompiledPathPattern],
-    *,
-    exclude: Optional[PathFilter] = None,
-    max_files: int,
-) -> Tuple[List[str], List[str]]:
-    """Expand include patterns into concrete file paths.
-
-    Returns (paths, notes). The returned paths are absolute paths.
-
-    This function is intentionally conservative:
-      - symlinks are ignored (both dirs and files)
-      - the number of collected files is capped
-
-    Regex patterns are expanded by walking a best-effort inferred root.
-    """
-
-    out: List[str] = []
-    notes: List[str] = []
-    seen: Set[str] = set()
-
-    def _maybe_add_file(p: str) -> None:
-        if len(out) >= max_files:
-            return
-        p = _norm_abs(p)
-        if exclude and exclude.is_excluded(p):
-            return
-        if p in seen:
-            return
-        if not os.path.isfile(p) or os.path.islink(p):
-            return
-        seen.add(p)
-        out.append(p)
-
-    def _walk_dir(root: str, match: Optional[CompiledPathPattern] = None) -> None:
-        root = _norm_abs(root)
-        if not os.path.isdir(root) or os.path.islink(root):
-            return
-        for dirpath, dirnames, filenames in os.walk(root, followlinks=False):
-            # Prune excluded directories early.
-            if exclude:
-                dirnames[:] = [
-                    d
-                    for d in dirnames
-                    if not exclude.is_excluded(os.path.join(dirpath, d))
-                    and not os.path.islink(os.path.join(dirpath, d))
-                ]
-            for fn in filenames:
-                if len(out) >= max_files:
-                    return
-                p = os.path.join(dirpath, fn)
-                if os.path.islink(p) or not os.path.isfile(p):
-                    continue
-                if exclude and exclude.is_excluded(p):
-                    continue
-                if match is not None and not match.matches(p):
-                    continue
-                if p in seen:
-                    continue
-                seen.add(p)
-                out.append(_norm_abs(p))
-
-    for pat in patterns:
-        if len(out) >= max_files:
-            notes.append(
-                f"Include cap reached ({max_files}); some includes were not expanded."
-            )
-            break
-
-        matched_any = False
-
-        if pat.kind == "prefix":
-            p = pat.value
-            if os.path.isfile(p) and not os.path.islink(p):
-                _maybe_add_file(p)
-                matched_any = True
-            elif os.path.isdir(p) and not os.path.islink(p):
-                before = len(out)
-                _walk_dir(p)
-                matched_any = len(out) > before
-            else:
-                # Still allow prefix patterns that don't exist now (e.g. remote different)
-                # by matching nothing rather than erroring.
-                matched_any = False
-
-        elif pat.kind == "glob":
-            # Use glob for expansion; also walk directories that match.
-            gpat = pat.value
-            hits = glob.glob(gpat, recursive=True)
-            for h in hits:
-                if len(out) >= max_files:
-                    break
-                h = _norm_abs(h)
-                if exclude and exclude.is_excluded(h):
-                    continue
-                if os.path.isdir(h) and not os.path.islink(h):
-                    before = len(out)
-                    _walk_dir(h)
-                    if len(out) > before:
-                        matched_any = True
-                elif os.path.isfile(h) and not os.path.islink(h):
-                    _maybe_add_file(h)
-                    matched_any = True
-
-        else:  # regex
-            rex = pat.value
-            prefix = _regex_literal_prefix(rex)
-            # Determine a walk root. If we can infer an absolute prefix, use its
-            # directory; otherwise fall back to '/'.
-            if prefix.startswith("/"):
-                root = os.path.dirname(prefix) or "/"
-            else:
-                root = "/"
-            before = len(out)
-            _walk_dir(root, match=pat)
-            matched_any = len(out) > before
-
-        if not matched_any:
-            notes.append(f"Include pattern matched no files: {pat.raw!r}")
-
-    return out, notes

enroll/platform.py

@@ -1,282 +0,0 @@
-from __future__ import annotations
-
-import shutil
-from dataclasses import dataclass
-from typing import Dict, List, Optional, Set, Tuple
-
-from .fsutil import file_md5
-
-
-def _read_os_release(path: str = "/etc/os-release") -> Dict[str, str]:
-    out: Dict[str, str] = {}
-    try:
-        with open(path, "r", encoding="utf-8", errors="replace") as f:
-            for raw in f:
-                line = raw.strip()
-                if not line or line.startswith("#") or "=" not in line:
-                    continue
-                k, v = line.split("=", 1)
-                k = k.strip()
-                v = v.strip().strip('"')
-                out[k] = v
-    except OSError:
-        return {}
-    return out
-
-
-@dataclass
-class PlatformInfo:
-    os_family: str  # debian|redhat|unknown
-    pkg_backend: str  # dpkg|rpm|unknown
-    os_release: Dict[str, str]
-
-
-def detect_platform() -> PlatformInfo:
-    """Detect platform family and package backend.
-
-    Uses /etc/os-release when available, with a conservative fallback to
-    checking for dpkg/rpm binaries.
-    """
-
-    osr = _read_os_release()
-    os_id = (osr.get("ID") or "").strip().lower()
-    likes = (osr.get("ID_LIKE") or "").strip().lower().split()
-
-    deb_ids = {"debian", "ubuntu", "linuxmint", "raspbian", "kali"}
-    rhel_ids = {
-        "fedora",
-        "rhel",
-        "centos",
-        "rocky",
-        "almalinux",
-        "ol",
-        "oracle",
-        "scientific",
-    }
-
-    if os_id in deb_ids or "debian" in likes:
-        return PlatformInfo(os_family="debian", pkg_backend="dpkg", os_release=osr)
-    if os_id in rhel_ids or any(
-        x in likes for x in ("rhel", "fedora", "centos", "redhat")
-    ):
-        return PlatformInfo(os_family="redhat", pkg_backend="rpm", os_release=osr)
-
-    # Fallback heuristics.
-    if shutil.which("dpkg"):
-        return PlatformInfo(os_family="debian", pkg_backend="dpkg", os_release=osr)
-    if shutil.which("rpm"):
-        return PlatformInfo(os_family="redhat", pkg_backend="rpm", os_release=osr)
-    return PlatformInfo(os_family="unknown", pkg_backend="unknown", os_release=osr)
-
-
-class PackageBackend:
-    """Backend abstraction for package ownership, config detection, and manual package lists."""
-
-    name: str
-    pkg_config_prefixes: Tuple[str, ...]
-
-    def owner_of_path(self, path: str) -> Optional[str]:  # pragma: no cover
-        raise NotImplementedError
-
-    def list_manual_packages(self) -> List[str]:  # pragma: no cover
-        raise NotImplementedError
-
-    def installed_packages(self) -> Dict[str, List[Dict[str, str]]]:  # pragma: no cover
-        """Return mapping of package name -> installed instances.
-
-        Each instance is a dict with at least:
-          - version: package version string
-          - arch: architecture string
-
-        Backends should be best-effort and return an empty mapping on failure.
-        """
-        raise NotImplementedError
-
-    def build_etc_index(
-        self,
-    ) -> Tuple[
-        Set[str], Dict[str, str], Dict[str, Set[str]], Dict[str, List[str]]
-    ]:  # pragma: no cover
-        raise NotImplementedError
-
-    def specific_paths_for_hints(self, hints: Set[str]) -> List[str]:
-        return []
-
-    def is_pkg_config_path(self, path: str) -> bool:
-        for pfx in self.pkg_config_prefixes:
-            if path == pfx or path.startswith(pfx):
-                return True
-        return False
-
-    def modified_paths(self, pkg: str, etc_paths: List[str]) -> Dict[str, str]:
-        """Return a mapping of modified file paths -> reason label."""
-        return {}
-
-
-class DpkgBackend(PackageBackend):
-    name = "dpkg"
-    pkg_config_prefixes = ("/etc/apt/",)
-
-    def __init__(self) -> None:
-        from .debian import parse_status_conffiles
-
-        self._conffiles_by_pkg = parse_status_conffiles()
-
-    def owner_of_path(self, path: str) -> Optional[str]:
-        from .debian import dpkg_owner
-
-        return dpkg_owner(path)
-
-    def list_manual_packages(self) -> List[str]:
-        from .debian import list_manual_packages
-
-        return list_manual_packages()
-
-    def installed_packages(self) -> Dict[str, List[Dict[str, str]]]:
-        from .debian import list_installed_packages
-
-        return list_installed_packages()
-
-    def build_etc_index(self):
-        from .debian import build_dpkg_etc_index
-
-        return build_dpkg_etc_index()
-
-    def specific_paths_for_hints(self, hints: Set[str]) -> List[str]:
-        paths: List[str] = []
-        for h in hints:
-            paths.extend(
-                [
-                    f"/etc/default/{h}",
-                    f"/etc/init.d/{h}",
-                    f"/etc/sysctl.d/{h}.conf",
-                ]
-            )
-        return paths
-
-    def modified_paths(self, pkg: str, etc_paths: List[str]) -> Dict[str, str]:
-        from .debian import read_pkg_md5sums
-
-        out: Dict[str, str] = {}
-        conff = self._conffiles_by_pkg.get(pkg, {})
-        md5sums = read_pkg_md5sums(pkg)
-
-        for path in etc_paths:
-            if not path.startswith("/etc/"):
-                continue
-            if self.is_pkg_config_path(path):
-                continue
-            if path in conff:
-                try:
-                    current = file_md5(path)
-                except OSError:
-                    continue
-                if current != conff[path]:
-                    out[path] = "modified_conffile"
-                continue
-
-            rel = path.lstrip("/")
-            baseline = md5sums.get(rel)
-            if baseline:
-                try:
-                    current = file_md5(path)
-                except OSError:
-                    continue
-                if current != baseline:
-                    out[path] = "modified_packaged_file"
-        return out
-
-
-class RpmBackend(PackageBackend):
-    name = "rpm"
-    pkg_config_prefixes = (
-        "/etc/dnf/",
-        "/etc/yum/",
-        "/etc/yum.repos.d/",
-        "/etc/yum.conf",
-    )
-
-    def __init__(self) -> None:
-        self._modified_cache: Dict[str, Set[str]] = {}
-        self._config_cache: Dict[str, Set[str]] = {}
-
-    def owner_of_path(self, path: str) -> Optional[str]:
-        from .rpm import rpm_owner
-
-        return rpm_owner(path)
-
-    def list_manual_packages(self) -> List[str]:
-        from .rpm import list_manual_packages
-
-        return list_manual_packages()
-
-    def installed_packages(self) -> Dict[str, List[Dict[str, str]]]:
-        from .rpm import list_installed_packages
-
-        return list_installed_packages()
-
-    def build_etc_index(self):
-        from .rpm import build_rpm_etc_index
-
-        return build_rpm_etc_index()
-
-    def specific_paths_for_hints(self, hints: Set[str]) -> List[str]:
-        paths: List[str] = []
-        for h in hints:
-            paths.extend(
-                [
-                    f"/etc/sysconfig/{h}",
-                    f"/etc/sysconfig/{h}.conf",
-                    f"/etc/sysctl.d/{h}.conf",
-                ]
-            )
-        return paths
-
-    def _config_files(self, pkg: str) -> Set[str]:
-        if pkg in self._config_cache:
-            return self._config_cache[pkg]
-        from .rpm import rpm_config_files
-
-        s = rpm_config_files(pkg)
-        self._config_cache[pkg] = s
-        return s
-
-    def _modified_files(self, pkg: str) -> Set[str]:
-        if pkg in self._modified_cache:
-            return self._modified_cache[pkg]
-        from .rpm import rpm_modified_files
-
-        s = rpm_modified_files(pkg)
-        self._modified_cache[pkg] = s
-        return s
-
-    def modified_paths(self, pkg: str, etc_paths: List[str]) -> Dict[str, str]:
-        out: Dict[str, str] = {}
-        modified = self._modified_files(pkg)
-        if not modified:
-            return out
-        config = self._config_files(pkg)
-
-        for path in etc_paths:
-            if not path.startswith("/etc/"):
-                continue
-            if self.is_pkg_config_path(path):
-                continue
-            if path not in modified:
-                continue
-            out[path] = (
-                "modified_conffile" if path in config else "modified_packaged_file"
-            )
-        return out
-
-
-def get_backend(info: Optional[PlatformInfo] = None) -> PackageBackend:
-    info = info or detect_platform()
-    if info.pkg_backend == "dpkg":
-        return DpkgBackend()
-    if info.pkg_backend == "rpm":
-        return RpmBackend()
-    # Unknown: be conservative and use an rpm backend if rpm exists, otherwise dpkg.
-    if shutil.which("rpm"):
-        return RpmBackend()
-    return DpkgBackend()

enroll/remote.py

@@ -1,117 +1,13 @@
 from __future__ import annotations
 
-import getpass
 import os
-import shlex
 import shutil
-import sys
-import time
 import tarfile
 import tempfile
 import zipapp
 from pathlib import Path
 from pathlib import PurePosixPath
-from typing import Optional, Callable, TextIO
+from typing import Optional
-
-
-class RemoteSudoPasswordRequired(RuntimeError):
-    """Raised when sudo requires a password but none was provided."""
-
-
-def _sudo_password_required(out: str, err: str) -> bool:
-    """Return True if sudo output indicates it needs a password/TTY."""
-    blob = (out + "\n" + err).lower()
-    patterns = (
-        "a password is required",
-        "password is required",
-        "a terminal is required to read the password",
-        "no tty present and no askpass program specified",
-        "must have a tty to run sudo",
-        "sudo: sorry, you must have a tty",
-        "askpass",
-    )
-    return any(p in blob for p in patterns)
-
-
-def _sudo_not_permitted(out: str, err: str) -> bool:
-    """Return True if sudo output indicates the user cannot sudo at all."""
-    blob = (out + "\n" + err).lower()
-    patterns = (
-        "is not in the sudoers file",
-        "not allowed to execute",
-        "may not run sudo",
-        "sorry, user",
-    )
-    return any(p in blob for p in patterns)
-
-
-def _sudo_tty_required(out: str, err: str) -> bool:
-    """Return True if sudo output indicates it requires a TTY (sudoers requiretty)."""
-    blob = (out + "\n" + err).lower()
-    patterns = (
-        "must have a tty",
-        "sorry, you must have a tty",
-        "sudo: sorry, you must have a tty",
-        "must have a tty to run sudo",
-    )
-    return any(p in blob for p in patterns)
-
-
-def _resolve_become_password(
-    ask_become_pass: bool,
-    *,
-    prompt: str = "sudo password: ",
-    getpass_fn: Callable[[str], str] = getpass.getpass,
-) -> Optional[str]:
-    if ask_become_pass:
-        return getpass_fn(prompt)
-    return None
-
-
-def remote_harvest(
-    *,
-    ask_become_pass: bool = False,
-    no_sudo: bool = False,
-    prompt: str = "sudo password: ",
-    getpass_fn: Optional[Callable[[str], str]] = None,
-    stdin: Optional[TextIO] = None,
-    **kwargs,
-):
-    """Call _remote_harvest, with a safe sudo password fallback.
-
-    Behavior:
-      - Run without a password unless --ask-become-pass is set.
-      - If the remote sudo policy requires a password and none was provided,
-        prompt and retry when running interactively.
-    """
-
-    # Resolve defaults at call time (easier to test/monkeypatch, and avoids capturing
-    # sys.stdin / getpass.getpass at import time).
-    if getpass_fn is None:
-        getpass_fn = getpass.getpass
-    if stdin is None:
-        stdin = sys.stdin
-
-    sudo_password = _resolve_become_password(
-        ask_become_pass and not no_sudo,
-        prompt=prompt,
-        getpass_fn=getpass_fn,
-    )
-
-    try:
-        return _remote_harvest(sudo_password=sudo_password, no_sudo=no_sudo, **kwargs)
-    except RemoteSudoPasswordRequired:
-        if sudo_password is not None:
-            raise
-
-        # Fallback prompt if interactive
-        if stdin is not None and getattr(stdin, "isatty", lambda: False)():
-            pw = getpass_fn(prompt)
-            return _remote_harvest(sudo_password=pw, no_sudo=no_sudo, **kwargs)
-
-        raise RemoteSudoPasswordRequired(
-            "Remote sudo requires a password. Re-run with --ask-become-pass."
-        )
 
 
 def _safe_extract_tar(tar: tarfile.TarFile, dest: Path) -> None:
@@ -119,6 +15,7 @@ def _safe_extract_tar(tar: tarfile.TarFile, dest: Path) -> None:
 
     Protects against path traversal (e.g. entries containing ../).
     """
+
     # Note: tar member names use POSIX separators regardless of platform.
     dest = dest.resolve()
 
@@ -182,168 +79,30 @@ def _build_enroll_pyz(tmpdir: Path) -> Path:
     return pyz_path
 
 
-def _ssh_run(
+def _ssh_run(ssh, cmd: str) -> tuple[int, str, str]:
-    ssh,
+    """Run a command over a Paramiko SSHClient."""
-    cmd: str,
+    _stdin, stdout, stderr = ssh.exec_command(cmd)
-    *,
+    out = stdout.read().decode("utf-8", errors="replace")
-    get_pty: bool = False,
+    err = stderr.read().decode("utf-8", errors="replace")
-    stdin_text: Optional[str] = None,
+    rc = stdout.channel.recv_exit_status()
-    close_stdin: bool = False,
-) -> tuple[int, str, str]:
-    """Run a command over a Paramiko SSHClient.
-
-    Paramiko's exec_command runs commands without a TTY by default.
-    Some hosts have sudoers "requiretty" enabled, which causes sudo to
-    fail even when passwordless sudo is configured. For those commands,
-    request a PTY.
-
-    We do not request a PTY for commands that stream binary data
-    (e.g. tar/gzip output), as a PTY can corrupt the byte stream.
-    """
-    stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=get_pty)
-    # All three file-like objects share the same underlying Channel.
-    chan = stdout.channel
-
-    if stdin_text is not None and stdin is not None:
-        try:
-            stdin.write(stdin_text)
-            stdin.flush()
-        except Exception:
-            # If the remote side closed stdin early, ignore.
-            pass  # nosec
-        finally:
-            if close_stdin:
-                # For sudo -S, a wrong password causes sudo to re-prompt and wait
-                # forever for more input. We try hard to deliver EOF so sudo can
-                # fail fast.
-                try:
-                    chan.shutdown_write()  # sends EOF to the remote process
-                except Exception:
-                    pass  # nosec
-                try:
-                    stdin.close()
-                except Exception:
-                    pass  # nosec
-
-    # Read incrementally to avoid blocking forever on stdout.read()/stderr.read()
-    # if the remote process is waiting for more input (e.g. sudo password retry).
-    out_chunks: list[bytes] = []
-    err_chunks: list[bytes] = []
-    # Keep a small tail of stderr to detect sudo retry messages without
-    # repeatedly joining potentially large buffers.
-    err_tail = b""
-
-    while True:
-        progressed = False
-        if chan.recv_ready():
-            out_chunks.append(chan.recv(1024 * 64))
-            progressed = True
-        if chan.recv_stderr_ready():
-            chunk = chan.recv_stderr(1024 * 64)
-            err_chunks.append(chunk)
-            err_tail = (err_tail + chunk)[-4096:]
-            progressed = True
-
-        # If we just attempted sudo -S with a single password line and sudo is
-        # asking again, detect it and stop waiting.
-        if close_stdin and stdin_text is not None:
-            blob = err_tail.lower()
-            if b"sorry, try again" in blob or b"incorrect password" in blob:
-                try:
-                    chan.close()
-                except Exception:
-                    pass  # nosec
-                break
-
-        # Exit once the process has exited and we have drained the buffers.
-        if (
-            chan.exit_status_ready()
-            and not chan.recv_ready()
-            and not chan.recv_stderr_ready()
-        ):
-            break
-
-        if not progressed:
-            time.sleep(0.05)
-
-    out = b"".join(out_chunks).decode("utf-8", errors="replace")
-    err = b"".join(err_chunks).decode("utf-8", errors="replace")
-    rc = chan.recv_exit_status() if chan.exit_status_ready() else 1
     return rc, out, err
 
 
-def _ssh_run_sudo(
+def remote_harvest(
-    ssh,
-    cmd: str,
-    *,
-    sudo_password: Optional[str] = None,
-    get_pty: bool = True,
-) -> tuple[int, str, str]:
-    """Run cmd via sudo with a safe non-interactive-first strategy.
-
-    Strategy:
-      1) Try `sudo -n`.
-      2) If sudo reports a password is required and we have one, retry with
-         `sudo -S` and feed it via stdin.
-      3) If sudo reports a password is required and we *don't* have one, raise
-         RemoteSudoPasswordRequired.
-
-    We avoid requesting a PTY unless the remote sudo policy requires it.
-    This makes sudo -S behavior more reliable (wrong passwords fail fast
-    instead of blocking on a PTY).
-    """
-    cmd_n = f"sudo -n -p '' -- {cmd}"
-
-    # First try: never prompt, and prefer no PTY.
-    rc, out, err = _ssh_run(ssh, cmd_n, get_pty=False)
-    need_pty = False
-
-    # Some sudoers configurations require a TTY even for passwordless sudo.
-    if get_pty and rc != 0 and _sudo_tty_required(out, err):
-        need_pty = True
-        rc, out, err = _ssh_run(ssh, cmd_n, get_pty=True)
-
-    if rc == 0:
-        return rc, out, err
-
-    if _sudo_not_permitted(out, err):
-        return rc, out, err
-
-    if _sudo_password_required(out, err):
-        if sudo_password is None:
-            raise RemoteSudoPasswordRequired(
-                "Remote sudo requires a password, but none was provided."
-            )
-        cmd_s = f"sudo -S -p '' -- {cmd}"
-        return _ssh_run(
-            ssh,
-            cmd_s,
-            get_pty=need_pty,
-            stdin_text=str(sudo_password) + "\n",
-            close_stdin=True,
-        )
-
-    return rc, out, err
-
-
-def _remote_harvest(
     *,
     local_out_dir: Path,
     remote_host: str,
-    remote_port: Optional[int] = None,
+    remote_port: int = 22,
     remote_user: Optional[str] = None,
-    remote_ssh_config: Optional[str] = None,
     remote_python: str = "python3",
     dangerous: bool = False,
     no_sudo: bool = False,
-    sudo_password: Optional[str] = None,
-    include_paths: Optional[list[str]] = None,
-    exclude_paths: Optional[list[str]] = None,
 ) -> Path:
     """Run enroll harvest on a remote host via SSH and pull the bundle locally.
 
     Returns the local path to state.json inside local_out_dir.
     """
+
     try:
         import paramiko  # type: ignore
     except Exception as e:
@@ -371,113 +130,12 @@ def _remote_harvest(
         # Users should add the key to known_hosts.
         ssh.set_missing_host_key_policy(paramiko.RejectPolicy())
 
-        # Resolve SSH connection parameters.
-        connect_host = remote_host
-        connect_port = int(remote_port) if remote_port is not None else 22
-        connect_user = remote_user
-        key_filename = None
-        sock = None
-        hostkey_name = connect_host
-
-        # Timeouts derived from ssh_config if set (ConnectTimeout).
-        # Used both for socket connect (when we create one) and Paramiko handshake/auth.
-        connect_timeout: Optional[float] = None
-
-        if remote_ssh_config:
-            from paramiko.config import SSHConfig  # type: ignore
-            from paramiko.proxy import ProxyCommand  # type: ignore
-            import socket as _socket
-
-            cfg_path = Path(str(remote_ssh_config)).expanduser()
-            if not cfg_path.exists():
-                raise RuntimeError(f"SSH config file not found: {cfg_path}")
-
-            cfg = SSHConfig()
-            with cfg_path.open("r", encoding="utf-8") as _fp:
-                cfg.parse(_fp)
-            hcfg = cfg.lookup(remote_host)
-
-            connect_host = str(hcfg.get("hostname") or remote_host)
-            hostkey_name = str(hcfg.get("hostkeyalias") or connect_host)
-
-            if remote_port is None and hcfg.get("port"):
-                try:
-                    connect_port = int(str(hcfg.get("port")))
-                except ValueError:
-                    pass
-            if connect_user is None and hcfg.get("user"):
-                connect_user = str(hcfg.get("user"))
-
-            ident = hcfg.get("identityfile")
-            if ident:
-                if isinstance(ident, (list, tuple)):
-                    key_filename = [str(Path(p).expanduser()) for p in ident]
-                else:
-                    key_filename = str(Path(str(ident)).expanduser())
-
-            # Honour OpenSSH ConnectTimeout (seconds) if present.
-            if hcfg.get("connecttimeout"):
-                try:
-                    connect_timeout = float(str(hcfg.get("connecttimeout")))
-                except (TypeError, ValueError):
-                    connect_timeout = None
-
-            proxycmd = hcfg.get("proxycommand")
-
-            # AddressFamily support: inet (IPv4 only), inet6 (IPv6 only), any (default).
-            addrfam = str(hcfg.get("addressfamily") or "any").strip().lower()
-            family: Optional[int] = None
-            if addrfam == "inet":
-                family = _socket.AF_INET
-            elif addrfam == "inet6":
-                family = _socket.AF_INET6
-
-            if proxycmd:
-                # ProxyCommand provides the transport; AddressFamily doesn't apply here.
-                sock = ProxyCommand(str(proxycmd))
-            elif family is not None:
-                # Enforce the requested address family by pre-connecting the socket and
-                # passing it into Paramiko via sock=.
-                last_err: Optional[OSError] = None
-                infos = _socket.getaddrinfo(
-                    connect_host, connect_port, family, _socket.SOCK_STREAM
-                )
-                for af, socktype, proto, _, sa in infos:
-                    s = _socket.socket(af, socktype, proto)
-                    if connect_timeout is not None:
-                        s.settimeout(connect_timeout)
-                    try:
-                        s.connect(sa)
-                        sock = s
-                        break
-                    except OSError as e:
-                        last_err = e
-                        try:
-                            s.close()
-                        except Exception:
-                            pass  # nosec
-                if sock is None and last_err is not None:
-                    raise last_err
-            elif hostkey_name != connect_host:
-                # If HostKeyAlias is used, connect to HostName via a socket but
-                # use HostKeyAlias for known_hosts lookups.
-                sock = _socket.create_connection(
-                    (connect_host, connect_port), timeout=connect_timeout
-                )
-
-        # If we created a socket (sock!=None), pass hostkey_name as hostname so
-        # known_hosts lookup uses HostKeyAlias (or whatever hostkey_name resolved to).
         ssh.connect(
-            hostname=hostkey_name if sock is not None else connect_host,
+            hostname=remote_host,
-            port=connect_port,
+            port=int(remote_port),
-            username=connect_user,
+            username=remote_user,
-            key_filename=key_filename,
-            sock=sock,
             allow_agent=True,
             look_for_keys=True,
-            timeout=connect_timeout,
-            banner_timeout=connect_timeout,
-            auth_timeout=connect_timeout,
         )
 
         # If no username was explicitly provided, SSH may have selected a default.
@@ -507,59 +165,36 @@ def _remote_harvest(
             sftp.put(str(pyz), rapp)
 
             # Run remote harvest.
-            argv: list[str] = [
+            _cmd = f"{remote_python} {rapp} harvest --out {rbundle}"
-                remote_python,
-                rapp,
-                "harvest",
-                "--out",
-                rbundle,
-            ]
-            if dangerous:
-                argv.append("--dangerous")
-            for p in include_paths or []:
-                argv.extend(["--include-path", str(p)])
-            for p in exclude_paths or []:
-                argv.extend(["--exclude-path", str(p)])
-
-            _cmd = " ".join(map(shlex.quote, argv))
             if not no_sudo:
-                # Prefer non-interactive sudo first; retry with -S only when needed.
-                rc, out, err = _ssh_run_sudo(
-                    ssh, _cmd, sudo_password=sudo_password, get_pty=True
-                )
                 cmd = f"sudo {_cmd}"
             else:
                 cmd = _cmd
-                rc, out, err = _ssh_run(ssh, cmd, get_pty=False)
+            if dangerous:
+                cmd += " --dangerous"
+            rc, out, err = _ssh_run(ssh, cmd)
             if rc != 0:
                 raise RuntimeError(
                     "Remote harvest failed.\n"
                     f"Command: {cmd}\n"
                     f"Exit code: {rc}\n"
-                    f"Stdout: {out.strip()}\n"
                     f"Stderr: {err.strip()}"
                 )
 
             if not no_sudo:
-                # Ensure user can read the files, before we tar it.
+                # Ensure user can read the files, before we tar it
                 if not resolved_user:
                     raise RuntimeError(
                         "Unable to determine remote username for chown. "
                         "Pass --remote-user explicitly or use --no-sudo."
                     )
-                chown_cmd = f"chown -R {resolved_user} {rbundle}"
+                cmd = f"sudo chown -R {resolved_user} {rbundle}"
-                rc, out, err = _ssh_run_sudo(
+                rc, out, err = _ssh_run(ssh, cmd)
-                    ssh,
-                    chown_cmd,
-                    sudo_password=sudo_password,
-                    get_pty=True,
-                )
                 if rc != 0:
                     raise RuntimeError(
                         "chown of harvest failed.\n"
-                        f"Command: sudo {chown_cmd}\n"
+                        f"Command: {cmd}\n"
                         f"Exit code: {rc}\n"
-                        f"Stdout: {out.strip()}\n"
                         f"Stderr: {err.strip()}"
                     )
 

enroll/rpm.py

@@ -1,323 +0,0 @@
-from __future__ import annotations
-
-import os
-import re
-import shutil
-import subprocess  # nosec
-from typing import Dict, List, Optional, Set, Tuple
-
-
-def _run(
-    cmd: list[str], *, allow_fail: bool = False, merge_err: bool = False
-) -> tuple[int, str]:
-    """Run a command and return (rc, stdout).
-
-    If merge_err is True, stderr is merged into stdout to preserve ordering.
-    """
-    p = subprocess.run(
-        cmd,
-        check=False,
-        text=True,
-        stdout=subprocess.PIPE,
-        stderr=(subprocess.STDOUT if merge_err else subprocess.PIPE),
-    )  # nosec
-    out = p.stdout or ""
-    if (not allow_fail) and p.returncode != 0:
-        err = "" if merge_err else (p.stderr or "")
-        raise RuntimeError(f"Command failed: {cmd}\n{err}{out}")
-    return p.returncode, out
-
-
-def rpm_owner(path: str) -> Optional[str]:
-    """Return owning package name for a path, or None if unowned."""
-    if not path:
-        return None
-    rc, out = _run(
-        ["rpm", "-qf", "--qf", "%{NAME}\n", path], allow_fail=True, merge_err=True
-    )
-    if rc != 0:
-        return None
-    for line in out.splitlines():
-        line = line.strip()
-        if not line:
-            continue
-        if "is not owned" in line:
-            return None
-        # With --qf we expect just the package name.
-        if re.match(r"^[A-Za-z0-9_.+:-]+$", line):
-            # Strip any accidental epoch/name-version-release output.
-            return line.split(":", 1)[-1].strip() if line else None
-    return None
-
-
-_ARCH_SUFFIXES = {
-    "noarch",
-    "x86_64",
-    "i686",
-    "aarch64",
-    "armv7hl",
-    "ppc64le",
-    "s390x",
-    "riscv64",
-}
-
-
-def _strip_arch(token: str) -> str:
-    """Strip a trailing .ARCH from a yum/dnf package token."""
-    t = token.strip()
-    if "." not in t:
-        return t
-    head, tail = t.rsplit(".", 1)
-    if tail in _ARCH_SUFFIXES:
-        return head
-    return t
-
-
-def list_manual_packages() -> List[str]:
-    """Return packages considered "user-installed" on RPM-based systems.
-
-    Best-effort:
-      1) dnf repoquery --userinstalled
-      2) dnf history userinstalled
-      3) yum history userinstalled
-
-    If none are available, returns an empty list.
-    """
-
-    def _dedupe(pkgs: List[str]) -> List[str]:
-        return sorted({p for p in (pkgs or []) if p})
-
-    if shutil.which("dnf"):
-        # Prefer a machine-friendly output.
-        for cmd in (
-            ["dnf", "-q", "repoquery", "--userinstalled", "--qf", "%{name}\n"],
-            ["dnf", "-q", "repoquery", "--userinstalled"],
-        ):
-            rc, out = _run(cmd, allow_fail=True, merge_err=True)
-            if rc == 0 and out.strip():
-                pkgs = []
-                for line in out.splitlines():
-                    line = line.strip()
-                    if not line or line.startswith("Loaded plugins"):
-                        continue
-                    pkgs.append(_strip_arch(line.split()[0]))
-                if pkgs:
-                    return _dedupe(pkgs)
-
-        # Fallback
-        rc, out = _run(
-            ["dnf", "-q", "history", "userinstalled"], allow_fail=True, merge_err=True
-        )
-        if rc == 0 and out.strip():
-            pkgs = []
-            for line in out.splitlines():
-                line = line.strip()
-                if not line or line.startswith("Installed") or line.startswith("Last"):
-                    continue
-                # Often: "vim-enhanced.x86_64"
-                tok = line.split()[0]
-                pkgs.append(_strip_arch(tok))
-            if pkgs:
-                return _dedupe(pkgs)
-
-    if shutil.which("yum"):
-        rc, out = _run(
-            ["yum", "-q", "history", "userinstalled"], allow_fail=True, merge_err=True
-        )
-        if rc == 0 and out.strip():
-            pkgs = []
-            for line in out.splitlines():
-                line = line.strip()
-                if (
-                    not line
-                    or line.startswith("Installed")
-                    or line.startswith("Loaded")
-                ):
-                    continue
-                tok = line.split()[0]
-                pkgs.append(_strip_arch(tok))
-            if pkgs:
-                return _dedupe(pkgs)
-
-    return []
-
-
-def list_installed_packages() -> Dict[str, List[Dict[str, str]]]:
-    """Return mapping of installed package name -> installed instances.
-
-    Uses `rpm -qa` and is expected to work on RHEL/Fedora-like systems.
-
-    Output format:
-      {"pkg": [{"version": "...", "arch": "..."}, ...], ...}
-
-    The version string is formatted as:
-      - "<version>-<release>" for typical packages
-      - "<epoch>:<version>-<release>" if a non-zero epoch is present
-    """
-
-    try:
-        _, out = _run(
-            [
-                "rpm",
-                "-qa",
-                "--qf",
-                "%{NAME}\t%{EPOCHNUM}\t%{VERSION}\t%{RELEASE}\t%{ARCH}\n",
-            ],
-            allow_fail=False,
-            merge_err=True,
-        )
-    except Exception:
-        return {}
-
-    pkgs: Dict[str, List[Dict[str, str]]] = {}
-    for raw in (out or "").splitlines():
-        line = raw.strip("\n")
-        if not line:
-            continue
-        parts = line.split("\t")
-        if len(parts) < 5:
-            continue
-        name, epoch, ver, rel, arch = [p.strip() for p in parts[:5]]
-        if not name or not ver:
-            continue
-
-        # Normalise epoch.
-        epoch = epoch.strip()
-        if epoch.lower() in ("(none)", "none", ""):
-            epoch = "0"
-
-        v = f"{ver}-{rel}" if rel else ver
-        if epoch and epoch.isdigit() and epoch != "0":
-            v = f"{epoch}:{v}"
-
-        pkgs.setdefault(name, []).append({"version": v, "arch": arch})
-
-    for k in list(pkgs.keys()):
-        pkgs[k] = sorted(
-            pkgs[k], key=lambda x: (x.get("arch") or "", x.get("version") or "")
-        )
-    return pkgs
-
-
-def _walk_etc_files() -> List[str]:
-    out: List[str] = []
-    for dirpath, _, filenames in os.walk("/etc"):
-        for fn in filenames:
-            p = os.path.join(dirpath, fn)
-            if os.path.islink(p) or not os.path.isfile(p):
-                continue
-            out.append(p)
-    return out
-
-
-def build_rpm_etc_index() -> (
-    Tuple[Set[str], Dict[str, str], Dict[str, Set[str]], Dict[str, List[str]]]
-):
-    """Best-effort equivalent of build_dpkg_etc_index for RPM systems.
-
-    This builds indexes by walking the live /etc tree and querying RPM ownership
-    for each file.
-
-    Returns:
-      owned_etc_paths: set of /etc paths owned by rpm
-      etc_owner_map: /etc/path -> pkg
-      topdir_to_pkgs: "nginx" -> {"nginx", ...} based on /etc/<topdir>/...
-      pkg_to_etc_paths: pkg -> list of owned /etc paths
-    """
-
-    owned: Set[str] = set()
-    owner: Dict[str, str] = {}
-    topdir_to_pkgs: Dict[str, Set[str]] = {}
-    pkg_to_etc: Dict[str, List[str]] = {}
-
-    paths = _walk_etc_files()
-
-    # Query in chunks to avoid excessive process spawns.
-    chunk_size = 250
-
-    not_owned_re = re.compile(
-        r"^file\s+(?P<path>.+?)\s+is\s+not\s+owned\s+by\s+any\s+package", re.IGNORECASE
-    )
-
-    for i in range(0, len(paths), chunk_size):
-        chunk = paths[i : i + chunk_size]
-        rc, out = _run(
-            ["rpm", "-qf", "--qf", "%{NAME}\n", *chunk],
-            allow_fail=True,
-            merge_err=True,
-        )
-
-        lines = [ln.strip() for ln in out.splitlines() if ln.strip()]
-        # Heuristic: rpm prints one output line per input path. If that isn't
-        # true (warnings/errors), fall back to per-file queries for this chunk.
-        if len(lines) != len(chunk):
-            for p in chunk:
-                pkg = rpm_owner(p)
-                if not pkg:
-                    continue
-                owned.add(p)
-                owner.setdefault(p, pkg)
-                pkg_to_etc.setdefault(pkg, []).append(p)
-                parts = p.split("/", 3)
-                if len(parts) >= 3 and parts[2]:
-                    topdir_to_pkgs.setdefault(parts[2], set()).add(pkg)
-            continue
-
-        for pth, line in zip(chunk, lines):
-            if not line:
-                continue
-            if not_owned_re.match(line) or "is not owned" in line:
-                continue
-            pkg = line.split()[0].strip()
-            if not pkg:
-                continue
-            owned.add(pth)
-            owner.setdefault(pth, pkg)
-            pkg_to_etc.setdefault(pkg, []).append(pth)
-            parts = pth.split("/", 3)
-            if len(parts) >= 3 and parts[2]:
-                topdir_to_pkgs.setdefault(parts[2], set()).add(pkg)
-
-    for k, v in list(pkg_to_etc.items()):
-        pkg_to_etc[k] = sorted(set(v))
-
-    return owned, owner, topdir_to_pkgs, pkg_to_etc
-
-
-def rpm_config_files(pkg: str) -> Set[str]:
-    """Return config files for a package (rpm -qc)."""
-    rc, out = _run(["rpm", "-qc", pkg], allow_fail=True, merge_err=True)
-    if rc != 0:
-        return set()
-    files: Set[str] = set()
-    for line in out.splitlines():
-        line = line.strip()
-        if line.startswith("/"):
-            files.add(line)
-    return files
-
-
-def rpm_modified_files(pkg: str) -> Set[str]:
-    """Return files reported as modified by rpm verification (rpm -V).
-
-    rpm -V only prints lines for differences/missing files.
-    """
-    rc, out = _run(["rpm", "-V", pkg], allow_fail=True, merge_err=True)
-    # rc is non-zero when there are differences; we still want the output.
-    files: Set[str] = set()
-    for raw in out.splitlines():
-        line = raw.strip()
-        if not line:
-            continue
-        # Typical forms:
-        #   S.5....T.  c /etc/foo.conf
-        #   missing   /etc/bar
-        m = re.search(r"\s(/\S+)$", line)
-        if m:
-            files.add(m.group(1))
-            continue
-        if line.startswith("missing"):
-            parts = line.split()
-            if parts and parts[-1].startswith("/"):
-                files.add(parts[-1])
-    return files

enroll/schema/__init__.py

@@ -1,4 +0,0 @@
-"""Vendored JSON schemas.
-
-These are used by `enroll validate` so validation can run offline.
-"""

enroll/schema/state.schema.json

@@ -1,712 +0,0 @@
-{
-  "$defs": {
-    "AptConfigSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "role_name": {
-              "const": "apt_config"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "DnfConfigSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "role_name": {
-              "const": "dnf_config"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "EtcCustomSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "role_name": {
-              "const": "etc_custom"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "ExcludedFile": {
-      "additionalProperties": false,
-      "properties": {
-        "path": {
-          "minLength": 1,
-          "pattern": "^/.*",
-          "type": "string"
-        },
-        "reason": {
-          "enum": [
-            "user_excluded",
-            "unreadable",
-	    "backup_file",
-            "log_file",
-            "denied_path",
-            "too_large",
-            "not_regular_file",
-            "not_symlink",
-            "binary_like",
-            "sensitive_content"
-          ],
-          "type": "string"
-        }
-      },
-      "required": [
-        "path",
-        "reason"
-      ],
-      "type": "object"
-    },
-    "ExtraPathsSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "exclude_patterns": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            "include_patterns": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            "role_name": {
-              "const": "extra_paths"
-            }
-          },
-          "required": [
-            "include_patterns",
-            "exclude_patterns"
-          ],
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "InstalledPackageInstance": {
-      "additionalProperties": false,
-      "properties": {
-        "arch": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "version": {
-          "minLength": 1,
-          "type": "string"
-        }
-      },
-      "required": [
-        "version",
-        "arch"
-      ],
-      "type": "object"
-    },
-    "ManagedDir": {
-      "additionalProperties": false,
-      "properties": {
-        "group": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "mode": {
-          "pattern": "^[0-7]{4}$",
-          "type": "string"
-        },
-        "owner": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "path": {
-          "minLength": 1,
-          "pattern": "^/.*",
-          "type": "string"
-        },
-        "reason": {
-          "enum": [
-            "parent_of_managed_file",
-            "user_include_dir"
-          ],
-          "type": "string"
-        }
-      },
-      "required": [
-        "path",
-        "owner",
-        "group",
-        "mode",
-        "reason"
-      ],
-      "type": "object"
-    },
-    "ManagedFile": {
-      "additionalProperties": false,
-      "properties": {
-        "group": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "mode": {
-          "pattern": "^[0-7]{4}$",
-          "type": "string"
-        },
-        "owner": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "path": {
-          "minLength": 1,
-          "pattern": "^/.*",
-          "type": "string"
-        },
-        "reason": {
-          "enum": [
-            "apt_config",
-            "apt_keyring",
-            "apt_signed_by_keyring",
-            "apt_source",
-            "authorized_keys",
-            "cron_snippet",
-            "custom_specific_path",
-            "custom_unowned",
-            "dnf_config",
-            "logrotate_snippet",
-            "modified_conffile",
-            "modified_packaged_file",
-            "related_timer",
-            "rpm_gpg_key",
-            "ssh_public_key",
-            "system_cron",
-            "system_firewall",
-            "system_logrotate",
-            "system_modprobe",
-            "system_mounts",
-            "system_network",
-            "system_rc",
-            "system_security",
-            "system_sysctl",
-            "systemd_dropin",
-            "systemd_envfile",
-            "user_include",
-            "user_profile",
-            "user_shell_aliases",
-            "user_shell_logout",
-            "user_shell_rc",
-            "usr_local_bin_script",
-            "usr_local_etc_custom",
-            "yum_conf",
-            "yum_config",
-            "yum_repo"
-          ],
-          "type": "string"
-        },
-        "src_rel": {
-          "minLength": 1,
-          "pattern": "^[^/].*",
-          "type": "string"
-        }
-      },
-      "required": [
-        "path",
-        "src_rel",
-        "owner",
-        "group",
-        "mode",
-        "reason"
-      ],
-      "type": "object"
-    },
-    "ManagedLink": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "path": {
-          "type": "string",
-          "minLength": 1,
-          "pattern": "^/.*"
-        },
-        "target": {
-          "type": "string",
-          "minLength": 1
-        },
-        "reason": {
-          "type": "string",
-          "enum": [
-            "enabled_symlink"
-          ]
-        }
-      },
-      "required": [
-        "path",
-        "target",
-        "reason"
-      ]
-    },
-    "ObservedVia": {
-      "oneOf": [
-        {
-          "additionalProperties": false,
-          "properties": {
-            "kind": {
-              "const": "user_installed"
-            }
-          },
-          "required": [
-            "kind"
-          ],
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "kind": {
-              "const": "systemd_unit"
-            },
-            "ref": {
-              "minLength": 1,
-              "type": "string"
-            }
-          },
-          "required": [
-            "kind",
-            "ref"
-          ],
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "kind": {
-              "const": "package_role"
-            },
-            "ref": {
-              "minLength": 1,
-              "type": "string"
-            }
-          },
-          "required": [
-            "kind",
-            "ref"
-          ],
-          "type": "object"
-        }
-      ]
-    },
-    "PackageInventoryEntry": {
-      "additionalProperties": false,
-      "properties": {
-        "arches": {
-          "items": {
-            "minLength": 1,
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "installations": {
-          "items": {
-            "$ref": "#/$defs/InstalledPackageInstance"
-          },
-          "type": "array"
-        },
-        "observed_via": {
-          "items": {
-            "$ref": "#/$defs/ObservedVia"
-          },
-          "type": "array"
-        },
-        "roles": {
-          "items": {
-            "minLength": 1,
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "version": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "version",
-        "arches",
-        "installations",
-        "observed_via",
-        "roles"
-      ],
-      "type": "object"
-    },
-    "PackageSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "package": {
-              "minLength": 1,
-              "type": "string"
-            }
-          },
-          "required": [
-            "package"
-          ],
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "RoleCommon": {
-      "properties": {
-        "excluded": {
-          "items": {
-            "$ref": "#/$defs/ExcludedFile"
-          },
-          "type": "array"
-        },
-        "managed_dirs": {
-          "items": {
-            "$ref": "#/$defs/ManagedDir"
-          },
-          "type": "array"
-        },
-        "managed_files": {
-          "items": {
-            "$ref": "#/$defs/ManagedFile"
-          },
-          "type": "array"
-        },
-        "managed_links": {
-          "items": {
-            "$ref": "#/$defs/ManagedLink"
-          },
-          "type": "array"
-        },
-        "notes": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "role_name": {
-          "minLength": 1,
-          "pattern": "^[A-Za-z0-9_]+$",
-          "type": "string"
-        }
-      },
-      "required": [
-        "role_name",
-        "managed_dirs",
-        "managed_files",
-        "excluded",
-        "notes"
-      ],
-      "type": "object"
-    },
-    "ServiceSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "active_state": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "condition_result": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "packages": {
-              "items": {
-                "minLength": 1,
-                "type": "string"
-              },
-              "type": "array"
-            },
-            "role_name": {
-              "minLength": 1,
-              "pattern": "^[a-z_][a-z0-9_]*$",
-              "type": "string"
-            },
-            "sub_state": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "unit": {
-              "minLength": 1,
-              "type": "string"
-            },
-            "unit_file_state": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "required": [
-            "unit",
-            "packages",
-            "active_state",
-            "sub_state",
-            "unit_file_state",
-            "condition_result"
-          ],
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "UserEntry": {
-      "additionalProperties": false,
-      "properties": {
-        "gecos": {
-          "type": "string"
-        },
-        "gid": {
-          "minimum": 0,
-          "type": "integer"
-        },
-        "home": {
-          "type": "string"
-        },
-        "name": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "primary_group": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "shell": {
-          "type": "string"
-        },
-        "supplementary_groups": {
-          "items": {
-            "minLength": 1,
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "uid": {
-          "minimum": 0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "name",
-        "uid",
-        "gid",
-        "gecos",
-        "home",
-        "shell",
-        "primary_group",
-        "supplementary_groups"
-      ],
-      "type": "object"
-    },
-    "UsersSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "role_name": {
-              "const": "users"
-            },
-            "users": {
-              "items": {
-                "$ref": "#/$defs/UserEntry"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "users"
-          ],
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    },
-    "UsrLocalCustomSnapshot": {
-      "allOf": [
-        {
-          "$ref": "#/$defs/RoleCommon"
-        },
-        {
-          "properties": {
-            "role_name": {
-              "const": "usr_local_custom"
-            }
-          },
-          "type": "object"
-        }
-      ],
-      "unevaluatedProperties": false
-    }
-  },
-  "$id": "https://enroll.sh/schema/state.schema.json",
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "additionalProperties": false,
-  "properties": {
-    "enroll": {
-      "additionalProperties": false,
-      "properties": {
-        "harvest_time": {
-          "minimum": 0,
-          "type": "integer"
-        },
-        "version": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "version",
-        "harvest_time"
-      ],
-      "type": "object"
-    },
-    "host": {
-      "additionalProperties": false,
-      "properties": {
-        "hostname": {
-          "minLength": 1,
-          "type": "string"
-        },
-        "os": {
-          "enum": [
-            "debian",
-            "redhat",
-            "unknown"
-          ],
-          "type": "string"
-        },
-        "os_release": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "type": "object"
-        },
-        "pkg_backend": {
-          "enum": [
-            "dpkg",
-            "rpm"
-          ],
-          "type": "string"
-        }
-      },
-      "required": [
-        "hostname",
-        "os",
-        "pkg_backend",
-        "os_release"
-      ],
-      "type": "object"
-    },
-    "inventory": {
-      "additionalProperties": false,
-      "properties": {
-        "packages": {
-          "additionalProperties": {
-            "$ref": "#/$defs/PackageInventoryEntry"
-          },
-          "type": "object"
-        }
-      },
-      "required": [
-        "packages"
-      ],
-      "type": "object"
-    },
-    "roles": {
-      "additionalProperties": false,
-      "properties": {
-        "apt_config": {
-          "$ref": "#/$defs/AptConfigSnapshot"
-        },
-        "dnf_config": {
-          "$ref": "#/$defs/DnfConfigSnapshot"
-        },
-        "etc_custom": {
-          "$ref": "#/$defs/EtcCustomSnapshot"
-        },
-        "extra_paths": {
-          "$ref": "#/$defs/ExtraPathsSnapshot"
-        },
-        "packages": {
-          "items": {
-            "$ref": "#/$defs/PackageSnapshot"
-          },
-          "type": "array"
-        },
-        "services": {
-          "items": {
-            "$ref": "#/$defs/ServiceSnapshot"
-          },
-          "type": "array"
-        },
-        "users": {
-          "$ref": "#/$defs/UsersSnapshot"
-        },
-        "usr_local_custom": {
-          "$ref": "#/$defs/UsrLocalCustomSnapshot"
-        }
-      },
-      "required": [
-        "users",
-        "services",
-        "packages",
-        "apt_config",
-        "dnf_config",
-        "etc_custom",
-        "usr_local_custom",
-        "extra_paths"
-      ],
-      "type": "object"
-    }
-  },
-  "required": [
-    "enroll",
-    "host",
-    "inventory",
-    "roles"
-  ],
-  "title": "Enroll harvest state.json schema (latest)",
-  "type": "object"
-}

enroll/systemd.py

@@ -33,19 +33,6 @@ def _run(cmd: list[str]) -> str:
     return p.stdout
 
 
-@dataclass
-class TimerInfo:
-    name: str
-    fragment_path: Optional[str]
-    dropin_paths: List[str]
-    env_files: List[str]
-    trigger_unit: Optional[str]
-    active_state: Optional[str]
-    sub_state: Optional[str]
-    unit_file_state: Optional[str]
-    condition_result: Optional[str]
-
-
 def list_enabled_services() -> List[str]:
     out = _run(
         [
@@ -71,31 +58,6 @@ def list_enabled_services() -> List[str]:
     return sorted(set(units))
 
 
-def list_enabled_timers() -> List[str]:
-    out = _run(
-        [
-            "systemctl",
-            "list-unit-files",
-            "--type=timer",
-            "--state=enabled",
-            "--no-legend",
-        ]
-    )
-    units: List[str] = []
-    for line in out.splitlines():
-        parts = line.split()
-        if not parts:
-            continue
-        unit = parts[0].strip()
-        if not unit.endswith(".timer"):
-            continue
-        # Skip template units like "foo@.timer"
-        if unit.endswith("@.timer"):
-            continue
-        units.append(unit)
-    return sorted(set(units))
-
-
 def get_unit_info(unit: str) -> UnitInfo:
     p = subprocess.run(
         [
@@ -155,62 +117,3 @@ def get_unit_info(unit: str) -> UnitInfo:
         unit_file_state=kv.get("UnitFileState") or None,
         condition_result=kv.get("ConditionResult") or None,
     )
-
-
-def get_timer_info(unit: str) -> TimerInfo:
-    p = subprocess.run(
-        [
-            "systemctl",
-            "show",
-            unit,
-            "-p",
-            "FragmentPath",
-            "-p",
-            "DropInPaths",
-            "-p",
-            "EnvironmentFiles",
-            "-p",
-            "Unit",
-            "-p",
-            "ActiveState",
-            "-p",
-            "SubState",
-            "-p",
-            "UnitFileState",
-            "-p",
-            "ConditionResult",
-        ],
-        text=True,
-        capture_output=True,
-    )  # nosec
-    if p.returncode != 0:
-        raise RuntimeError(f"systemctl show failed for {unit}: {p.stderr}")
-
-    kv: dict[str, str] = {}
-    for line in (p.stdout or "").splitlines():
-        if "=" in line:
-            k, v = line.split("=", 1)
-            kv[k] = v.strip()
-
-    fragment = kv.get("FragmentPath") or None
-    dropins = [pp for pp in (kv.get("DropInPaths", "") or "").split() if pp]
-
-    env_files: List[str] = []
-    for token in (kv.get("EnvironmentFiles", "") or "").split():
-        token = token.lstrip("-")
-        if token:
-            env_files.append(token)
-
-    trigger = kv.get("Unit") or None
-
-    return TimerInfo(
-        name=unit,
-        fragment_path=fragment,
-        dropin_paths=dropins,
-        env_files=env_files,
-        trigger_unit=trigger,
-        active_state=kv.get("ActiveState") or None,
-        sub_state=kv.get("SubState") or None,
-        unit_file_state=kv.get("UnitFileState") or None,
-        condition_result=kv.get("ConditionResult") or None,
-    )

enroll/validate.py

@@ -1,223 +0,0 @@
-from __future__ import annotations
-
-import json
-import urllib.request
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any, Dict, List, Optional, Set, Tuple
-
-import jsonschema
-
-from .diff import BundleRef, _bundle_from_input
-
-
-@dataclass
-class ValidationResult:
-    errors: List[str]
-    warnings: List[str]
-
-    @property
-    def ok(self) -> bool:
-        return not self.errors
-
-    def to_dict(self) -> Dict[str, Any]:
-        return {
-            "ok": self.ok,
-            "errors": list(self.errors),
-            "warnings": list(self.warnings),
-        }
-
-    def to_text(self) -> str:
-        lines: List[str] = []
-        if not self.errors and not self.warnings:
-            lines.append("OK: harvest bundle validated")
-        elif not self.errors and self.warnings:
-            lines.append(f"WARN: {len(self.warnings)} warning(s)")
-        else:
-            lines.append(f"ERROR: {len(self.errors)} validation error(s)")
-
-        if self.errors:
-            lines.append("")
-            lines.append("Errors:")
-            for e in self.errors:
-                lines.append(f"- {e}")
-        if self.warnings:
-            lines.append("")
-            lines.append("Warnings:")
-            for w in self.warnings:
-                lines.append(f"- {w}")
-        return "\n".join(lines) + "\n"
-
-
-def _default_schema_path() -> Path:
-    # Keep the schema vendored with the codebase so enroll can validate offline.
-    return Path(__file__).resolve().parent / "schema" / "state.schema.json"
-
-
-def _load_schema(schema: Optional[str]) -> Dict[str, Any]:
-    """Load a JSON schema.
-
-    If schema is None, load the vendored schema.
-    If schema begins with http(s)://, fetch it.
-    Otherwise, treat it as a local file path.
-    """
-
-    if not schema:
-        p = _default_schema_path()
-        with open(p, "r", encoding="utf-8") as f:
-            return json.load(f)
-
-    if schema.startswith("http://") or schema.startswith("https://"):
-        with urllib.request.urlopen(schema, timeout=10) as resp:  # nosec
-            data = resp.read()
-        return json.loads(data.decode("utf-8"))
-
-    p = Path(schema).expanduser()
-    with open(p, "r", encoding="utf-8") as f:
-        return json.load(f)
-
-
-def _json_pointer(err: jsonschema.ValidationError) -> str:
-    # Build a JSON pointer-ish path that is easy to read.
-    if err.absolute_path:
-        parts = [str(p) for p in err.absolute_path]
-        return "/" + "/".join(parts)
-    return "/"
-
-
-def _iter_managed_files(state: Dict[str, Any]) -> List[Tuple[str, Dict[str, Any]]]:
-    """Return (role_name, managed_file_dict) tuples across all roles."""
-
-    roles = state.get("roles") or {}
-    out: List[Tuple[str, Dict[str, Any]]] = []
-
-    # Singleton roles
-    for rn in [
-        "users",
-        "apt_config",
-        "dnf_config",
-        "etc_custom",
-        "usr_local_custom",
-        "extra_paths",
-    ]:
-        snap = roles.get(rn) or {}
-        for mf in snap.get("managed_files") or []:
-            if isinstance(mf, dict):
-                out.append((rn, mf))
-
-    # Array roles
-    for s in roles.get("services") or []:
-        if not isinstance(s, dict):
-            continue
-        role_name = str(s.get("role_name") or "unknown")
-        for mf in s.get("managed_files") or []:
-            if isinstance(mf, dict):
-                out.append((role_name, mf))
-
-    for p in roles.get("packages") or []:
-        if not isinstance(p, dict):
-            continue
-        role_name = str(p.get("role_name") or "unknown")
-        for mf in p.get("managed_files") or []:
-            if isinstance(mf, dict):
-                out.append((role_name, mf))
-
-    return out
-
-
-def validate_harvest(
-    harvest_input: str,
-    *,
-    sops_mode: bool = False,
-    schema: Optional[str] = None,
-    no_schema: bool = False,
-) -> ValidationResult:
-    """Validate an enroll harvest bundle.
-
-    Checks:
-      - state.json parses
-      - state.json validates against the schema (unless no_schema)
-      - every managed_file src_rel exists in artifacts/<role>/<src_rel>
-    """
-
-    errors: List[str] = []
-    warnings: List[str] = []
-
-    bundle: BundleRef = _bundle_from_input(harvest_input, sops_mode=sops_mode)
-    try:
-        state_path = bundle.state_path
-        if not state_path.exists():
-            return ValidationResult(
-                errors=[f"missing state.json at {state_path}"], warnings=[]
-            )
-
-        try:
-            state = json.loads(state_path.read_text(encoding="utf-8"))
-        except Exception as e:  # noqa: BLE001
-            return ValidationResult(
-                errors=[f"failed to parse state.json: {e!r}"], warnings=[]
-            )
-
-        if not no_schema:
-            try:
-                sch = _load_schema(schema)
-                validator = jsonschema.Draft202012Validator(sch)
-                for err in sorted(validator.iter_errors(state), key=str):
-                    ptr = _json_pointer(err)
-                    msg = err.message
-                    errors.append(f"schema {ptr}: {msg}")
-            except Exception as e:  # noqa: BLE001
-                errors.append(f"failed to load/validate schema: {e!r}")
-
-        # Artifact existence checks
-        artifacts_dir = bundle.dir / "artifacts"
-        referenced: Set[Tuple[str, str]] = set()
-        for role_name, mf in _iter_managed_files(state):
-            src_rel = str(mf.get("src_rel") or "")
-            if not src_rel:
-                errors.append(
-                    f"managed_file missing src_rel for role {role_name} (path={mf.get('path')!r})"
-                )
-                continue
-            if src_rel.startswith("/") or ".." in src_rel.split("/"):
-                errors.append(
-                    f"managed_file has suspicious src_rel for role {role_name}: {src_rel!r}"
-                )
-                continue
-
-            referenced.add((role_name, src_rel))
-            p = artifacts_dir / role_name / src_rel
-            if not p.exists():
-                errors.append(
-                    f"missing artifact for role {role_name}: artifacts/{role_name}/{src_rel}"
-                )
-                continue
-            if not p.is_file():
-                errors.append(
-                    f"artifact is not a file for role {role_name}: artifacts/{role_name}/{src_rel}"
-                )
-
-        # Warn if there are extra files in artifacts not referenced.
-        if artifacts_dir.exists() and artifacts_dir.is_dir():
-            for fp in artifacts_dir.rglob("*"):
-                if not fp.is_file():
-                    continue
-                try:
-                    rel = fp.relative_to(artifacts_dir)
-                except ValueError:
-                    continue
-                parts = rel.parts
-                if len(parts) < 2:
-                    continue
-                role_name = parts[0]
-                src_rel = "/".join(parts[1:])
-                if (role_name, src_rel) not in referenced:
-                    warnings.append(
-                        f"unreferenced artifact present: artifacts/{role_name}/{src_rel}"
-                    )
-
-        return ValidationResult(errors=errors, warnings=warnings)
-    finally:
-        # Ensure any temp extraction dirs are cleaned up.
-        if bundle.tempdir is not None:
-            bundle.tempdir.cleanup()

enroll/version.py

@@ -1,32 +0,0 @@
-from __future__ import annotations
-
-
-def get_enroll_version() -> str:
-    """
-    Best-effort version lookup that works when installed via:
-      - poetry/pip/wheel
-      - deb/rpm system packages
-    Falls back to "0+unknown" when running from an unpacked source tree.
-    """
-    try:
-        from importlib.metadata import (
-            packages_distributions,
-            version,
-        )
-    except Exception:
-        # Very old Python or unusual environment
-        return "unknown"
-
-    # Map import package -> dist(s)
-    dist_names = []
-    try:
-        dist_names = (packages_distributions() or {}).get("enroll", []) or []
-    except Exception:
-        dist_names = []
-
-    # Try mapped dists first, then a reasonable default
-    for dist in [*dist_names, "enroll"]:
-        try:
-            return version(dist)
-        except Exception:
-            return "unknown"

poetry.lock

@@ -1,16 +1,5 @@
 # This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
 
-[[package]]
-name = "attrs"
-version = "25.4.0"
-description = "Classes Without Boilerplate"
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "attrs-25.4.0-py3-none-any.whl", hash = "sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373"},
-    {file = "attrs-25.4.0.tar.gz", hash = "sha256:16d5969b87f0859ef33a48b35d55ac1be6e42ae49d5e853b597db70c35c57e11"},
-]
-
 [[package]]
 name = "bcrypt"
 version = "5.0.0"
@@ -89,13 +78,13 @@ typecheck = ["mypy"]
 
 [[package]]
 name = "certifi"
-version = "2026.1.4"
+version = "2025.11.12"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c"},
+    {file = "certifi-2025.11.12-py3-none-any.whl", hash = "sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b"},
-    {file = "certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120"},
+    {file = "certifi-2025.11.12.tar.gz", hash = "sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316"},
 ]
 
 [[package]]
@@ -329,103 +318,103 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.13.1"
+version = "7.13.0"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.10"
 files = [
-    {file = "coverage-7.13.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e1fa280b3ad78eea5be86f94f461c04943d942697e0dac889fa18fff8f5f9147"},
+    {file = "coverage-7.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:02d9fb9eccd48f6843c98a37bd6817462f130b86da8660461e8f5e54d4c06070"},
-    {file = "coverage-7.13.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c3d8c679607220979434f494b139dfb00131ebf70bb406553d69c1ff01a5c33d"},
+    {file = "coverage-7.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:367449cf07d33dc216c083f2036bb7d976c6e4903ab31be400ad74ad9f85ce98"},
-    {file = "coverage-7.13.1-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:339dc63b3eba969067b00f41f15ad161bf2946613156fb131266d8debc8e44d0"},
+    {file = "coverage-7.13.0-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:cdb3c9f8fef0a954c632f64328a3935988d33a6604ce4bf67ec3e39670f12ae5"},
-    {file = "coverage-7.13.1-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:db622b999ffe49cb891f2fff3b340cdc2f9797d01a0a202a0973ba2562501d90"},
+    {file = "coverage-7.13.0-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d10fd186aac2316f9bbb46ef91977f9d394ded67050ad6d84d94ed6ea2e8e54e"},
-    {file = "coverage-7.13.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d1443ba9acbb593fa7c1c29e011d7c9761545fe35e7652e85ce7f51a16f7e08d"},
+    {file = "coverage-7.13.0-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7f88ae3e69df2ab62fb0bc5219a597cb890ba5c438190ffa87490b315190bb33"},
-    {file = "coverage-7.13.1-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c832ec92c4499ac463186af72f9ed4d8daec15499b16f0a879b0d1c8e5cf4a3b"},
+    {file = "coverage-7.13.0-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4be718e51e86f553bcf515305a158a1cd180d23b72f07ae76d6017c3cc5d791"},
-    {file = "coverage-7.13.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:562ec27dfa3f311e0db1ba243ec6e5f6ab96b1edfcfc6cf86f28038bc4961ce6"},
+    {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a00d3a393207ae12f7c49bb1c113190883b500f48979abb118d8b72b8c95c032"},
-    {file = "coverage-7.13.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:4de84e71173d4dada2897e5a0e1b7877e5eefbfe0d6a44edee6ce31d9b8ec09e"},
+    {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:3a7b1cd820e1b6116f92c6128f1188e7afe421c7e1b35fa9836b11444e53ebd9"},
-    {file = "coverage-7.13.1-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:a5a68357f686f8c4d527a2dc04f52e669c2fc1cbde38f6f7eb6a0e58cbd17cae"},
+    {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:37eee4e552a65866f15dedd917d5e5f3d59805994260720821e2c1b51ac3248f"},
-    {file = "coverage-7.13.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:77cc258aeb29a3417062758975521eae60af6f79e930d6993555eeac6a8eac29"},
+    {file = "coverage-7.13.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:62d7c4f13102148c78d7353c6052af6d899a7f6df66a32bddcc0c0eb7c5326f8"},
-    {file = "coverage-7.13.1-cp310-cp310-win32.whl", hash = "sha256:bb4f8c3c9a9f34423dba193f241f617b08ffc63e27f67159f60ae6baf2dcfe0f"},
+    {file = "coverage-7.13.0-cp310-cp310-win32.whl", hash = "sha256:24e4e56304fdb56f96f80eabf840eab043b3afea9348b88be680ec5986780a0f"},
-    {file = "coverage-7.13.1-cp310-cp310-win_amd64.whl", hash = "sha256:c8e2706ceb622bc63bac98ebb10ef5da80ed70fbd8a7999a5076de3afaef0fb1"},
+    {file = "coverage-7.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:74c136e4093627cf04b26a35dab8cbfc9b37c647f0502fc313376e11726ba303"},
-    {file = "coverage-7.13.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a55d509a1dc5a5b708b5dad3b5334e07a16ad4c2185e27b40e4dba796ab7f88"},
+    {file = "coverage-7.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0dfa3855031070058add1a59fdfda0192fd3e8f97e7c81de0596c145dea51820"},
-    {file = "coverage-7.13.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4d010d080c4888371033baab27e47c9df7d6fb28d0b7b7adf85a4a49be9298b3"},
+    {file = "coverage-7.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4fdb6f54f38e334db97f72fa0c701e66d8479af0bc3f9bfb5b90f1c30f54500f"},
-    {file = "coverage-7.13.1-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d938b4a840fb1523b9dfbbb454f652967f18e197569c32266d4d13f37244c3d9"},
+    {file = "coverage-7.13.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:7e442c013447d1d8d195be62852270b78b6e255b79b8675bad8479641e21fd96"},
-    {file = "coverage-7.13.1-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bf100a3288f9bb7f919b87eb84f87101e197535b9bd0e2c2b5b3179633324fee"},
+    {file = "coverage-7.13.0-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1ed5630d946859de835a85e9a43b721123a8a44ec26e2830b296d478c7fd4259"},
-    {file = "coverage-7.13.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef6688db9bf91ba111ae734ba6ef1a063304a881749726e0d3575f5c10a9facf"},
+    {file = "coverage-7.13.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7f15a931a668e58087bc39d05d2b4bf4b14ff2875b49c994bbdb1c2217a8daeb"},
-    {file = "coverage-7.13.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0b609fc9cdbd1f02e51f67f51e5aee60a841ef58a68d00d5ee2c0faf357481a3"},
+    {file = "coverage-7.13.0-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:30a3a201a127ea57f7e14ba43c93c9c4be8b7d17a26e03bb49e6966d019eede9"},
-    {file = "coverage-7.13.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c43257717611ff5e9a1d79dce8e47566235ebda63328718d9b65dd640bc832ef"},
+    {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:7a485ff48fbd231efa32d58f479befce52dcb6bfb2a88bb7bf9a0b89b1bc8030"},
-    {file = "coverage-7.13.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e09fbecc007f7b6afdfb3b07ce5bd9f8494b6856dd4f577d26c66c391b829851"},
+    {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:22486cdafba4f9e471c816a2a5745337742a617fef68e890d8baf9f3036d7833"},
-    {file = "coverage-7.13.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:a03a4f3a19a189919c7055098790285cc5c5b0b3976f8d227aea39dbf9f8bfdb"},
+    {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:263c3dbccc78e2e331e59e90115941b5f53e85cfcc6b3b2fbff1fd4e3d2c6ea8"},
-    {file = "coverage-7.13.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3820778ea1387c2b6a818caec01c63adc5b3750211af6447e8dcfb9b6f08dbba"},
+    {file = "coverage-7.13.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e5330fa0cc1f5c3c4c3bb8e101b742025933e7848989370a1d4c8c5e401ea753"},
-    {file = "coverage-7.13.1-cp311-cp311-win32.whl", hash = "sha256:ff10896fa55167371960c5908150b434b71c876dfab97b69478f22c8b445ea19"},
+    {file = "coverage-7.13.0-cp311-cp311-win32.whl", hash = "sha256:0f4872f5d6c54419c94c25dd6ae1d015deeb337d06e448cd890a1e89a8ee7f3b"},
-    {file = "coverage-7.13.1-cp311-cp311-win_amd64.whl", hash = "sha256:a998cc0aeeea4c6d5622a3754da5a493055d2d95186bad877b0a34ea6e6dbe0a"},
+    {file = "coverage-7.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51a202e0f80f241ccb68e3e26e19ab5b3bf0f813314f2c967642f13ebcf1ddfe"},
-    {file = "coverage-7.13.1-cp311-cp311-win_arm64.whl", hash = "sha256:fea07c1a39a22614acb762e3fbbb4011f65eedafcb2948feeef641ac78b4ee5c"},
+    {file = "coverage-7.13.0-cp311-cp311-win_arm64.whl", hash = "sha256:d2a9d7f1c11487b1c69367ab3ac2d81b9b3721f097aa409a3191c3e90f8f3dd7"},
-    {file = "coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6f34591000f06e62085b1865c9bc5f7858df748834662a51edadfd2c3bfe0dd3"},
+    {file = "coverage-7.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0b3d67d31383c4c68e19a88e28fc4c2e29517580f1b0ebec4a069d502ce1e0bf"},
-    {file = "coverage-7.13.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b67e47c5595b9224599016e333f5ec25392597a89d5744658f837d204e16c63e"},
+    {file = "coverage-7.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:581f086833d24a22c89ae0fe2142cfaa1c92c930adf637ddf122d55083fb5a0f"},
-    {file = "coverage-7.13.1-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3e7b8bd70c48ffb28461ebe092c2345536fb18bbbf19d287c8913699735f505c"},
+    {file = "coverage-7.13.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:0a3a30f0e257df382f5f9534d4ce3d4cf06eafaf5192beb1a7bd066cb10e78fb"},
-    {file = "coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:c223d078112e90dc0e5c4e35b98b9584164bea9fbbd221c0b21c5241f6d51b62"},
+    {file = "coverage-7.13.0-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:583221913fbc8f53b88c42e8dbb8fca1d0f2e597cb190ce45916662b8b9d9621"},
-    {file = "coverage-7.13.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:794f7c05af0763b1bbd1b9e6eff0e52ad068be3b12cd96c87de037b01390c968"},
+    {file = "coverage-7.13.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f5d9bd30756fff3e7216491a0d6d520c448d5124d3d8e8f56446d6412499e74"},
-    {file = "coverage-7.13.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0642eae483cc8c2902e4af7298bf886d605e80f26382124cddc3967c2a3df09e"},
+    {file = "coverage-7.13.0-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a23e5a1f8b982d56fa64f8e442e037f6ce29322f1f9e6c2344cd9e9f4407ee57"},
-    {file = "coverage-7.13.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9f5e772ed5fef25b3de9f2008fe67b92d46831bd2bc5bdc5dd6bfd06b83b316f"},
+    {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9b01c22bc74a7fb44066aaf765224c0d933ddf1f5047d6cdfe4795504a4493f8"},
-    {file = "coverage-7.13.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:45980ea19277dc0a579e432aef6a504fe098ef3a9032ead15e446eb0f1191aee"},
+    {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:898cce66d0836973f48dda4e3514d863d70142bdf6dfab932b9b6a90ea5b222d"},
-    {file = "coverage-7.13.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:e4f18eca6028ffa62adbd185a8f1e1dd242f2e68164dba5c2b74a5204850b4cf"},
+    {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3ab483ea0e251b5790c2aac03acde31bff0c736bf8a86829b89382b407cd1c3b"},
-    {file = "coverage-7.13.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f8dca5590fec7a89ed6826fce625595279e586ead52e9e958d3237821fbc750c"},
+    {file = "coverage-7.13.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1d84e91521c5e4cb6602fe11ece3e1de03b2760e14ae4fcf1a4b56fa3c801fcd"},
-    {file = "coverage-7.13.1-cp312-cp312-win32.whl", hash = "sha256:ff86d4e85188bba72cfb876df3e11fa243439882c55957184af44a35bd5880b7"},
+    {file = "coverage-7.13.0-cp312-cp312-win32.whl", hash = "sha256:193c3887285eec1dbdb3f2bd7fbc351d570ca9c02ca756c3afbc71b3c98af6ef"},
-    {file = "coverage-7.13.1-cp312-cp312-win_amd64.whl", hash = "sha256:16cc1da46c04fb0fb128b4dc430b78fa2aba8a6c0c9f8eb391fd5103409a6ac6"},
+    {file = "coverage-7.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:4f3e223b2b2db5e0db0c2b97286aba0036ca000f06aca9b12112eaa9af3d92ae"},
-    {file = "coverage-7.13.1-cp312-cp312-win_arm64.whl", hash = "sha256:8d9bc218650022a768f3775dd7fdac1886437325d8d295d923ebcfef4892ad5c"},
+    {file = "coverage-7.13.0-cp312-cp312-win_arm64.whl", hash = "sha256:086cede306d96202e15a4b77ace8472e39d9f4e5f9fd92dd4fecdfb2313b2080"},
-    {file = "coverage-7.13.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:cb237bfd0ef4d5eb6a19e29f9e528ac67ac3be932ea6b44fb6cc09b9f3ecff78"},
+    {file = "coverage-7.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:28ee1c96109974af104028a8ef57cec21447d42d0e937c0275329272e370ebcf"},
-    {file = "coverage-7.13.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1dcb645d7e34dcbcc96cd7c132b1fc55c39263ca62eb961c064eb3928997363b"},
+    {file = "coverage-7.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d1e97353dcc5587b85986cda4ff3ec98081d7e84dd95e8b2a6d59820f0545f8a"},
-    {file = "coverage-7.13.1-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3d42df8201e00384736f0df9be2ced39324c3907607d17d50d50116c989d84cd"},
+    {file = "coverage-7.13.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:99acd4dfdfeb58e1937629eb1ab6ab0899b131f183ee5f23e0b5da5cba2fec74"},
-    {file = "coverage-7.13.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:fa3edde1aa8807de1d05934982416cb3ec46d1d4d91e280bcce7cca01c507992"},
+    {file = "coverage-7.13.0-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ff45e0cd8451e293b63ced93161e189780baf444119391b3e7d25315060368a6"},
-    {file = "coverage-7.13.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9edd0e01a343766add6817bc448408858ba6b489039eaaa2018474e4001651a4"},
+    {file = "coverage-7.13.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f4f72a85316d8e13234cafe0a9f81b40418ad7a082792fa4165bd7d45d96066b"},
-    {file = "coverage-7.13.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:985b7836931d033570b94c94713c6dba5f9d3ff26045f72c3e5dbc5fe3361e5a"},
+    {file = "coverage-7.13.0-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:11c21557d0e0a5a38632cbbaca5f008723b26a89d70db6315523df6df77d6232"},
-    {file = "coverage-7.13.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ffed1e4980889765c84a5d1a566159e363b71d6b6fbaf0bebc9d3c30bc016766"},
+    {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:76541dc8d53715fb4f7a3a06b34b0dc6846e3c69bc6204c55653a85dd6220971"},
-    {file = "coverage-7.13.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:8842af7f175078456b8b17f1b73a0d16a65dcbdc653ecefeb00a56b3c8c298c4"},
+    {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:6e9e451dee940a86789134b6b0ffbe31c454ade3b849bb8a9d2cca2541a8e91d"},
-    {file = "coverage-7.13.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:ccd7a6fca48ca9c131d9b0a2972a581e28b13416fc313fb98b6d24a03ce9a398"},
+    {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:5c67dace46f361125e6b9cace8fe0b729ed8479f47e70c89b838d319375c8137"},
-    {file = "coverage-7.13.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:0403f647055de2609be776965108447deb8e384fe4a553c119e3ff6bfbab4784"},
+    {file = "coverage-7.13.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f59883c643cb19630500f57016f76cfdcd6845ca8c5b5ea1f6e17f74c8e5f511"},
-    {file = "coverage-7.13.1-cp313-cp313-win32.whl", hash = "sha256:549d195116a1ba1e1ae2f5ca143f9777800f6636eab917d4f02b5310d6d73461"},
+    {file = "coverage-7.13.0-cp313-cp313-win32.whl", hash = "sha256:58632b187be6f0be500f553be41e277712baa278147ecb7559983c6d9faf7ae1"},
-    {file = "coverage-7.13.1-cp313-cp313-win_amd64.whl", hash = "sha256:5899d28b5276f536fcf840b18b61a9fce23cc3aec1d114c44c07fe94ebeaa500"},
+    {file = "coverage-7.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:73419b89f812f498aca53f757dd834919b48ce4799f9d5cad33ca0ae442bdb1a"},
-    {file = "coverage-7.13.1-cp313-cp313-win_arm64.whl", hash = "sha256:868a2fae76dfb06e87291bcbd4dcbcc778a8500510b618d50496e520bd94d9b9"},
+    {file = "coverage-7.13.0-cp313-cp313-win_arm64.whl", hash = "sha256:eb76670874fdd6091eedcc856128ee48c41a9bbbb9c3f1c7c3cf169290e3ffd6"},
-    {file = "coverage-7.13.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:67170979de0dacac3f3097d02b0ad188d8edcea44ccc44aaa0550af49150c7dc"},
+    {file = "coverage-7.13.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:6e63ccc6e0ad8986386461c3c4b737540f20426e7ec932f42e030320896c311a"},
-    {file = "coverage-7.13.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:f80e2bb21bfab56ed7405c2d79d34b5dc0bc96c2c1d2a067b643a09fb756c43a"},
+    {file = "coverage-7.13.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:494f5459ffa1bd45e18558cd98710c36c0b8fbfa82a5eabcbe671d80ecffbfe8"},
-    {file = "coverage-7.13.1-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:f83351e0f7dcdb14d7326c3d8d8c4e915fa685cbfdc6281f9470d97a04e9dfe4"},
+    {file = "coverage-7.13.0-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:06cac81bf10f74034e055e903f5f946e3e26fc51c09fc9f584e4a1605d977053"},
-    {file = "coverage-7.13.1-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bb3f6562e89bad0110afbe64e485aac2462efdce6232cdec7862a095dc3412f6"},
+    {file = "coverage-7.13.0-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f2ffc92b46ed6e6760f1d47a71e56b5664781bc68986dbd1836b2b70c0ce2071"},
-    {file = "coverage-7.13.1-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:77545b5dcda13b70f872c3b5974ac64c21d05e65b1590b441c8560115dc3a0d1"},
+    {file = "coverage-7.13.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0602f701057c6823e5db1b74530ce85f17c3c5be5c85fc042ac939cbd909426e"},
-    {file = "coverage-7.13.1-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a4d240d260a1aed814790bbe1f10a5ff31ce6c21bc78f0da4a1e8268d6c80dbd"},
+    {file = "coverage-7.13.0-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:25dc33618d45456ccb1d37bce44bc78cf269909aa14c4db2e03d63146a8a1493"},
-    {file = "coverage-7.13.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:d2287ac9360dec3837bfdad969963a5d073a09a85d898bd86bea82aa8876ef3c"},
+    {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:71936a8b3b977ddd0b694c28c6a34f4fff2e9dd201969a4ff5d5fc7742d614b0"},
-    {file = "coverage-7.13.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:0d2c11f3ea4db66b5cbded23b20185c35066892c67d80ec4be4bab257b9ad1e0"},
+    {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:936bc20503ce24770c71938d1369461f0c5320830800933bc3956e2a4ded930e"},
-    {file = "coverage-7.13.1-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:3fc6a169517ca0d7ca6846c3c5392ef2b9e38896f61d615cb75b9e7134d4ee1e"},
+    {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:af0a583efaacc52ae2521f8d7910aff65cdb093091d76291ac5820d5e947fc1c"},
-    {file = "coverage-7.13.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:d10a2ed46386e850bb3de503a54f9fe8192e5917fcbb143bfef653a9355e9a53"},
+    {file = "coverage-7.13.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f1c23e24a7000da892a312fb17e33c5f94f8b001de44b7cf8ba2e36fbd15859e"},
-    {file = "coverage-7.13.1-cp313-cp313t-win32.whl", hash = "sha256:75a6f4aa904301dab8022397a22c0039edc1f51e90b83dbd4464b8a38dc87842"},
+    {file = "coverage-7.13.0-cp313-cp313t-win32.whl", hash = "sha256:5f8a0297355e652001015e93be345ee54393e45dc3050af4a0475c5a2b767d46"},
-    {file = "coverage-7.13.1-cp313-cp313t-win_amd64.whl", hash = "sha256:309ef5706e95e62578cda256b97f5e097916a2c26247c287bbe74794e7150df2"},
+    {file = "coverage-7.13.0-cp313-cp313t-win_amd64.whl", hash = "sha256:6abb3a4c52f05e08460bd9acf04fec027f8718ecaa0d09c40ffbc3fbd70ecc39"},
-    {file = "coverage-7.13.1-cp313-cp313t-win_arm64.whl", hash = "sha256:92f980729e79b5d16d221038dbf2e8f9a9136afa072f9d5d6ed4cb984b126a09"},
+    {file = "coverage-7.13.0-cp313-cp313t-win_arm64.whl", hash = "sha256:3ad968d1e3aa6ce5be295ab5fe3ae1bf5bb4769d0f98a80a0252d543a2ef2e9e"},
-    {file = "coverage-7.13.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:97ab3647280d458a1f9adb85244e81587505a43c0c7cff851f5116cd2814b894"},
+    {file = "coverage-7.13.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:453b7ec753cf5e4356e14fe858064e5520c460d3bbbcb9c35e55c0d21155c256"},
-    {file = "coverage-7.13.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8f572d989142e0908e6acf57ad1b9b86989ff057c006d13b76c146ec6a20216a"},
+    {file = "coverage-7.13.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:af827b7cbb303e1befa6c4f94fd2bf72f108089cfa0f8abab8f4ca553cf5ca5a"},
-    {file = "coverage-7.13.1-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:d72140ccf8a147e94274024ff6fd8fb7811354cf7ef88b1f0a988ebaa5bc774f"},
+    {file = "coverage-7.13.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:9987a9e4f8197a1000280f7cc089e3ea2c8b3c0a64d750537809879a7b4ceaf9"},
-    {file = "coverage-7.13.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d3c9f051b028810f5a87c88e5d6e9af3c0ff32ef62763bf15d29f740453ca909"},
+    {file = "coverage-7.13.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:3188936845cd0cb114fa6a51842a304cdbac2958145d03be2377ec41eb285d19"},
-    {file = "coverage-7.13.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f398ba4df52d30b1763f62eed9de5620dcde96e6f491f4c62686736b155aa6e4"},
+    {file = "coverage-7.13.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a2bdb3babb74079f021696cb46b8bb5f5661165c385d3a238712b031a12355be"},
-    {file = "coverage-7.13.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:132718176cc723026d201e347f800cd1a9e4b62ccd3f82476950834dad501c75"},
+    {file = "coverage-7.13.0-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7464663eaca6adba4175f6c19354feea61ebbdd735563a03d1e472c7072d27bb"},
-    {file = "coverage-7.13.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9e549d642426e3579b3f4b92d0431543b012dcb6e825c91619d4e93b7363c3f9"},
+    {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:8069e831f205d2ff1f3d355e82f511eb7c5522d7d413f5db5756b772ec8697f8"},
-    {file = "coverage-7.13.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:90480b2134999301eea795b3a9dbf606c6fbab1b489150c501da84a959442465"},
+    {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:6fb2d5d272341565f08e962cce14cdf843a08ac43bd621783527adb06b089c4b"},
-    {file = "coverage-7.13.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e825dbb7f84dfa24663dd75835e7257f8882629fc11f03ecf77d84a75134b864"},
+    {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:5e70f92ef89bac1ac8a99b3324923b4749f008fdbd7aa9cb35e01d7a284a04f9"},
-    {file = "coverage-7.13.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:623dcc6d7a7ba450bbdbeedbaa0c42b329bdae16491af2282f12a7e809be7eb9"},
+    {file = "coverage-7.13.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4b5de7d4583e60d5fd246dd57fcd3a8aa23c6e118a8c72b38adf666ba8e7e927"},
-    {file = "coverage-7.13.1-cp314-cp314-win32.whl", hash = "sha256:6e73ebb44dca5f708dc871fe0b90cf4cff1a13f9956f747cc87b535a840386f5"},
+    {file = "coverage-7.13.0-cp314-cp314-win32.whl", hash = "sha256:a6c6e16b663be828a8f0b6c5027d36471d4a9f90d28444aa4ced4d48d7d6ae8f"},
-    {file = "coverage-7.13.1-cp314-cp314-win_amd64.whl", hash = "sha256:be753b225d159feb397bd0bf91ae86f689bad0da09d3b301478cd39b878ab31a"},
+    {file = "coverage-7.13.0-cp314-cp314-win_amd64.whl", hash = "sha256:0900872f2fdb3ee5646b557918d02279dc3af3dfb39029ac4e945458b13f73bc"},
-    {file = "coverage-7.13.1-cp314-cp314-win_arm64.whl", hash = "sha256:228b90f613b25ba0019361e4ab81520b343b622fc657daf7e501c4ed6a2366c0"},
+    {file = "coverage-7.13.0-cp314-cp314-win_arm64.whl", hash = "sha256:3a10260e6a152e5f03f26db4a407c4c62d3830b9af9b7c0450b183615f05d43b"},
-    {file = "coverage-7.13.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:60cfb538fe9ef86e5b2ab0ca8fc8d62524777f6c611dcaf76dc16fbe9b8e698a"},
+    {file = "coverage-7.13.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:9097818b6cc1cfb5f174e3263eba4a62a17683bcfe5c4b5d07f4c97fa51fbf28"},
-    {file = "coverage-7.13.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:57dfc8048c72ba48a8c45e188d811e5efd7e49b387effc8fb17e97936dde5bf6"},
+    {file = "coverage-7.13.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:0018f73dfb4301a89292c73be6ba5f58722ff79f51593352759c1790ded1cabe"},
-    {file = "coverage-7.13.1-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3f2f725aa3e909b3c5fdb8192490bdd8e1495e85906af74fe6e34a2a77ba0673"},
+    {file = "coverage-7.13.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:166ad2a22ee770f5656e1257703139d3533b4a0b6909af67c6b4a3adc1c98657"},
-    {file = "coverage-7.13.1-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9ee68b21909686eeb21dfcba2c3b81fee70dcf38b140dcd5aa70680995fa3aa5"},
+    {file = "coverage-7.13.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f6aaef16d65d1787280943f1c8718dc32e9cf141014e4634d64446702d26e0ff"},
-    {file = "coverage-7.13.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:724b1b270cb13ea2e6503476e34541a0b1f62280bc997eab443f87790202033d"},
+    {file = "coverage-7.13.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e999e2dcc094002d6e2c7bbc1fb85b58ba4f465a760a8014d97619330cdbbbf3"},
-    {file = "coverage-7.13.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:916abf1ac5cf7eb16bc540a5bf75c71c43a676f5c52fcb9fe75a2bd75fb944e8"},
+    {file = "coverage-7.13.0-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:00c3d22cf6fb1cf3bf662aaaa4e563be8243a5ed2630339069799835a9cc7f9b"},
-    {file = "coverage-7.13.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:776483fd35b58d8afe3acbd9988d5de592ab6da2d2a865edfdbc9fdb43e7c486"},
+    {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:22ccfe8d9bb0d6134892cbe1262493a8c70d736b9df930f3f3afae0fe3ac924d"},
-    {file = "coverage-7.13.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:b6f3b96617e9852703f5b633ea01315ca45c77e879584f283c44127f0f1ec564"},
+    {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:9372dff5ea15930fea0445eaf37bbbafbc771a49e70c0aeed8b4e2c2614cc00e"},
-    {file = "coverage-7.13.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:bd63e7b74661fed317212fab774e2a648bc4bb09b35f25474f8e3325d2945cd7"},
+    {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:69ac2c492918c2461bc6ace42d0479638e60719f2a4ef3f0815fa2df88e9f940"},
-    {file = "coverage-7.13.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:933082f161bbb3e9f90d00990dc956120f608cdbcaeea15c4d897f56ef4fe416"},
+    {file = "coverage-7.13.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:739c6c051a7540608d097b8e13c76cfa85263ced467168dc6b477bae3df7d0e2"},
-    {file = "coverage-7.13.1-cp314-cp314t-win32.whl", hash = "sha256:18be793c4c87de2965e1c0f060f03d9e5aff66cfeae8e1dbe6e5b88056ec153f"},
+    {file = "coverage-7.13.0-cp314-cp314t-win32.whl", hash = "sha256:fe81055d8c6c9de76d60c94ddea73c290b416e061d40d542b24a5871bad498b7"},
-    {file = "coverage-7.13.1-cp314-cp314t-win_amd64.whl", hash = "sha256:0e42e0ec0cd3e0d851cb3c91f770c9301f48647cb2877cb78f74bdaa07639a79"},
+    {file = "coverage-7.13.0-cp314-cp314t-win_amd64.whl", hash = "sha256:445badb539005283825959ac9fa4a28f712c214b65af3a2c464f1adc90f5fcbc"},
-    {file = "coverage-7.13.1-cp314-cp314t-win_arm64.whl", hash = "sha256:eaecf47ef10c72ece9a2a92118257da87e460e113b83cc0d2905cbbe931792b4"},
+    {file = "coverage-7.13.0-cp314-cp314t-win_arm64.whl", hash = "sha256:de7f6748b890708578fc4b7bb967d810aeb6fcc9bff4bb77dbca77dab2f9df6a"},
-    {file = "coverage-7.13.1-py3-none-any.whl", hash = "sha256:2016745cb3ba554469d02819d78958b571792bb68e31302610e898f80dd3a573"},
+    {file = "coverage-7.13.0-py3-none-any.whl", hash = "sha256:850d2998f380b1e266459ca5b47bc9e7daf9af1d070f66317972f382d46f1904"},
-    {file = "coverage-7.13.1.tar.gz", hash = "sha256:b7593fe7eb5feaa3fbb461ac79aac9f9fc0387a5ca8080b0c6fe2ca27b091afd"},
+    {file = "coverage-7.13.0.tar.gz", hash = "sha256:a394aa27f2d7ff9bc04cf703817773a59ad6dfbd577032e690f961d2460ee936"},
 ]
 
 [package.dependencies]
@@ -578,41 +567,6 @@ files = [
     {file = "invoke-2.2.1.tar.gz", hash = "sha256:515bf49b4a48932b79b024590348da22f39c4942dff991ad1fb8b8baea1be707"},
 ]
 
-[[package]]
-name = "jsonschema"
-version = "4.26.0"
-description = "An implementation of JSON Schema validation for Python"
-optional = false
-python-versions = ">=3.10"
-files = [
-    {file = "jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce"},
-    {file = "jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326"},
-]
-
-[package.dependencies]
-attrs = ">=22.2.0"
-jsonschema-specifications = ">=2023.03.6"
-referencing = ">=0.28.4"
-rpds-py = ">=0.25.0"
-
-[package.extras]
-format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"]
-format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "rfc3987-syntax (>=1.1.0)", "uri-template", "webcolors (>=24.6.0)"]
-
-[[package]]
-name = "jsonschema-specifications"
-version = "2025.9.1"
-description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe"},
-    {file = "jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d"},
-]
-
-[package.dependencies]
-referencing = ">=0.31.0"
-
 [[package]]
 name = "packaging"
 version = "25.0"
@@ -686,36 +640,38 @@ windows-terminal = ["colorama (>=0.4.6)"]
 
 [[package]]
 name = "pynacl"
-version = "1.6.2"
+version = "1.6.1"
 description = "Python binding to the Networking and Cryptography (NaCl) library"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pynacl-1.6.2-cp314-cp314t-macosx_10_10_universal2.whl", hash = "sha256:622d7b07cc5c02c666795792931b50c91f3ce3c2649762efb1ef0d5684c81594"},
+    {file = "pynacl-1.6.1-cp314-cp314t-macosx_10_10_universal2.whl", hash = "sha256:7d7c09749450c385301a3c20dca967a525152ae4608c0a096fe8464bfc3df93d"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d071c6a9a4c94d79eb665db4ce5cedc537faf74f2355e4d502591d850d3913c0"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fc734c1696ffd49b40f7c1779c89ba908157c57345cf626be2e0719488a076d3"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fe9847ca47d287af41e82be1dd5e23023d3c31a951da134121ab02e42ac218c9"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3cd787ec1f5c155dc8ecf39b1333cfef41415dc96d392f1ce288b4fe970df489"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:04316d1fc625d860b6c162fff704eb8426b1a8bcd3abacea11142cbd99a6b574"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b35d93ab2df03ecb3aa506be0d3c73609a51449ae0855c2e89c7ed44abde40b"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44081faff368d6c5553ccf55322ef2819abb40e25afaec7e740f159f74813634"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dece79aecbb8f4640a1adbb81e4aa3bfb0e98e99834884a80eb3f33c7c30e708"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:a9f9932d8d2811ce1a8ffa79dcbdf3970e7355b5c8eb0c1a881a57e7f7d96e88"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:c2228054f04bf32d558fb89bb99f163a8197d5a9bf4efa13069a7fa8d4b93fc3"},
-    {file = "pynacl-1.6.2-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:bc4a36b28dd72fb4845e5d8f9760610588a96d5a51f01d84d8c6ff9849968c14"},
+    {file = "pynacl-1.6.1-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:2b12f1b97346f177affcdfdc78875ff42637cb40dcf79484a97dae3448083a78"},
-    {file = "pynacl-1.6.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bffb6d0f6becacb6526f8f42adfb5efb26337056ee0831fb9a7044d1a964444"},
+    {file = "pynacl-1.6.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e735c3a1bdfde3834503baf1a6d74d4a143920281cb724ba29fb84c9f49b9c48"},
-    {file = "pynacl-1.6.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2fef529ef3ee487ad8113d287a593fa26f48ee3620d92ecc6f1d09ea38e0709b"},
+    {file = "pynacl-1.6.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3384a454adf5d716a9fadcb5eb2e3e72cd49302d1374a60edc531c9957a9b014"},
-    {file = "pynacl-1.6.2-cp314-cp314t-win32.whl", hash = "sha256:a84bf1c20339d06dc0c85d9aea9637a24f718f375d861b2668b2f9f96fa51145"},
+    {file = "pynacl-1.6.1-cp314-cp314t-win32.whl", hash = "sha256:d8615ee34d01c8e0ab3f302dcdd7b32e2bcf698ba5f4809e7cc407c8cdea7717"},
-    {file = "pynacl-1.6.2-cp314-cp314t-win_amd64.whl", hash = "sha256:320ef68a41c87547c91a8b58903c9caa641ab01e8512ce291085b5fe2fcb7590"},
+    {file = "pynacl-1.6.1-cp314-cp314t-win_amd64.whl", hash = "sha256:5f5b35c1a266f8a9ad22525049280a600b19edd1f785bccd01ae838437dcf935"},
-    {file = "pynacl-1.6.2-cp314-cp314t-win_arm64.whl", hash = "sha256:d29bfe37e20e015a7d8b23cfc8bd6aa7909c92a1b8f41ee416bbb3e79ef182b2"},
+    {file = "pynacl-1.6.1-cp314-cp314t-win_arm64.whl", hash = "sha256:d984c91fe3494793b2a1fb1e91429539c6c28e9ec8209d26d25041ec599ccf63"},
-    {file = "pynacl-1.6.2-cp38-abi3-macosx_10_10_universal2.whl", hash = "sha256:c949ea47e4206af7c8f604b8278093b674f7c79ed0d4719cc836902bf4517465"},
+    {file = "pynacl-1.6.1-cp38-abi3-macosx_10_10_universal2.whl", hash = "sha256:a6f9fd6d6639b1e81115c7f8ff16b8dedba1e8098d2756275d63d208b0e32021"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8845c0631c0be43abdd865511c41eab235e0be69c81dc66a50911594198679b0"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e49a3f3d0da9f79c1bec2aa013261ab9fa651c7da045d376bd306cf7c1792993"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:22de65bb9010a725b0dac248f353bb072969c94fa8d6b1f34b87d7953cf7bbe4"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7713f8977b5d25f54a811ec9efa2738ac592e846dd6e8a4d3f7578346a841078"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:46065496ab748469cdd999246d17e301b2c24ae2fdf739132e580a0e94c94a87"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5a3becafc1ee2e5ea7f9abc642f56b82dcf5be69b961e782a96ea52b55d8a9fc"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8a66d6fb6ae7661c58995f9c6435bda2b1e68b54b598a6a10247bfcdadac996c"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4ce50d19f1566c391fedc8dc2f2f5be265ae214112ebe55315e41d1f36a7f0a9"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:26bfcd00dcf2cf160f122186af731ae30ab120c18e8375684ec2670dccd28130"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:543f869140f67d42b9b8d47f922552d7a967e6c116aad028c9bfc5f3f3b3a7b7"},
-    {file = "pynacl-1.6.2-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:c8a231e36ec2cab018c4ad4358c386e36eede0319a0c41fed24f840b1dac59f6"},
+    {file = "pynacl-1.6.1-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:a2bb472458c7ca959aeeff8401b8efef329b0fc44a89d3775cffe8fad3398ad8"},
-    {file = "pynacl-1.6.2-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:68be3a09455743ff9505491220b64440ced8973fe930f270c8e07ccfa25b1f9e"},
+    {file = "pynacl-1.6.1-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3206fa98737fdc66d59b8782cecc3d37d30aeec4593d1c8c145825a345bba0f0"},
-    {file = "pynacl-1.6.2-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:8b097553b380236d51ed11356c953bf8ce36a29a3e596e934ecabe76c985a577"},
+    {file = "pynacl-1.6.1-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:53543b4f3d8acb344f75fd4d49f75e6572fce139f4bfb4815a9282296ff9f4c0"},
-    {file = "pynacl-1.6.2-cp38-abi3-win32.whl", hash = "sha256:5811c72b473b2f38f7e2a3dc4f8642e3a3e9b5e7317266e4ced1fba85cae41aa"},
+    {file = "pynacl-1.6.1-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:319de653ef84c4f04e045eb250e6101d23132372b0a61a7acf91bac0fda8e58c"},
-    {file = "pynacl-1.6.2-cp38-abi3-win_amd64.whl", hash = "sha256:62985f233210dee6548c223301b6c25440852e13d59a8b81490203c3227c5ba0"},
+    {file = "pynacl-1.6.1-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:262a8de6bba4aee8a66f5edf62c214b06647461c9b6b641f8cd0cb1e3b3196fe"},
-    {file = "pynacl-1.6.2-cp38-abi3-win_arm64.whl", hash = "sha256:834a43af110f743a754448463e8fd61259cd4ab5bbedcf70f9dabad1d28a394c"},
+    {file = "pynacl-1.6.1-cp38-abi3-win32.whl", hash = "sha256:9fd1a4eb03caf8a2fe27b515a998d26923adb9ddb68db78e35ca2875a3830dde"},
-    {file = "pynacl-1.6.2.tar.gz", hash = "sha256:018494d6d696ae03c7e656e5e74cdfd8ea1326962cc401bcf018f1ed8436811c"},
+    {file = "pynacl-1.6.1-cp38-abi3-win_amd64.whl", hash = "sha256:a569a4069a7855f963940040f35e87d8bc084cb2d6347428d5ad20550a0a1a21"},
+    {file = "pynacl-1.6.1-cp38-abi3-win_arm64.whl", hash = "sha256:5953e8b8cfadb10889a6e7bd0f53041a745d1b3d30111386a1bb37af171e6daf"},
+    {file = "pynacl-1.6.1.tar.gz", hash = "sha256:8d361dac0309f2b6ad33b349a56cd163c98430d409fa503b10b70b3ad66eaa1d"},
 ]
 
 [package.dependencies]
@@ -864,22 +820,6 @@ files = [
     {file = "pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f"},
 ]
 
-[[package]]
-name = "referencing"
-version = "0.37.0"
-description = "JSON Referencing + Python"
-optional = false
-python-versions = ">=3.10"
-files = [
-    {file = "referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231"},
-    {file = "referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8"},
-]
-
-[package.dependencies]
-attrs = ">=22.2.0"
-rpds-py = ">=0.7.0"
-typing-extensions = {version = ">=4.4.0", markers = "python_version < \"3.13\""}
-
 [[package]]
 name = "requests"
 version = "2.32.5"
@@ -901,184 +841,55 @@ urllib3 = ">=1.21.1,<3"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
-[[package]]
-name = "rpds-py"
-version = "0.30.0"
-description = "Python bindings to Rust's persistent data structures (rpds)"
-optional = false
-python-versions = ">=3.10"
-files = [
-    {file = "rpds_py-0.30.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:679ae98e00c0e8d68a7fda324e16b90fd5260945b45d3b824c892cec9eea3288"},
-    {file = "rpds_py-0.30.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4cc2206b76b4f576934f0ed374b10d7ca5f457858b157ca52064bdfc26b9fc00"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:389a2d49eded1896c3d48b0136ead37c48e221b391c052fba3f4055c367f60a6"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:32c8528634e1bf7121f3de08fa85b138f4e0dc47657866630611b03967f041d7"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f207f69853edd6f6700b86efb84999651baf3789e78a466431df1331608e5324"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:67b02ec25ba7a9e8fa74c63b6ca44cf5707f2fbfadae3ee8e7494297d56aa9df"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c0e95f6819a19965ff420f65578bacb0b00f251fefe2c8b23347c37174271f3"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_31_riscv64.whl", hash = "sha256:a452763cc5198f2f98898eb98f7569649fe5da666c2dc6b5ddb10fde5a574221"},
-    {file = "rpds_py-0.30.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e0b65193a413ccc930671c55153a03ee57cecb49e6227204b04fae512eb657a7"},
-    {file = "rpds_py-0.30.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:858738e9c32147f78b3ac24dc0edb6610000e56dc0f700fd5f651d0a0f0eb9ff"},
-    {file = "rpds_py-0.30.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:da279aa314f00acbb803da1e76fa18666778e8a8f83484fba94526da5de2cba7"},
-    {file = "rpds_py-0.30.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:7c64d38fb49b6cdeda16ab49e35fe0da2e1e9b34bc38bd78386530f218b37139"},
-    {file = "rpds_py-0.30.0-cp310-cp310-win32.whl", hash = "sha256:6de2a32a1665b93233cde140ff8b3467bdb9e2af2b91079f0333a0974d12d464"},
-    {file = "rpds_py-0.30.0-cp310-cp310-win_amd64.whl", hash = "sha256:1726859cd0de969f88dc8673bdd954185b9104e05806be64bcd87badbe313169"},
-    {file = "rpds_py-0.30.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:a2bffea6a4ca9f01b3f8e548302470306689684e61602aa3d141e34da06cf425"},
-    {file = "rpds_py-0.30.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dc4f992dfe1e2bc3ebc7444f6c7051b4bc13cd8e33e43511e8ffd13bf407010d"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:422c3cb9856d80b09d30d2eb255d0754b23e090034e1deb4083f8004bd0761e4"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:07ae8a593e1c3c6b82ca3292efbe73c30b61332fd612e05abee07c79359f292f"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:12f90dd7557b6bd57f40abe7747e81e0c0b119bef015ea7726e69fe550e394a4"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:99b47d6ad9a6da00bec6aabe5a6279ecd3c06a329d4aa4771034a21e335c3a97"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33f559f3104504506a44bb666b93a33f5d33133765b0c216a5bf2f1e1503af89"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:946fe926af6e44f3697abbc305ea168c2c31d3e3ef1058cf68f379bf0335a78d"},
-    {file = "rpds_py-0.30.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:495aeca4b93d465efde585977365187149e75383ad2684f81519f504f5c13038"},
-    {file = "rpds_py-0.30.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d9a0ca5da0386dee0655b4ccdf46119df60e0f10da268d04fe7cc87886872ba7"},
-    {file = "rpds_py-0.30.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8d6d1cc13664ec13c1b84241204ff3b12f9bb82464b8ad6e7a5d3486975c2eed"},
-    {file = "rpds_py-0.30.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3896fa1be39912cf0757753826bc8bdc8ca331a28a7c4ae46b7a21280b06bb85"},
-    {file = "rpds_py-0.30.0-cp311-cp311-win32.whl", hash = "sha256:55f66022632205940f1827effeff17c4fa7ae1953d2b74a8581baaefb7d16f8c"},
-    {file = "rpds_py-0.30.0-cp311-cp311-win_amd64.whl", hash = "sha256:a51033ff701fca756439d641c0ad09a41d9242fa69121c7d8769604a0a629825"},
-    {file = "rpds_py-0.30.0-cp311-cp311-win_arm64.whl", hash = "sha256:47b0ef6231c58f506ef0b74d44e330405caa8428e770fec25329ed2cb971a229"},
-    {file = "rpds_py-0.30.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:a161f20d9a43006833cd7068375a94d035714d73a172b681d8881820600abfad"},
-    {file = "rpds_py-0.30.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6abc8880d9d036ecaafe709079969f56e876fcf107f7a8e9920ba6d5a3878d05"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca28829ae5f5d569bb62a79512c842a03a12576375d5ece7d2cadf8abe96ec28"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a1010ed9524c73b94d15919ca4d41d8780980e1765babf85f9a2f90d247153dd"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f8d1736cfb49381ba528cd5baa46f82fdc65c06e843dab24dd70b63d09121b3f"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d948b135c4693daff7bc2dcfc4ec57237a29bd37e60c2fabf5aff2bbacf3e2f1"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47f236970bccb2233267d89173d3ad2703cd36a0e2a6e92d0560d333871a3d23"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:2e6ecb5a5bcacf59c3f912155044479af1d0b6681280048b338b28e364aca1f6"},
-    {file = "rpds_py-0.30.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a8fa71a2e078c527c3e9dc9fc5a98c9db40bcc8a92b4e8858e36d329f8684b51"},
-    {file = "rpds_py-0.30.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:73c67f2db7bc334e518d097c6d1e6fed021bbc9b7d678d6cc433478365d1d5f5"},
-    {file = "rpds_py-0.30.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:5ba103fb455be00f3b1c2076c9d4264bfcb037c976167a6047ed82f23153f02e"},
-    {file = "rpds_py-0.30.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7cee9c752c0364588353e627da8a7e808a66873672bcb5f52890c33fd965b394"},
-    {file = "rpds_py-0.30.0-cp312-cp312-win32.whl", hash = "sha256:1ab5b83dbcf55acc8b08fc62b796ef672c457b17dbd7820a11d6c52c06839bdf"},
-    {file = "rpds_py-0.30.0-cp312-cp312-win_amd64.whl", hash = "sha256:a090322ca841abd453d43456ac34db46e8b05fd9b3b4ac0c78bcde8b089f959b"},
-    {file = "rpds_py-0.30.0-cp312-cp312-win_arm64.whl", hash = "sha256:669b1805bd639dd2989b281be2cfd951c6121b65e729d9b843e9639ef1fd555e"},
-    {file = "rpds_py-0.30.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:f83424d738204d9770830d35290ff3273fbb02b41f919870479fab14b9d303b2"},
-    {file = "rpds_py-0.30.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e7536cd91353c5273434b4e003cbda89034d67e7710eab8761fd918ec6c69cf8"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2771c6c15973347f50fece41fc447c054b7ac2ae0502388ce3b6738cd366e3d4"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0a59119fc6e3f460315fe9d08149f8102aa322299deaa5cab5b40092345c2136"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:76fec018282b4ead0364022e3c54b60bf368b9d926877957a8624b58419169b7"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:692bef75a5525db97318e8cd061542b5a79812d711ea03dbc1f6f8dbb0c5f0d2"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9027da1ce107104c50c81383cae773ef5c24d296dd11c99e2629dbd7967a20c6"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:9cf69cdda1f5968a30a359aba2f7f9aa648a9ce4b580d6826437f2b291cfc86e"},
-    {file = "rpds_py-0.30.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a4796a717bf12b9da9d3ad002519a86063dcac8988b030e405704ef7d74d2d9d"},
-    {file = "rpds_py-0.30.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5d4c2aa7c50ad4728a094ebd5eb46c452e9cb7edbfdb18f9e1221f597a73e1e7"},
-    {file = "rpds_py-0.30.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba81a9203d07805435eb06f536d95a266c21e5b2dfbf6517748ca40c98d19e31"},
-    {file = "rpds_py-0.30.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:945dccface01af02675628334f7cf49c2af4c1c904748efc5cf7bbdf0b579f95"},
-    {file = "rpds_py-0.30.0-cp313-cp313-win32.whl", hash = "sha256:b40fb160a2db369a194cb27943582b38f79fc4887291417685f3ad693c5a1d5d"},
-    {file = "rpds_py-0.30.0-cp313-cp313-win_amd64.whl", hash = "sha256:806f36b1b605e2d6a72716f321f20036b9489d29c51c91f4dd29a3e3afb73b15"},
-    {file = "rpds_py-0.30.0-cp313-cp313-win_arm64.whl", hash = "sha256:d96c2086587c7c30d44f31f42eae4eac89b60dabbac18c7669be3700f13c3ce1"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:eb0b93f2e5c2189ee831ee43f156ed34e2a89a78a66b98cadad955972548be5a"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:922e10f31f303c7c920da8981051ff6d8c1a56207dbdf330d9047f6d30b70e5e"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdc62c8286ba9bf7f47befdcea13ea0e26bf294bda99758fd90535cbaf408000"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:47f9a91efc418b54fb8190a6b4aa7813a23fb79c51f4bb84e418f5476c38b8db"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1f3587eb9b17f3789ad50824084fa6f81921bbf9a795826570bda82cb3ed91f2"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:39c02563fc592411c2c61d26b6c5fe1e51eaa44a75aa2c8735ca88b0d9599daa"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51a1234d8febafdfd33a42d97da7a43f5dcb120c1060e352a3fbc0c6d36e2083"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:eb2c4071ab598733724c08221091e8d80e89064cd472819285a9ab0f24bcedb9"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6bdfdb946967d816e6adf9a3d8201bfad269c67efe6cefd7093ef959683c8de0"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c77afbd5f5250bf27bf516c7c4a016813eb2d3e116139aed0096940c5982da94"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:61046904275472a76c8c90c9ccee9013d70a6d0f73eecefd38c1ae7c39045a08"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4c5f36a861bc4b7da6516dbdf302c55313afa09b81931e8280361a4f6c9a2d27"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-win32.whl", hash = "sha256:3d4a69de7a3e50ffc214ae16d79d8fbb0922972da0356dcf4d0fdca2878559c6"},
-    {file = "rpds_py-0.30.0-cp313-cp313t-win_amd64.whl", hash = "sha256:f14fc5df50a716f7ece6a80b6c78bb35ea2ca47c499e422aa4463455dd96d56d"},
-    {file = "rpds_py-0.30.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:68f19c879420aa08f61203801423f6cd5ac5f0ac4ac82a2368a9fcd6a9a075e0"},
-    {file = "rpds_py-0.30.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:ec7c4490c672c1a0389d319b3a9cfcd098dcdc4783991553c332a15acf7249be"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f251c812357a3fed308d684a5079ddfb9d933860fc6de89f2b7ab00da481e65f"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac98b175585ecf4c0348fd7b29c3864bda53b805c773cbf7bfdaffc8070c976f"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3e62880792319dbeb7eb866547f2e35973289e7d5696c6e295476448f5b63c87"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4e7fc54e0900ab35d041b0601431b0a0eb495f0851a0639b6ef90f7741b39a18"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47e77dc9822d3ad616c3d5759ea5631a75e5809d5a28707744ef79d7a1bcfcad"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b4dc1a6ff022ff85ecafef7979a2c6eb423430e05f1165d6688234e62ba99a07"},
-    {file = "rpds_py-0.30.0-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4559c972db3a360808309e06a74628b95eaccbf961c335c8fe0d590cf587456f"},
-    {file = "rpds_py-0.30.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:0ed177ed9bded28f8deb6ab40c183cd1192aa0de40c12f38be4d59cd33cb5c65"},
-    {file = "rpds_py-0.30.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ad1fa8db769b76ea911cb4e10f049d80bf518c104f15b3edb2371cc65375c46f"},
-    {file = "rpds_py-0.30.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:46e83c697b1f1c72b50e5ee5adb4353eef7406fb3f2043d64c33f20ad1c2fc53"},
-    {file = "rpds_py-0.30.0-cp314-cp314-win32.whl", hash = "sha256:ee454b2a007d57363c2dfd5b6ca4a5d7e2c518938f8ed3b706e37e5d470801ed"},
-    {file = "rpds_py-0.30.0-cp314-cp314-win_amd64.whl", hash = "sha256:95f0802447ac2d10bcc69f6dc28fe95fdf17940367b21d34e34c737870758950"},
-    {file = "rpds_py-0.30.0-cp314-cp314-win_arm64.whl", hash = "sha256:613aa4771c99f03346e54c3f038e4cc574ac09a3ddfb0e8878487335e96dead6"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:7e6ecfcb62edfd632e56983964e6884851786443739dbfe3582947e87274f7cb"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a1d0bc22a7cdc173fedebb73ef81e07faef93692b8c1ad3733b67e31e1b6e1b8"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d08f00679177226c4cb8c5265012eea897c8ca3b93f429e546600c971bcbae7"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5965af57d5848192c13534f90f9dd16464f3c37aaf166cc1da1cae1fd5a34898"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9a4e86e34e9ab6b667c27f3211ca48f73dba7cd3d90f8d5b11be56e5dbc3fb4e"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5d3e6b26f2c785d65cc25ef1e5267ccbe1b069c5c21b8cc724efee290554419"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:626a7433c34566535b6e56a1b39a7b17ba961e97ce3b80ec62e6f1312c025551"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:acd7eb3f4471577b9b5a41baf02a978e8bdeb08b4b355273994f8b87032000a8"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe5fa731a1fa8a0a56b0977413f8cacac1768dad38d16b3a296712709476fbd5"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:74a3243a411126362712ee1524dfc90c650a503502f135d54d1b352bd01f2404"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:3e8eeb0544f2eb0d2581774be4c3410356eba189529a6b3e36bbbf9696175856"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:dbd936cde57abfee19ab3213cf9c26be06d60750e60a8e4dd85d1ab12c8b1f40"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-win32.whl", hash = "sha256:dc824125c72246d924f7f796b4f63c1e9dc810c7d9e2355864b3c3a73d59ade0"},
-    {file = "rpds_py-0.30.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27f4b0e92de5bfbc6f86e43959e6edd1425c33b5e69aab0984a72047f2bcf1e3"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c2262bdba0ad4fc6fb5545660673925c2d2a5d9e2e0fb603aad545427be0fc58"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ee6af14263f25eedc3bb918a3c04245106a42dfd4f5c2285ea6f997b1fc3f89a"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3adbb8179ce342d235c31ab8ec511e66c73faa27a47e076ccc92421add53e2bb"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:250fa00e9543ac9b97ac258bd37367ff5256666122c2d0f2bc97577c60a1818c"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9854cf4f488b3d57b9aaeb105f06d78e5529d3145b1e4a41750167e8c213c6d3"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:993914b8e560023bc0a8bf742c5f303551992dcb85e247b1e5c7f4a7d145bda5"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58edca431fb9b29950807e301826586e5bbf24163677732429770a697ffe6738"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:dea5b552272a944763b34394d04577cf0f9bd013207bc32323b5a89a53cf9c2f"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ba3af48635eb83d03f6c9735dfb21785303e73d22ad03d489e88adae6eab8877"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:dff13836529b921e22f15cb099751209a60009731a68519630a24d61f0b1b30a"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:1b151685b23929ab7beec71080a8889d4d6d9fa9a983d213f07121205d48e2c4"},
-    {file = "rpds_py-0.30.0-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:ac37f9f516c51e5753f27dfdef11a88330f04de2d564be3991384b2f3535d02e"},
-    {file = "rpds_py-0.30.0.tar.gz", hash = "sha256:dd8ff7cf90014af0c0f787eea34794ebf6415242ee1d6fa91eaba725cc441e84"},
-]
-
 [[package]]
 name = "tomli"
-version = "2.4.0"
+version = "2.3.0"
 description = "A lil' TOML parser"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "tomli-2.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b5ef256a3fd497d4973c11bf142e9ed78b150d36f5773f1ca6088c230ffc5867"},
+    {file = "tomli-2.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:88bd15eb972f3664f5ed4b57c1634a97153b4bac4479dcb6a495f41921eb7f45"},
-    {file = "tomli-2.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5572e41282d5268eb09a697c89a7bee84fae66511f87533a6f88bd2f7b652da9"},
+    {file = "tomli-2.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:883b1c0d6398a6a9d29b508c331fa56adbcdff647f6ace4dfca0f50e90dfd0ba"},
-    {file = "tomli-2.4.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:551e321c6ba03b55676970b47cb1b73f14a0a4dce6a3e1a9458fd6d921d72e95"},
+    {file = "tomli-2.3.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d1381caf13ab9f300e30dd8feadb3de072aeb86f1d34a8569453ff32a7dea4bf"},
-    {file = "tomli-2.4.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5e3f639a7a8f10069d0e15408c0b96a2a828cfdec6fca05296ebcdcc28ca7c76"},
+    {file = "tomli-2.3.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a0e285d2649b78c0d9027570d4da3425bdb49830a6156121360b3f8511ea3441"},
-    {file = "tomli-2.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1b168f2731796b045128c45982d3a4874057626da0e2ef1fdd722848b741361d"},
+    {file = "tomli-2.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0a154a9ae14bfcf5d8917a59b51ffd5a3ac1fd149b71b47a3a104ca4edcfa845"},
-    {file = "tomli-2.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:133e93646ec4300d651839d382d63edff11d8978be23da4cc106f5a18b7d0576"},
+    {file = "tomli-2.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:74bf8464ff93e413514fefd2be591c3b0b23231a77f901db1eb30d6f712fc42c"},
-    {file = "tomli-2.4.0-cp311-cp311-win32.whl", hash = "sha256:b6c78bdf37764092d369722d9946cb65b8767bfa4110f902a1b2542d8d173c8a"},
+    {file = "tomli-2.3.0-cp311-cp311-win32.whl", hash = "sha256:00b5f5d95bbfc7d12f91ad8c593a1659b6387b43f054104cda404be6bda62456"},
-    {file = "tomli-2.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:d3d1654e11d724760cdb37a3d7691f0be9db5fbdaef59c9f532aabf87006dbaa"},
+    {file = "tomli-2.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:4dc4ce8483a5d429ab602f111a93a6ab1ed425eae3122032db7e9acf449451be"},
-    {file = "tomli-2.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:cae9c19ed12d4e8f3ebf46d1a75090e4c0dc16271c5bce1c833ac168f08fb614"},
+    {file = "tomli-2.3.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d7d86942e56ded512a594786a5ba0a5e521d02529b3826e7761a05138341a2ac"},
-    {file = "tomli-2.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:920b1de295e72887bafa3ad9f7a792f811847d57ea6b1215154030cf131f16b1"},
+    {file = "tomli-2.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:73ee0b47d4dad1c5e996e3cd33b8a76a50167ae5f96a2607cbe8cc773506ab22"},
-    {file = "tomli-2.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7d6d9a4aee98fac3eab4952ad1d73aee87359452d1c086b5ceb43ed02ddb16b8"},
+    {file = "tomli-2.3.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:792262b94d5d0a466afb5bc63c7daa9d75520110971ee269152083270998316f"},
-    {file = "tomli-2.4.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:36b9d05b51e65b254ea6c2585b59d2c4cb91c8a3d91d0ed0f17591a29aaea54a"},
+    {file = "tomli-2.3.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4f195fe57ecceac95a66a75ac24d9d5fbc98ef0962e09b2eddec5d39375aae52"},
-    {file = "tomli-2.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1c8a885b370751837c029ef9bc014f27d80840e48bac415f3412e6593bbc18c1"},
+    {file = "tomli-2.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e31d432427dcbf4d86958c184b9bfd1e96b5b71f8eb17e6d02531f434fd335b8"},
-    {file = "tomli-2.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8768715ffc41f0008abe25d808c20c3d990f42b6e2e58305d5da280ae7d1fa3b"},
+    {file = "tomli-2.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b0882799624980785240ab732537fcfc372601015c00f7fc367c55308c186f6"},
-    {file = "tomli-2.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7b438885858efd5be02a9a133caf5812b8776ee0c969fea02c45e8e3f296ba51"},
+    {file = "tomli-2.3.0-cp312-cp312-win32.whl", hash = "sha256:ff72b71b5d10d22ecb084d345fc26f42b5143c5533db5e2eaba7d2d335358876"},
-    {file = "tomli-2.4.0-cp312-cp312-win32.whl", hash = "sha256:0408e3de5ec77cc7f81960c362543cbbd91ef883e3138e81b729fc3eea5b9729"},
+    {file = "tomli-2.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:1cb4ed918939151a03f33d4242ccd0aa5f11b3547d0cf30f7c74a408a5b99878"},
-    {file = "tomli-2.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:685306e2cc7da35be4ee914fd34ab801a6acacb061b6a7abca922aaf9ad368da"},
+    {file = "tomli-2.3.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5192f562738228945d7b13d4930baffda67b69425a7f0da96d360b0a3888136b"},
-    {file = "tomli-2.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:5aa48d7c2356055feef06a43611fc401a07337d5b006be13a30f6c58f869e3c3"},
+    {file = "tomli-2.3.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:be71c93a63d738597996be9528f4abe628d1adf5e6eb11607bc8fe1a510b5dae"},
-    {file = "tomli-2.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:84d081fbc252d1b6a982e1870660e7330fb8f90f676f6e78b052ad4e64714bf0"},
+    {file = "tomli-2.3.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c4665508bcbac83a31ff8ab08f424b665200c0e1e645d2bd9ab3d3e557b6185b"},
-    {file = "tomli-2.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9a08144fa4cba33db5255f9b74f0b89888622109bd2776148f2597447f92a94e"},
+    {file = "tomli-2.3.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4021923f97266babc6ccab9f5068642a0095faa0a51a246a6a02fccbb3514eaf"},
-    {file = "tomli-2.4.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c73add4bb52a206fd0c0723432db123c0c75c280cbd67174dd9d2db228ebb1b4"},
+    {file = "tomli-2.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4ea38c40145a357d513bffad0ed869f13c1773716cf71ccaa83b0fa0cc4e42f"},
-    {file = "tomli-2.4.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fb2945cbe303b1419e2706e711b7113da57b7db31ee378d08712d678a34e51e"},
+    {file = "tomli-2.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ad805ea85eda330dbad64c7ea7a4556259665bdf9d2672f5dccc740eb9d3ca05"},
-    {file = "tomli-2.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bbb1b10aa643d973366dc2cb1ad94f99c1726a02343d43cbc011edbfac579e7c"},
+    {file = "tomli-2.3.0-cp313-cp313-win32.whl", hash = "sha256:97d5eec30149fd3294270e889b4234023f2c69747e555a27bd708828353ab606"},
-    {file = "tomli-2.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4cbcb367d44a1f0c2be408758b43e1ffb5308abe0ea222897d6bfc8e8281ef2f"},
+    {file = "tomli-2.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:0c95ca56fbe89e065c6ead5b593ee64b84a26fca063b5d71a1122bf26e533999"},
-    {file = "tomli-2.4.0-cp313-cp313-win32.whl", hash = "sha256:7d49c66a7d5e56ac959cb6fc583aff0651094ec071ba9ad43df785abc2320d86"},
+    {file = "tomli-2.3.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:cebc6fe843e0733ee827a282aca4999b596241195f43b4cc371d64fc6639da9e"},
-    {file = "tomli-2.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:3cf226acb51d8f1c394c1b310e0e0e61fecdd7adcb78d01e294ac297dd2e7f87"},
+    {file = "tomli-2.3.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4c2ef0244c75aba9355561272009d934953817c49f47d768070c3c94355c2aa3"},
-    {file = "tomli-2.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:d20b797a5c1ad80c516e41bc1fb0443ddb5006e9aaa7bda2d71978346aeb9132"},
+    {file = "tomli-2.3.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c22a8bf253bacc0cf11f35ad9808b6cb75ada2631c2d97c971122583b129afbc"},
-    {file = "tomli-2.4.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:26ab906a1eb794cd4e103691daa23d95c6919cc2fa9160000ac02370cc9dd3f6"},
+    {file = "tomli-2.3.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0eea8cc5c5e9f89c9b90c4896a8deefc74f518db5927d0e0e8d4a80953d774d0"},
-    {file = "tomli-2.4.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:20cedb4ee43278bc4f2fee6cb50daec836959aadaf948db5172e776dd3d993fc"},
+    {file = "tomli-2.3.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b74a0e59ec5d15127acdabd75ea17726ac4c5178ae51b85bfe39c4f8a278e879"},
-    {file = "tomli-2.4.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:39b0b5d1b6dd03684b3fb276407ebed7090bbec989fa55838c98560c01113b66"},
+    {file = "tomli-2.3.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b5870b50c9db823c595983571d1296a6ff3e1b88f734a4c8f6fc6188397de005"},
-    {file = "tomli-2.4.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a26d7ff68dfdb9f87a016ecfd1e1c2bacbe3108f4e0f8bcd2228ef9a766c787d"},
+    {file = "tomli-2.3.0-cp314-cp314-win32.whl", hash = "sha256:feb0dacc61170ed7ab602d3d972a58f14ee3ee60494292d384649a3dc38ef463"},
-    {file = "tomli-2.4.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:20ffd184fb1df76a66e34bd1b36b4a4641bd2b82954befa32fe8163e79f1a702"},
+    {file = "tomli-2.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:b273fcbd7fc64dc3600c098e39136522650c49bca95df2d11cf3b626422392c8"},
-    {file = "tomli-2.4.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:75c2f8bbddf170e8effc98f5e9084a8751f8174ea6ccf4fca5398436e0320bc8"},
+    {file = "tomli-2.3.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:940d56ee0410fa17ee1f12b817b37a4d4e4dc4d27340863cc67236c74f582e77"},
-    {file = "tomli-2.4.0-cp314-cp314-win32.whl", hash = "sha256:31d556d079d72db7c584c0627ff3a24c5d3fb4f730221d3444f3efb1b2514776"},
+    {file = "tomli-2.3.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:f85209946d1fe94416debbb88d00eb92ce9cd5266775424ff81bc959e001acaf"},
-    {file = "tomli-2.4.0-cp314-cp314-win_amd64.whl", hash = "sha256:43e685b9b2341681907759cf3a04e14d7104b3580f808cfde1dfdb60ada85475"},
+    {file = "tomli-2.3.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a56212bdcce682e56b0aaf79e869ba5d15a6163f88d5451cbde388d48b13f530"},
-    {file = "tomli-2.4.0-cp314-cp314-win_arm64.whl", hash = "sha256:3d895d56bd3f82ddd6faaff993c275efc2ff38e52322ea264122d72729dca2b2"},
+    {file = "tomli-2.3.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c5f3ffd1e098dfc032d4d3af5c0ac64f6d286d98bc148698356847b80fa4de1b"},
-    {file = "tomli-2.4.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:5b5807f3999fb66776dbce568cc9a828544244a8eb84b84b9bafc080c99597b9"},
+    {file = "tomli-2.3.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5e01decd096b1530d97d5d85cb4dff4af2d8347bd35686654a004f8dea20fc67"},
-    {file = "tomli-2.4.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c084ad935abe686bd9c898e62a02a19abfc9760b5a79bc29644463eaf2840cb0"},
+    {file = "tomli-2.3.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:8a35dd0e643bb2610f156cca8db95d213a90015c11fee76c946aa62b7ae7e02f"},
-    {file = "tomli-2.4.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0f2e3955efea4d1cfbcb87bc321e00dc08d2bcb737fd1d5e398af111d86db5df"},
+    {file = "tomli-2.3.0-cp314-cp314t-win32.whl", hash = "sha256:a1f7f282fe248311650081faafa5f4732bdbfef5d45fe3f2e702fbc6f2d496e0"},
-    {file = "tomli-2.4.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e0fe8a0b8312acf3a88077a0802565cb09ee34107813bba1c7cd591fa6cfc8d"},
+    {file = "tomli-2.3.0-cp314-cp314t-win_amd64.whl", hash = "sha256:70a251f8d4ba2d9ac2542eecf008b3c8a9fc5c3f9f02c56a9d7952612be2fdba"},
-    {file = "tomli-2.4.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:413540dce94673591859c4c6f794dfeaa845e98bf35d72ed59636f869ef9f86f"},
+    {file = "tomli-2.3.0-py3-none-any.whl", hash = "sha256:e95b1af3c5b07d9e643909b5abbec77cd9f1217e6d0bca72b0234736b9fb1f1b"},
-    {file = "tomli-2.4.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:0dc56fef0e2c1c470aeac5b6ca8cc7b640bb93e92d9803ddaf9ea03e198f5b0b"},
+    {file = "tomli-2.3.0.tar.gz", hash = "sha256:64be704a875d2a59753d80ee8a533c3fe183e3f06807ff7dc2232938ccb01549"},
-    {file = "tomli-2.4.0-cp314-cp314t-win32.whl", hash = "sha256:d878f2a6707cc9d53a1be1414bbb419e629c3d6e67f69230217bb663e76b5087"},
-    {file = "tomli-2.4.0-cp314-cp314t-win_amd64.whl", hash = "sha256:2add28aacc7425117ff6364fe9e06a183bb0251b03f986df0e78e974047571fd"},
-    {file = "tomli-2.4.0-cp314-cp314t-win_arm64.whl", hash = "sha256:2b1e3b80e1d5e52e40e9b924ec43d81570f0e7d09d11081b797bc4692765a3d4"},
-    {file = "tomli-2.4.0-py3-none-any.whl", hash = "sha256:1f776e7d669ebceb01dee46484485f43a4048746235e683bcdffacdf1fb4785a"},
-    {file = "tomli-2.4.0.tar.gz", hash = "sha256:aa89c3f6c277dd275d8e243ad24f3b5e701491a860d5121f2cdd399fbb31fc9c"},
 ]
 
 [[package]]
@@ -1094,13 +905,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.6.3"
+version = "2.6.2"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"},
+    {file = "urllib3-2.6.2-py3-none-any.whl", hash = "sha256:ec21cddfe7724fc7cb4ba4bea7aa8e2ef36f607a4bab81aa6ce42a13dc3f03dd"},
-    {file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"},
+    {file = "urllib3-2.6.2.tar.gz", hash = "sha256:016f9c98bb7e98085cb2b4b17b87d2c702975664e4f060c6532e64d1c1a5e797"},
 ]
 
 [package.extras]
@@ -1112,4 +923,4 @@ zstd = ["backports-zstd (>=1.0.0)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "30e16396439f2cdd69005a5b7bdf8144aac33422a77a63accbc9eaa74151d851"
+content-hash = "c3466a6595a9822763431a6dff0c7f835407a2591b92d5995592f8e6802c774a"

pyproject.toml

@@ -1,21 +1,17 @@
 [tool.poetry]
 name = "enroll"
-version = "0.4.3"
+version = "0.1.2"
 description = "Enroll a server's running state retrospectively into Ansible"
 authors = ["Miguel Jacq <mig@mig5.net>"]
 license = "GPL-3.0-or-later"
 readme = "README.md"
 packages = [{ include = "enroll" }]
 repository = "https://git.mig5.net/mig5/enroll"
-include = [
-  { path = "enroll/schema/state.schema.json", format = ["sdist", "wheel"] }
-]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pyyaml = "^6"
+pyyaml = "^6.0.3"
-paramiko = ">=3.5"
+paramiko = "^4.0.0"
-jsonschema = "^4.23.0"
 
 [tool.poetry.scripts]
 enroll = "enroll.cli:main"

release.sh

@@ -42,52 +42,3 @@ for dist in ${DISTS[@]}; do
   debfile=$(ls -1 dist/${release}/*.deb)
   reprepro -b /home/user/git/repo includedeb "${release}" "${debfile}"
 done
-
-# RPM
-sudo apt-get -y install createrepo-c rpm
-BUILD_OUTPUT="${HOME}/git/enroll/dist"
-KEYID="00AE817C24A10C2540461A9C1D7CDE0234DB458D"
-REPO_ROOT="${HOME}/git/repo_rpm"
-REMOTE="letessier.mig5.net:/opt/repo_rpm"
-
-DISTS=(
-  fedora:43
-  fedora:42
-)
-
-for dist in ${DISTS[@]}; do
-  release=$(echo ${dist} | cut -d: -f2)
-  REPO_RELEASE_ROOT="${REPO_ROOT}/${release}"
-  RPM_REPO="${REPO_RELEASE_ROOT}/rpm/x86_64"
-  mkdir -p "$RPM_REPO"
-
-  docker build \
-    --no-cache \
-    -f Dockerfile.rpmbuild \
-    -t enroll-rpm:${release} \
-    --progress=plain \
-    --build-arg BASE_IMAGE=${dist} \
-    .
-
-  rm -rf "$PWD/dist/rpm"/*
-  mkdir -p "$PWD/dist/rpm"
-
-  docker run --rm -v "$PWD":/src -v "$PWD/dist/rpm":/out enroll-rpm:${release}
-  sudo chown -R "${USER}" "$PWD/dist"
-
-  for file in `ls -1 "${BUILD_OUTPUT}/rpm"`; do
-    rpmsign --addsign "${BUILD_OUTPUT}/rpm/$file"
-  done
-
-  cp "${BUILD_OUTPUT}/rpm/"*.rpm "$RPM_REPO/"
-
-  createrepo_c "$RPM_REPO"
-
-  echo "==> Signing repomd.xml..."
-  qubes-gpg-client --local-user "$KEYID" --detach-sign --armor "$RPM_REPO/repodata/repomd.xml" > "$RPM_REPO/repodata/repomd.xml.asc"
-done
-
-echo "==> Syncing repo to server..."
-rsync -aHPvz --exclude=.git --delete "$REPO_ROOT/" "$REMOTE/"
-
-echo "Done!"

rpm/enroll.spec

@@ -1,93 +0,0 @@
-%global upstream_version 0.4.3
-
-Name:           enroll
-Version:        %{upstream_version}
-Release:        1%{?dist}.enroll1
-Summary:        Enroll a server's running state retrospectively into Ansible.
-
-License:        GPL-3.0-or-later
-URL:            https://git.mig5.net/mig5/enroll
-Source0:        %{name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires:  pyproject-rpm-macros
-BuildRequires:  python3-devel
-BuildRequires:  python3-poetry-core
-
-Requires: python3-yaml
-Requires: python3-paramiko
-Requires: python3-jsonschema
-
-Recommends:       jinjaturtle
-
-%description
-Enroll a server's running state retrospectively into Ansible.
-
-%prep
-%autosetup -n enroll
-
-%generate_buildrequires
-%pyproject_buildrequires
-
-%build
-%pyproject_wheel
-
-%install
-%pyproject_install
-%pyproject_save_files enroll
-
-%files -f %{pyproject_files}
-%license LICENSE
-%doc README.md CHANGELOG.md
-%{_bindir}/enroll
-
-%changelog
-* Fri Jan 16 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Add support for AddressFamily and ConnectTimeout in the .ssh/config when using `--remote-ssh-config`.
-* Tue Jan 13 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Support `--remote-ssh-config [path-to-ssh-config]` as an argument in case extra params are required beyond `--remote-port` or `--remote-user`. Note: `--remote-host` must still be s
-et, but it can be an 'alias' represented by the 'Host' value in the ssh config.
-* Sun Jan 11 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Add interactive output when 'enroll diff --enforce' is invoking Ansible.
-* Sat Jan 10 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Introduce `enroll validate` - a tool to validate a harvest against the state schema, or check for missing or orphaned obsolete artifacts in a harvest.
-- Attempt to generate Jinja2 templates of systemd unit files and Postfix main.cf (now that JinjaTurtle supports it)
-- Update pynacl dependency to resolve CVE-2025-69277
-- Add `--exclude-path` to `enroll diff` command, so that you can ignore certain churn from the diff (stuff you still wanted to harvest as a baseline but don't care if it changes day to day)
-- Add `--ignore-package-versions` to `enroll diff` command, to optionally ignore package upgrades (e.g due to patching) from the diff.
-- Add tags to the playbook for each role, to allow easier targeting of specific roles during play later.
-- Add `--enforce` mode to `enroll diff`. If there is diff detected between the two harvests, and it can enforce restoring the state from the older harvest, it will manifest the state and apply it with ansible.
-Only the specific roles that had diffed will be applied (via the new tags capability)
-* Mon Jan 05 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Introduce `enroll explain` - a tool to analyze and explain what's in (or not in) a harvest and why.
-- Centralise the cron and logrotate stuff into their respective roles, we had a bit of duplication between roles based on harvest discovery.
-- Capture other files in the user's home directory such as `.bashrc`, `.bash_aliases`, `.profile`, if these files differ from the `/etc/skel` defaults
-- Ignore files that end with a tilde or - (probably backup files generated by editors or shadow file changes)
-- Manage certain symlinks e.g for apache2/nginx sites-enabled and so on
-* Sun Jan 04 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Introduce --ask-become-pass or -K to support password-required sudo on remote hosts, just like Ansible. It will also fall back to this prompt if a password is required but the arg wasn't passed in.
-* Sat Jan 03 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Fix stat() of parent directory so that we set directory perms correct on --include paths.
-- Set pty for remote calls when sudo is required, to help systems with limits on sudo without pty
-* Fri Jan 02 2026 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Don't accidentally add extra_paths role to usr_local_custom list, resulting in extra_paths appearing twice in manifested playbook
-- Ensure directories in the tree of anything included with --include are defined in the state and manifest so we make dirs before we try to create files
-* Mon Dec 29 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Add version CLI arg
-- Add ability to enroll RH-style systems (DNF5/DNF/RPM)
-- Refactor harvest state to track package versions
-* Sun Dec 28 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Fix an attribution bug for certain files ending up in the wrong package/role.
-* Sun Dec 28 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- DRY up some code logic
-- More test coverage
-* Sun Dec 28 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Consolidate logrotate and cron files into their main service/package roles if they exist.
-- Standardise on MAX_FILES_CAP in one place
-- Manage apt stuff in its own role, not in etc_custom
-* Sat Dec 27 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Attempt to capture more stuff from /etc that might not be attributable to a specific package. This includes common singletons and systemd timers
-- Avoid duplicate apt data in package-specific roles.
-* Sat Dec 27 2025 Miguel Jacq <mig@mig5.net> - %{version}-%{release}
-- Initial RPM packaging for Fedora 42

tests.sh

@@ -9,43 +9,14 @@ BUNDLE_DIR="/tmp/bundle"
 ANSIBLE_DIR="/tmp/ansible"
 rm -rf "${BUNDLE_DIR}" "${ANSIBLE_DIR}"
 
-# Install something that has symlinks like apache2,
-# to extend the manifests that will be linted later
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apache2
-
 # Generate data
 poetry run \
 	enroll single-shot \
 	  --harvest "${BUNDLE_DIR}" \
 	  --out "${ANSIBLE_DIR}"
 
-# Analyse
-poetry run \
-	enroll explain "${BUNDLE_DIR}"
-poetry run \
-        enroll explain "${BUNDLE_DIR}" --format json | jq
-
-# Validate
-poetry run \
-	enroll validate --fail-on-warnings "${BUNDLE_DIR}"
-
-# Install/remove something, harvest again and diff the harvests
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends cowsay
-poetry run \
-	enroll harvest --out "${BUNDLE_DIR}2"
-# Validate
-poetry run \
-	enroll validate --fail-on-warnings "${BUNDLE_DIR}2"
-# Diff
-poetry run \
-	enroll diff \
-	  --old "${BUNDLE_DIR}" \
-	  --new "${BUNDLE_DIR}2" \
-	  --format json | jq
-DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge cowsay
-
-# Ansible test
 builtin cd "${ANSIBLE_DIR}"
+
 # Lint
 ansible-lint "${ANSIBLE_DIR}"
 

tests/test___main__.py

@@ -1,18 +0,0 @@
-from __future__ import annotations
-
-import runpy
-
-
-def test_module_main_invokes_cli_main(monkeypatch):
-    import enroll.cli
-
-    called = {"ok": False}
-
-    def fake_main() -> None:
-        called["ok"] = True
-
-    monkeypatch.setattr(enroll.cli, "main", fake_main)
-
-    # Execute enroll.__main__ as if `python -m enroll`.
-    runpy.run_module("enroll.__main__", run_name="__main__")
-    assert called["ok"] is True

tests/test_accounts.py

@@ -1,143 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-
-def test_parse_login_defs_parses_known_keys(tmp_path: Path):
-    from enroll.accounts import parse_login_defs
-
-    p = tmp_path / "login.defs"
-    p.write_text(
-        """
-        # comment
-        UID_MIN 1000
-        UID_MAX 60000
-        SYS_UID_MIN 100
-        SYS_UID_MAX 999
-        UID_MIN not_an_int
-        OTHER 123
-        """,
-        encoding="utf-8",
-    )
-
-    vals = parse_login_defs(str(p))
-    assert vals["UID_MIN"] == 1000
-    assert vals["UID_MAX"] == 60000
-    assert vals["SYS_UID_MIN"] == 100
-    assert vals["SYS_UID_MAX"] == 999
-    assert "OTHER" not in vals
-
-
-def test_parse_passwd_and_group_and_ssh_files(tmp_path: Path):
-    from enroll.accounts import find_user_ssh_files, parse_group, parse_passwd
-
-    passwd = tmp_path / "passwd"
-    passwd.write_text(
-        "\n".join(
-            [
-                "root:x:0:0:root:/root:/bin/bash",
-                "# comment",
-                "alice:x:1000:1000:Alice:/home/alice:/bin/bash",
-                "bob:x:1001:1000:Bob:/home/bob:/usr/sbin/nologin",
-                "badline",
-                "cathy:x:notint:1000:Cathy:/home/cathy:/bin/bash",
-                "",
-            ]
-        ),
-        encoding="utf-8",
-    )
-
-    group = tmp_path / "group"
-    group.write_text(
-        "\n".join(
-            [
-                "root:x:0:",
-                "users:x:1000:alice,bob",
-                "admins:x:1002:alice",
-                "badgroup:x:notint:alice",
-                "",
-            ]
-        ),
-        encoding="utf-8",
-    )
-
-    rows = parse_passwd(str(passwd))
-    assert ("alice", 1000, 1000, "Alice", "/home/alice", "/bin/bash") in rows
-    assert all(r[0] != "cathy" for r in rows)  # skipped invalid UID
-
-    gid_to_name, name_to_gid, members = parse_group(str(group))
-    assert gid_to_name[1000] == "users"
-    assert name_to_gid["admins"] == 1002
-    assert "alice" in members["admins"]
-
-    # ssh discovery: only authorized_keys, no symlinks
-    home = tmp_path / "home" / "alice"
-    sshdir = home / ".ssh"
-    sshdir.mkdir(parents=True)
-    ak = sshdir / "authorized_keys"
-    ak.write_text("ssh-ed25519 AAA...", encoding="utf-8")
-    # a symlink should be ignored
-    (sshdir / "authorized_keys2").write_text("x", encoding="utf-8")
-    os.symlink(str(sshdir / "authorized_keys2"), str(sshdir / "authorized_keys_link"))
-    assert find_user_ssh_files(str(home)) == [str(ak)]
-
-
-def test_collect_non_system_users(monkeypatch, tmp_path: Path):
-    import enroll.accounts as a
-
-    orig_parse_login_defs = a.parse_login_defs
-    orig_parse_passwd = a.parse_passwd
-    orig_parse_group = a.parse_group
-
-    # Provide controlled passwd/group/login.defs inputs via monkeypatch.
-    passwd = tmp_path / "passwd"
-    passwd.write_text(
-        "\n".join(
-            [
-                "root:x:0:0:root:/root:/bin/bash",
-                "nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin",
-                "alice:x:1000:1000:Alice:/home/alice:/bin/bash",
-                "sysuser:x:200:200:Sys:/home/sys:/bin/bash",
-                "bob:x:1001:1000:Bob:/home/bob:/bin/false",
-                "",
-            ]
-        ),
-        encoding="utf-8",
-    )
-    group = tmp_path / "group"
-    group.write_text(
-        "\n".join(
-            [
-                "users:x:1000:alice,bob",
-                "admins:x:1002:alice",
-                "",
-            ]
-        ),
-        encoding="utf-8",
-    )
-
-    defs = tmp_path / "login.defs"
-    defs.write_text("UID_MIN 1000\n", encoding="utf-8")
-
-    monkeypatch.setattr(
-        a, "parse_login_defs", lambda path=str(defs): orig_parse_login_defs(path)
-    )
-    monkeypatch.setattr(
-        a, "parse_passwd", lambda path=str(passwd): orig_parse_passwd(path)
-    )
-    monkeypatch.setattr(
-        a, "parse_group", lambda path=str(group): orig_parse_group(path)
-    )
-
-    # Use a stable fake ssh discovery.
-    monkeypatch.setattr(
-        a, "find_user_ssh_files", lambda home: [f"{home}/.ssh/authorized_keys"]
-    )
-
-    users = a.collect_non_system_users()
-    assert [u.name for u in users] == ["alice"]
-    u = users[0]
-    assert u.primary_group == "users"
-    assert u.supplementary_groups == ["admins"]
-    assert u.ssh_files == ["/home/alice/.ssh/authorized_keys"]

tests/test_cache_security.py

@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-import pytest
-
-
-def test_ensure_dir_secure_refuses_symlink(tmp_path: Path):
-    from enroll.cache import _ensure_dir_secure
-
-    target = tmp_path / "target"
-    target.mkdir()
-    link = tmp_path / "link"
-    link.symlink_to(target, target_is_directory=True)
-
-    with pytest.raises(RuntimeError):
-        _ensure_dir_secure(link)
-
-
-def test_ensure_dir_secure_ignores_chmod_failures(tmp_path: Path, monkeypatch):
-    from enroll.cache import _ensure_dir_secure
-
-    d = tmp_path / "d"
-
-    def boom(_path: str, _mode: int):
-        raise OSError("no")
-
-    monkeypatch.setattr(os, "chmod", boom)
-
-    # Should not raise.
-    _ensure_dir_secure(d)
-    assert d.exists() and d.is_dir()

tests/test_cli.py

@@ -1,29 +1,14 @@
-from __future__ import annotations
 import sys
 
-import pytest
 import enroll.cli as cli
 
-from pathlib import Path
-
-from enroll.remote import RemoteSudoPasswordRequired
-from enroll.sopsutil import SopsError
-
 
 def test_cli_harvest_subcommand_calls_harvest(monkeypatch, capsys, tmp_path):
     called = {}
 
-    def fake_harvest(
+    def fake_harvest(out: str, dangerous: bool = False):
-        out: str,
-        dangerous: bool = False,
-        include_paths=None,
-        exclude_paths=None,
-        **_kwargs,
-    ):
         called["out"] = out
         called["dangerous"] = dangerous
-        called["include_paths"] = include_paths or []
-        called["exclude_paths"] = exclude_paths or []
         return str(tmp_path / "state.json")
 
     monkeypatch.setattr(cli, "harvest", fake_harvest)
@@ -32,8 +17,6 @@ def test_cli_harvest_subcommand_calls_harvest(monkeypatch, capsys, tmp_path):
     cli.main()
     assert called["out"] == str(tmp_path)
     assert called["dangerous"] is False
-    assert called["include_paths"] == []
-    assert called["exclude_paths"] == []
     captured = capsys.readouterr()
     assert str(tmp_path / "state.json") in captured.out
 
@@ -72,16 +55,8 @@ def test_cli_manifest_subcommand_calls_manifest(monkeypatch, tmp_path):
 def test_cli_enroll_subcommand_runs_harvest_then_manifest(monkeypatch, tmp_path):
     calls = []
 
-    def fake_harvest(
+    def fake_harvest(bundle_dir: str, dangerous: bool = False):
-        bundle_dir: str,
+        calls.append(("harvest", bundle_dir, dangerous))
-        dangerous: bool = False,
-        include_paths=None,
-        exclude_paths=None,
-        **_kwargs,
-    ):
-        calls.append(
-            ("harvest", bundle_dir, dangerous, include_paths or [], exclude_paths or [])
-        )
         return str(tmp_path / "bundle" / "state.json")
 
     def fake_manifest(bundle_dir: str, out_dir: str, **kwargs):
@@ -112,7 +87,7 @@ def test_cli_enroll_subcommand_runs_harvest_then_manifest(monkeypatch, tmp_path)
 
     cli.main()
     assert calls == [
-        ("harvest", str(tmp_path / "bundle"), False, [], []),
+        ("harvest", str(tmp_path / "bundle"), False),
         ("manifest", str(tmp_path / "bundle"), str(tmp_path / "ansible"), None, "auto"),
     ]
 
@@ -120,17 +95,9 @@ def test_cli_enroll_subcommand_runs_harvest_then_manifest(monkeypatch, tmp_path)
 def test_cli_harvest_dangerous_flag_is_forwarded(monkeypatch, tmp_path):
     called = {}
 
-    def fake_harvest(
+    def fake_harvest(out: str, dangerous: bool = False):
-        out: str,
-        dangerous: bool = False,
-        include_paths=None,
-        exclude_paths=None,
-        **_kwargs,
-    ):
         called["out"] = out
         called["dangerous"] = dangerous
-        called["include_paths"] = include_paths or []
-        called["exclude_paths"] = exclude_paths or []
         return str(tmp_path / "state.json")
 
     monkeypatch.setattr(cli, "harvest", fake_harvest)
@@ -140,8 +107,6 @@ def test_cli_harvest_dangerous_flag_is_forwarded(monkeypatch, tmp_path):
 
     cli.main()
     assert called["dangerous"] is True
-    assert called["include_paths"] == []
-    assert called["exclude_paths"] == []
 
 
 def test_cli_harvest_remote_calls_remote_harvest_and_uses_cache_dir(
@@ -166,9 +131,6 @@ def test_cli_harvest_remote_calls_remote_harvest_and_uses_cache_dir(
         remote_user,
         dangerous,
         no_sudo,
-        include_paths=None,
-        exclude_paths=None,
-        **_kwargs,
     ):
         called.update(
             {
@@ -178,8 +140,6 @@ def test_cli_harvest_remote_calls_remote_harvest_and_uses_cache_dir(
                 "remote_user": remote_user,
                 "dangerous": dangerous,
                 "no_sudo": no_sudo,
-                "include_paths": include_paths or [],
-                "exclude_paths": exclude_paths or [],
             }
         )
         return cache_dir / "state.json"
@@ -209,8 +169,6 @@ def test_cli_harvest_remote_calls_remote_harvest_and_uses_cache_dir(
     assert called["remote_user"] == "alice"
     assert called["dangerous"] is False
     assert called["no_sudo"] is False
-    assert called["include_paths"] == []
-    assert called["exclude_paths"] == []
 
 
 def test_cli_single_shot_remote_without_harvest_prints_state_path(
@@ -265,113 +223,6 @@ def test_cli_single_shot_remote_without_harvest_prints_state_path(
     assert ("manifest", str(cache_dir), str(ansible_dir), "example.test") in calls
 
 
-def test_cli_harvest_remote_ask_become_pass_prompts_and_passes_password(
-    monkeypatch, tmp_path
-):
-    from enroll.cache import HarvestCache
-    import enroll.remote as r
-
-    cache_dir = tmp_path / "cache"
-    cache_dir.mkdir()
-
-    called = {}
-
-    def fake_cache_dir(*, hint=None):
-        return HarvestCache(dir=cache_dir)
-
-    def fake__remote_harvest(*, sudo_password=None, **kwargs):
-        called["sudo_password"] = sudo_password
-        return cache_dir / "state.json"
-
-    monkeypatch.setattr(cli, "new_harvest_cache_dir", fake_cache_dir)
-    monkeypatch.setattr(r, "_remote_harvest", fake__remote_harvest)
-    monkeypatch.setattr(r.getpass, "getpass", lambda _prompt="": "pw123")
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "harvest",
-            "--remote-host",
-            "example.test",
-            "--ask-become-pass",
-        ],
-    )
-
-    cli.main()
-    assert called["sudo_password"] == "pw123"
-
-
-def test_cli_harvest_remote_password_required_fallback_prompts_and_retries(
-    monkeypatch, tmp_path
-):
-    from enroll.cache import HarvestCache
-    import enroll.remote as r
-
-    cache_dir = tmp_path / "cache"
-    cache_dir.mkdir()
-
-    def fake_cache_dir(*, hint=None):
-        return HarvestCache(dir=cache_dir)
-
-    calls = []
-
-    def fake__remote_harvest(*, sudo_password=None, **kwargs):
-        calls.append(sudo_password)
-        if sudo_password is None:
-            raise r.RemoteSudoPasswordRequired("pw required")
-        return cache_dir / "state.json"
-
-    class _TTYStdin:
-        def isatty(self):
-            return True
-
-    monkeypatch.setattr(cli, "new_harvest_cache_dir", fake_cache_dir)
-    monkeypatch.setattr(r, "_remote_harvest", fake__remote_harvest)
-    monkeypatch.setattr(r.getpass, "getpass", lambda _prompt="": "pw456")
-    monkeypatch.setattr(sys, "stdin", _TTYStdin())
-
-    monkeypatch.setattr(
-        sys, "argv", ["enroll", "harvest", "--remote-host", "example.test"]
-    )
-
-    cli.main()
-    assert calls == [None, "pw456"]
-
-
-def test_cli_harvest_remote_password_required_noninteractive_errors(
-    monkeypatch, tmp_path
-):
-    from enroll.cache import HarvestCache
-    import enroll.remote as r
-
-    cache_dir = tmp_path / "cache"
-    cache_dir.mkdir()
-
-    def fake_cache_dir(*, hint=None):
-        return HarvestCache(dir=cache_dir)
-
-    def fake__remote_harvest(*, sudo_password=None, **kwargs):
-        raise r.RemoteSudoPasswordRequired("pw required")
-
-    class _NoTTYStdin:
-        def isatty(self):
-            return False
-
-    monkeypatch.setattr(cli, "new_harvest_cache_dir", fake_cache_dir)
-    monkeypatch.setattr(r, "_remote_harvest", fake__remote_harvest)
-    monkeypatch.setattr(sys, "stdin", _NoTTYStdin())
-
-    monkeypatch.setattr(
-        sys, "argv", ["enroll", "harvest", "--remote-host", "example.test"]
-    )
-
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert "--ask-become-pass" in str(e.value)
-
-
 def test_cli_manifest_common_args(monkeypatch, tmp_path):
     """Ensure --fqdn and jinjaturtle mode flags are forwarded correctly."""
 
@@ -403,286 +254,3 @@ def test_cli_manifest_common_args(monkeypatch, tmp_path):
     cli.main()
     assert called["fqdn"] == "example.test"
     assert called["jinjaturtle"] == "off"
-
-
-def test_cli_explain_passes_args_and_writes_stdout(monkeypatch, capsys, tmp_path):
-    called = {}
-
-    def fake_explain_state(
-        harvest: str,
-        *,
-        sops_mode: bool = False,
-        fmt: str = "text",
-        max_examples: int = 3,
-    ):
-        called["harvest"] = harvest
-        called["sops_mode"] = sops_mode
-        called["fmt"] = fmt
-        called["max_examples"] = max_examples
-        return "EXPLAINED\n"
-
-    monkeypatch.setattr(cli, "explain_state", fake_explain_state)
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "explain",
-            "--sops",
-            "--format",
-            "json",
-            "--max-examples",
-            "7",
-            str(tmp_path / "bundle" / "state.json"),
-        ],
-    )
-
-    cli.main()
-    out = capsys.readouterr().out
-    assert out == "EXPLAINED\n"
-    assert called["sops_mode"] is True
-    assert called["fmt"] == "json"
-    assert called["max_examples"] == 7
-
-
-def test_discover_config_path_missing_config_value_returns_none(monkeypatch):
-    # Covers the "--config" flag present with no value.
-    monkeypatch.delenv("ENROLL_CONFIG", raising=False)
-    monkeypatch.delenv("XDG_CONFIG_HOME", raising=False)
-    assert cli._discover_config_path(["--config"]) is None
-
-
-def test_discover_config_path_defaults_to_home_config(monkeypatch, tmp_path: Path):
-    # Covers the Path.home() / ".config" fallback.
-    monkeypatch.delenv("ENROLL_CONFIG", raising=False)
-    monkeypatch.delenv("XDG_CONFIG_HOME", raising=False)
-    monkeypatch.setattr(cli.Path, "home", lambda: tmp_path)
-    monkeypatch.setattr(cli.Path, "cwd", lambda: tmp_path)
-
-    cp = tmp_path / ".config" / "enroll" / "enroll.ini"
-    cp.parent.mkdir(parents=True)
-    cp.write_text("[enroll]\n", encoding="utf-8")
-
-    assert cli._discover_config_path(["harvest"]) == cp
-
-
-def test_cli_harvest_local_sops_encrypts_and_prints_path(
-    monkeypatch, tmp_path: Path, capsys
-):
-    out_dir = tmp_path / "out"
-    out_dir.mkdir()
-    calls: dict[str, object] = {}
-
-    def fake_harvest(bundle_dir: str, **kwargs):
-        calls["bundle"] = bundle_dir
-        # Create a minimal state.json so tooling that expects it won't break.
-        Path(bundle_dir).mkdir(parents=True, exist_ok=True)
-        (Path(bundle_dir) / "state.json").write_text("{}", encoding="utf-8")
-        return str(Path(bundle_dir) / "state.json")
-
-    def fake_encrypt(bundle_dir: Path, out_file: Path, fps: list[str]):
-        calls["encrypt"] = (bundle_dir, out_file, fps)
-        out_file.write_text("encrypted", encoding="utf-8")
-        return out_file
-
-    monkeypatch.setattr(cli, "harvest", fake_harvest)
-    monkeypatch.setattr(cli, "_encrypt_harvest_dir_to_sops", fake_encrypt)
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "harvest",
-            "--sops",
-            "ABCDEF",
-            "--out",
-            str(out_dir),
-        ],
-    )
-    cli.main()
-
-    printed = capsys.readouterr().out.strip()
-    assert printed.endswith("harvest.tar.gz.sops")
-    assert Path(printed).exists()
-    assert calls.get("encrypt")
-
-
-def test_cli_harvest_remote_sops_encrypts_and_prints_path(
-    monkeypatch, tmp_path: Path, capsys
-):
-    out_dir = tmp_path / "out"
-    out_dir.mkdir()
-    calls: dict[str, object] = {}
-
-    def fake_remote_harvest(**kwargs):
-        calls["remote"] = kwargs
-        # Create a minimal state.json in the temp bundle.
-        out = Path(kwargs["local_out_dir"]) / "state.json"
-        out.write_text("{}", encoding="utf-8")
-        return out
-
-    def fake_encrypt(bundle_dir: Path, out_file: Path, fps: list[str]):
-        calls["encrypt"] = (bundle_dir, out_file, fps)
-        out_file.write_text("encrypted", encoding="utf-8")
-        return out_file
-
-    monkeypatch.setattr(cli, "remote_harvest", fake_remote_harvest)
-    monkeypatch.setattr(cli, "_encrypt_harvest_dir_to_sops", fake_encrypt)
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "harvest",
-            "--remote-host",
-            "example.com",
-            "--remote-user",
-            "root",
-            "--sops",
-            "ABCDEF",
-            "--out",
-            str(out_dir),
-        ],
-    )
-    cli.main()
-
-    printed = capsys.readouterr().out.strip()
-    assert printed.endswith("harvest.tar.gz.sops")
-    assert Path(printed).exists()
-    assert calls.get("remote")
-    assert calls.get("encrypt")
-
-
-def test_cli_harvest_remote_password_required_exits_cleanly(monkeypatch):
-    def boom(**kwargs):
-        raise RemoteSudoPasswordRequired("pw required")
-
-    monkeypatch.setattr(cli, "remote_harvest", boom)
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "harvest",
-            "--remote-host",
-            "example.com",
-            "--remote-user",
-            "root",
-        ],
-    )
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert "--ask-become-pass" in str(e.value)
-
-
-def test_cli_runtime_error_is_wrapped_as_user_friendly_system_exit(monkeypatch):
-    def boom(*args, **kwargs):
-        raise RuntimeError("nope")
-
-    monkeypatch.setattr(cli, "harvest", boom)
-    monkeypatch.setattr(sys, "argv", ["enroll", "harvest", "--out", "/tmp/x"])
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert str(e.value) == "error: nope"
-
-
-def test_cli_sops_error_is_wrapped_as_user_friendly_system_exit(monkeypatch):
-    def boom(*args, **kwargs):
-        raise SopsError("sops broke")
-
-    monkeypatch.setattr(cli, "manifest", boom)
-    monkeypatch.setattr(
-        sys, "argv", ["enroll", "manifest", "--harvest", "/tmp/x", "--out", "/tmp/y"]
-    )
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert str(e.value) == "error: sops broke"
-
-
-def test_cli_diff_notifies_webhook_and_email_and_respects_exit_code(
-    monkeypatch, capsys
-):
-    calls: dict[str, object] = {}
-
-    def fake_compare(old, new, sops_mode=False, **kwargs):
-        calls["compare"] = (old, new, sops_mode)
-        return {"dummy": True}, True
-
-    def fake_format(report, fmt="text"):
-        calls.setdefault("format", []).append((report, fmt))
-        return "REPORT\n"
-
-    def fake_post(url, body, headers=None):
-        calls["webhook"] = (url, body, headers)
-        return 200, b"ok"
-
-    def fake_email(**kwargs):
-        calls["email"] = kwargs
-
-    monkeypatch.setattr(cli, "compare_harvests", fake_compare)
-    monkeypatch.setattr(cli, "format_report", fake_format)
-    monkeypatch.setattr(cli, "post_webhook", fake_post)
-    monkeypatch.setattr(cli, "send_email", fake_email)
-    monkeypatch.setenv("SMTPPW", "secret")
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "diff",
-            "--old",
-            "/tmp/old",
-            "--new",
-            "/tmp/new",
-            "--webhook",
-            "https://example.invalid/h",
-            "--webhook-header",
-            "X-Test: ok",
-            "--email-to",
-            "a@example.com",
-            "--smtp-password-env",
-            "SMTPPW",
-            "--exit-code",
-        ],
-    )
-
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert e.value.code == 2
-
-    assert calls.get("compare")
-    assert calls.get("webhook")
-    assert calls.get("email")
-    # No report printed when exiting via --exit-code? (we still render and print).
-    _ = capsys.readouterr()
-
-
-def test_cli_diff_webhook_http_error_raises_system_exit(monkeypatch):
-    def fake_compare(old, new, sops_mode=False, **kwargs):
-        return {"dummy": True}, True
-
-    monkeypatch.setattr(cli, "compare_harvests", fake_compare)
-    monkeypatch.setattr(cli, "format_report", lambda report, fmt="text": "R\n")
-    monkeypatch.setattr(cli, "post_webhook", lambda url, body, headers=None: (500, b""))
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "diff",
-            "--old",
-            "/tmp/old",
-            "--new",
-            "/tmp/new",
-            "--webhook",
-            "https://example.invalid/h",
-        ],
-    )
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert "HTTP 500" in str(e.value)

tests/test_cli_config_and_sops.py

@@ -1,189 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import configparser
-import tarfile
-from pathlib import Path
-
-
-def test_discover_config_path_precedence(monkeypatch, tmp_path: Path):
-    from enroll.cli import _discover_config_path
-
-    cfg = tmp_path / "cfg.ini"
-    cfg.write_text("[enroll]\n", encoding="utf-8")
-
-    # --no-config always wins
-    monkeypatch.setenv("ENROLL_CONFIG", str(cfg))
-    assert _discover_config_path(["--no-config", "harvest"]) is None
-
-    # explicit --config wins
-    assert _discover_config_path(["--config", str(cfg), "harvest"]) == cfg
-
-    # env var used when present
-    assert _discover_config_path(["harvest"]) == cfg
-
-
-def test_discover_config_path_finds_local_and_xdg(monkeypatch, tmp_path: Path):
-    from enroll.cli import _discover_config_path
-
-    # local file in cwd
-    cwd = tmp_path / "cwd"
-    cwd.mkdir()
-    local = cwd / "enroll.ini"
-    local.write_text("[enroll]\n", encoding="utf-8")
-
-    monkeypatch.chdir(cwd)
-    monkeypatch.delenv("ENROLL_CONFIG", raising=False)
-    monkeypatch.delenv("XDG_CONFIG_HOME", raising=False)
-    assert _discover_config_path(["harvest"]) == local
-
-    # xdg config fallback
-    monkeypatch.chdir(tmp_path)
-    xdg = tmp_path / "xdg"
-    (xdg / "enroll").mkdir(parents=True)
-    xcfg = xdg / "enroll" / "enroll.ini"
-    xcfg.write_text("[enroll]\n", encoding="utf-8")
-    monkeypatch.setenv("XDG_CONFIG_HOME", str(xdg))
-    assert _discover_config_path(["harvest"]) == xcfg
-
-
-def test_section_to_argv_supports_bool_append_count_and_unknown(monkeypatch, capsys):
-    from enroll.cli import _section_to_argv
-
-    ap = argparse.ArgumentParser(add_help=False)
-    ap.add_argument("--flag", action="store_true")
-    ap.add_argument("--no-flag", action="store_false", dest="flag2")
-    ap.add_argument("--item", action="append", default=[])
-    ap.add_argument("-v", action="count", default=0)
-
-    cfg = configparser.ConfigParser()
-    cfg.read_dict(
-        {
-            "enroll": {
-                "flag": "true",
-                "no_flag": "false",
-                "item": "a,b",
-                "v": "2",
-                "unknown_key": "zzz",
-            }
-        }
-    )
-
-    argv = _section_to_argv(ap, cfg, "enroll")
-
-    # bools set
-    assert "--flag" in argv
-    assert "--no-flag" in argv
-
-    # append expanded
-    assert argv.count("--item") == 2
-    assert "a" in argv and "b" in argv
-
-    # count flag expanded
-    assert argv.count("-v") == 2
-
-    # unknown key prints warning
-    err = capsys.readouterr().err
-    assert "unknown option" in err
-
-
-def test_inject_config_argv_inserts_global_and_command_tokens(tmp_path: Path):
-    from enroll.cli import _inject_config_argv
-
-    root = argparse.ArgumentParser(add_help=False)
-    root.add_argument("--root-flag", action="store_true")
-    sub = root.add_subparsers(dest="cmd", required=True)
-    p_h = sub.add_parser("harvest", add_help=False)
-    p_h.add_argument("--dangerous", action="store_true")
-    p_h.add_argument("--include-path", action="append", default=[])
-
-    cfg_path = tmp_path / "enroll.ini"
-    cfg_path.write_text(
-        """[enroll]
-root-flag = true
-
-[harvest]
-dangerous = true
-include-path = /etc/one,/etc/two
-""",
-        encoding="utf-8",
-    )
-
-    argv = ["harvest", "--include-path", "/etc/cli"]
-    injected = _inject_config_argv(
-        argv,
-        cfg_path=cfg_path,
-        root_parser=root,
-        subparsers={"harvest": p_h},
-    )
-
-    # global inserted before cmd, subcommand tokens right after cmd
-    assert injected[:2] == ["--root-flag", "harvest"]
-    # include-path from config inserted before CLI include-path (CLI wins later if duplicates)
-    joined = " ".join(injected)
-    assert "--include-path /etc/one" in joined
-    assert "--include-path /etc/cli" in joined
-
-
-def test_resolve_sops_out_file_and_encrypt_path(monkeypatch, tmp_path: Path):
-    from enroll import cli
-
-    # directory output should yield harvest.tar.gz.sops inside
-    out_dir = tmp_path / "o"
-    out_dir.mkdir()
-    assert (
-        cli._resolve_sops_out_file(str(out_dir), hint="h").name == "harvest.tar.gz.sops"
-    )
-
-    # file-like output retained
-    out_file = tmp_path / "x.sops"
-    assert cli._resolve_sops_out_file(str(out_file), hint="h") == out_file
-
-    # None uses cache dir
-    class HC:
-        def __init__(self, d: Path):
-            self.dir = d
-
-    monkeypatch.setattr(
-        cli, "new_harvest_cache_dir", lambda hint: HC(tmp_path / "cache")
-    )
-    p = cli._resolve_sops_out_file(None, hint="h")
-    assert str(p).endswith("harvest.tar.gz.sops")
-
-    # Cover _tar_dir_to quickly (writes a tarball)
-    bundle = tmp_path / "bundle"
-    bundle.mkdir()
-    (bundle / "state.json").write_text("{}", encoding="utf-8")
-    tar_path = tmp_path / "b.tar.gz"
-    cli._tar_dir_to(bundle, tar_path)
-    assert tar_path.exists()
-    with tarfile.open(tar_path, "r:gz") as tf:
-        names = tf.getnames()
-    assert "state.json" in names or "./state.json" in names
-
-
-def test_encrypt_harvest_dir_to_sops_cleans_up_tmp_tgz(monkeypatch, tmp_path: Path):
-    from enroll.cli import _encrypt_harvest_dir_to_sops
-
-    bundle = tmp_path / "bundle"
-    bundle.mkdir()
-    (bundle / "state.json").write_text("{}", encoding="utf-8")
-    out_file = tmp_path / "out.sops"
-
-    seen = {}
-
-    def fake_encrypt(src: Path, dst: Path, pgp_fingerprints, mode):  # noqa: ARG001
-        # write something so we can see output created
-        seen["src"] = src
-        dst.write_bytes(b"enc")
-
-    monkeypatch.setattr("enroll.cli.encrypt_file_binary", fake_encrypt)
-
-    # Make os.unlink raise FileNotFoundError to hit the except branch in finally.
-    monkeypatch.setattr(
-        "enroll.cli.os.unlink", lambda p: (_ for _ in ()).throw(FileNotFoundError())
-    )
-
-    res = _encrypt_harvest_dir_to_sops(bundle, out_file, fps=["ABC"])
-    assert res == out_file
-    assert out_file.read_bytes() == b"enc"

tests/test_cli_helpers.py

@@ -1,177 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import configparser
-import types
-import textwrap
-from pathlib import Path
-
-
-def test_discover_config_path_precedence(tmp_path: Path, monkeypatch):
-    """_discover_config_path: --config > ENROLL_CONFIG > ./enroll.ini > XDG."""
-    from enroll.cli import _discover_config_path
-
-    cfg1 = tmp_path / "one.ini"
-    cfg1.write_text("[enroll]\n", encoding="utf-8")
-
-    # Explicit --config should win.
-    assert _discover_config_path(["--config", str(cfg1)]) == cfg1
-
-    # --no-config disables config loading.
-    assert _discover_config_path(["--no-config", "--config", str(cfg1)]) is None
-
-    monkeypatch.chdir(tmp_path)
-
-    cfg2 = tmp_path / "two.ini"
-    cfg2.write_text("[enroll]\n", encoding="utf-8")
-    monkeypatch.setenv("ENROLL_CONFIG", str(cfg2))
-    assert _discover_config_path([]) == cfg2
-
-    # Local ./enroll.ini fallback.
-    monkeypatch.delenv("ENROLL_CONFIG", raising=False)
-    local = tmp_path / "enroll.ini"
-    local.write_text("[enroll]\n", encoding="utf-8")
-    assert _discover_config_path([]) == local
-
-    # XDG fallback.
-    local.unlink()
-    xdg = tmp_path / "xdg"
-    cfg3 = xdg / "enroll" / "enroll.ini"
-    cfg3.parent.mkdir(parents=True)
-    cfg3.write_text("[enroll]\n", encoding="utf-8")
-    monkeypatch.setenv("XDG_CONFIG_HOME", str(xdg))
-    assert _discover_config_path([]) == cfg3
-
-
-def test_config_value_parsing_and_list_splitting():
-    from enroll.cli import _parse_bool, _split_list_value
-
-    assert _parse_bool("1") is True
-    assert _parse_bool("yes") is True
-    assert _parse_bool("false") is False
-
-    assert _parse_bool("maybe") is None
-
-    assert _split_list_value("a,b , c") == ["a", "b", "c"]
-    # When newlines are present, we split on lines (not commas within a line).
-    assert _split_list_value("a,b\nc") == ["a,b", "c"]
-    assert _split_list_value("a\n\n b\n") == ["a", "b"]
-    assert _split_list_value("   ") == []
-
-
-def test_section_to_argv_handles_types_and_unknown_keys(capsys):
-    from enroll.cli import _section_to_argv
-
-    p = argparse.ArgumentParser(add_help=False)
-    p.add_argument("--dangerous", action="store_true")
-    p.add_argument("--no-color", dest="color", action="store_false")
-    p.add_argument("--include-path", dest="include_path", action="append")
-    p.add_argument("-v", action="count", default=0)
-    p.add_argument("--out")
-
-    cfg = configparser.ConfigParser()
-    cfg.read_dict(
-        {
-            "harvest": {
-                "dangerous": "true",
-                # Keys are matched by argparse dest; store_false actions still use dest.
-                "color": "false",
-                "include-path": "a,b,c",
-                "v": "2",
-                "out": "/tmp/bundle",
-                "unknown": "ignored",
-            }
-        }
-    )
-
-    argv = _section_to_argv(p, cfg, "harvest")
-
-    # Boolean store_true.
-    assert "--dangerous" in argv
-
-    # Boolean store_false: include the flag only when config wants False.
-    assert "--no-color" in argv
-
-    # Append: split lists and add one flag per item.
-    assert argv.count("--include-path") == 3
-    assert "a" in argv and "b" in argv and "c" in argv
-
-    # Count: repeats.
-    assert argv.count("-v") == 2
-
-    # Scalar.
-    assert "--out" in argv and "/tmp/bundle" in argv
-
-    err = capsys.readouterr().err
-    assert "unknown option" in err
-
-
-def test_inject_config_argv_inserts_global_and_subcommand(tmp_path: Path, capsys):
-    from enroll.cli import _inject_config_argv
-
-    cfg = tmp_path / "enroll.ini"
-    cfg.write_text(
-        textwrap.dedent(
-            """
-            [enroll]
-            dangerous = true
-
-            [harvest]
-            include-path = /etc/foo
-            unknown = 1
-            """
-        ).strip()
-        + "\n",
-        encoding="utf-8",
-    )
-
-    root = argparse.ArgumentParser(add_help=False)
-    root.add_argument("--dangerous", action="store_true")
-
-    harvest_p = argparse.ArgumentParser(add_help=False)
-    harvest_p.add_argument("--include-path", dest="include_path", action="append")
-
-    argv = _inject_config_argv(
-        ["harvest", "--out", "x"],
-        cfg_path=cfg,
-        root_parser=root,
-        subparsers={"harvest": harvest_p},
-    )
-
-    # Global tokens should appear before the subcommand.
-    assert argv[0] == "--dangerous"
-    assert argv[1] == "harvest"
-
-    # Subcommand tokens should appear right after the subcommand.
-    assert argv[2:4] == ["--include-path", "/etc/foo"]
-
-    # Unknown option should have produced a warning.
-    assert "unknown option" in capsys.readouterr().err
-
-
-def test_resolve_sops_out_file(tmp_path: Path, monkeypatch):
-    from enroll import cli
-
-    # Make a predictable cache dir for the default case.
-    fake_cache = types.SimpleNamespace(dir=tmp_path / "cache")
-    fake_cache.dir.mkdir(parents=True)
-    monkeypatch.setattr(cli, "new_harvest_cache_dir", lambda hint=None: fake_cache)
-
-    # If out is a directory, use it directly.
-    out_dir = tmp_path / "out"
-    out_dir.mkdir()
-    # The output filename is fixed; hint is only used when creating a cache dir.
-    assert (
-        cli._resolve_sops_out_file(out=out_dir, hint="bundle.tar.gz")
-        == out_dir / "harvest.tar.gz.sops"
-    )
-
-    # If out is a file path, keep it.
-    out_file = tmp_path / "x.sops"
-    assert cli._resolve_sops_out_file(out=out_file, hint="bundle.tar.gz") == out_file
-
-    # None uses the cache dir, and the name is fixed.
-    assert (
-        cli._resolve_sops_out_file(out=None, hint="bundle.tar.gz")
-        == fake_cache.dir / "harvest.tar.gz.sops"
-    )

tests/test_debian.py

@@ -1,98 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-
-def test_dpkg_owner_parses_output(monkeypatch):
-    import enroll.debian as d
-
-    class P:
-        def __init__(self, rc: int, out: str):
-            self.returncode = rc
-            self.stdout = out
-            self.stderr = ""
-
-    def fake_run(cmd, text, capture_output):
-        assert cmd[:2] == ["dpkg", "-S"]
-        return P(
-            0,
-            """
-            diversion by foo from: /etc/something
-            nginx-common:amd64: /etc/nginx/nginx.conf
-            nginx-common, nginx: /etc/nginx/sites-enabled/default
-            """,
-        )
-
-    monkeypatch.setattr(d.subprocess, "run", fake_run)
-    assert d.dpkg_owner("/etc/nginx/nginx.conf") == "nginx-common"
-
-    def fake_run_none(cmd, text, capture_output):
-        return P(1, "")
-
-    monkeypatch.setattr(d.subprocess, "run", fake_run_none)
-    assert d.dpkg_owner("/missing") is None
-
-
-def test_list_manual_packages_parses_and_sorts(monkeypatch):
-    import enroll.debian as d
-
-    class P:
-        def __init__(self, rc: int, out: str):
-            self.returncode = rc
-            self.stdout = out
-            self.stderr = ""
-
-    def fake_run(cmd, text, capture_output):
-        assert cmd == ["apt-mark", "showmanual"]
-        return P(0, "\n# comment\nnginx\nvim\nnginx\n")
-
-    monkeypatch.setattr(d.subprocess, "run", fake_run)
-    assert d.list_manual_packages() == ["nginx", "vim"]
-
-
-def test_build_dpkg_etc_index(tmp_path: Path):
-    import enroll.debian as d
-
-    info = tmp_path / "info"
-    info.mkdir()
-    (info / "nginx.list").write_text(
-        "/etc/nginx/nginx.conf\n/etc/nginx/sites-enabled/default\n/usr/bin/nginx\n",
-        encoding="utf-8",
-    )
-    (info / "vim:amd64.list").write_text(
-        "/etc/vim/vimrc\n/usr/bin/vim\n",
-        encoding="utf-8",
-    )
-
-    owned, owner_map, topdir_to_pkgs, pkg_to_etc = d.build_dpkg_etc_index(str(info))
-    assert "/etc/nginx/nginx.conf" in owned
-    assert owner_map["/etc/nginx/nginx.conf"] == "nginx"
-    assert "nginx" in topdir_to_pkgs
-    assert topdir_to_pkgs["nginx"] == {"nginx"}
-    assert pkg_to_etc["vim"] == ["/etc/vim/vimrc"]
-
-
-def test_parse_status_conffiles_handles_continuations(tmp_path: Path):
-    import enroll.debian as d
-
-    status = tmp_path / "status"
-    status.write_text(
-        "\n".join(
-            [
-                "Package: nginx",
-                "Version: 1",
-                "Conffiles:",
-                " /etc/nginx/nginx.conf abcdef",
-                " /etc/nginx/mime.types 123456",
-                "",
-                "Package: other",
-                "Version: 2",
-                "",
-            ]
-        ),
-        encoding="utf-8",
-    )
-    m = d.parse_status_conffiles(str(status))
-    assert m["nginx"]["/etc/nginx/nginx.conf"] == "abcdef"
-    assert m["nginx"]["/etc/nginx/mime.types"] == "123456"
-    assert "other" not in m

tests/test_diff_bundle.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-import os
-import tarfile
-from pathlib import Path
-
-import pytest
-
-
-def _make_bundle_dir(tmp_path: Path) -> Path:
-    b = tmp_path / "bundle"
-    (b / "artifacts").mkdir(parents=True)
-    (b / "state.json").write_text("{}\n", encoding="utf-8")
-    return b
-
-
-def _tar_gz_of_dir(src: Path, out: Path) -> None:
-    with tarfile.open(out, mode="w:gz") as tf:
-        # tar -C src . semantics
-        for p in src.rglob("*"):
-            rel = p.relative_to(src)
-            tf.add(p, arcname=str(rel))
-
-
-def test_bundle_from_directory_and_statejson_path(tmp_path: Path):
-    import enroll.diff as d
-
-    b = _make_bundle_dir(tmp_path)
-
-    br1 = d._bundle_from_input(str(b), sops_mode=False)
-    assert br1.dir == b
-    assert br1.state_path.exists()
-
-    br2 = d._bundle_from_input(str(b / "state.json"), sops_mode=False)
-    assert br2.dir == b
-
-
-def test_bundle_from_tarball_extracts(tmp_path: Path):
-    import enroll.diff as d
-
-    b = _make_bundle_dir(tmp_path)
-    tgz = tmp_path / "bundle.tgz"
-    _tar_gz_of_dir(b, tgz)
-
-    br = d._bundle_from_input(str(tgz), sops_mode=False)
-    try:
-        assert br.dir.is_dir()
-        assert (br.dir / "state.json").exists()
-    finally:
-        if br.tempdir:
-            br.tempdir.cleanup()
-
-
-def test_bundle_from_sops_like_file(monkeypatch, tmp_path: Path):
-    import enroll.diff as d
-
-    b = _make_bundle_dir(tmp_path)
-    tgz = tmp_path / "bundle.tar.gz"
-    _tar_gz_of_dir(b, tgz)
-
-    # Pretend the tarball is an encrypted bundle by giving it a .sops name.
-    sops_path = tmp_path / "bundle.tar.gz.sops"
-    sops_path.write_bytes(tgz.read_bytes())
-
-    # Stub out sops machinery: "decrypt" just copies through.
-    monkeypatch.setattr(d, "require_sops_cmd", lambda: "sops")
-
-    def fake_decrypt(src: Path, dest: Path, mode: int):
-        dest.write_bytes(Path(src).read_bytes())
-        try:
-            os.chmod(dest, mode)
-        except OSError:
-            pass
-
-    monkeypatch.setattr(d, "decrypt_file_binary_to", fake_decrypt)
-
-    br = d._bundle_from_input(str(sops_path), sops_mode=False)
-    try:
-        assert (br.dir / "state.json").exists()
-    finally:
-        if br.tempdir:
-            br.tempdir.cleanup()
-
-
-def test_bundle_from_input_missing_path(tmp_path: Path):
-    import enroll.diff as d
-
-    with pytest.raises(RuntimeError, match="not found"):
-        d._bundle_from_input(str(tmp_path / "nope"), sops_mode=False)

tests/test_diff_ignore_versions_exclude_enforce.py

@@ -1,400 +0,0 @@
-from __future__ import annotations
-
-import json
-import sys
-import types
-from pathlib import Path
-
-import pytest
-
-
-def _write_bundle(
-    root: Path, state: dict, artifacts: dict[str, bytes] | None = None
-) -> None:
-    root.mkdir(parents=True, exist_ok=True)
-    (root / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-    artifacts = artifacts or {}
-    for rel, data in artifacts.items():
-        p = root / rel
-        p.parent.mkdir(parents=True, exist_ok=True)
-        p.write_bytes(data)
-
-
-def _minimal_roles() -> dict:
-    """A small roles structure that's sufficient for enroll.diff file indexing."""
-    return {
-        "users": {
-            "role_name": "users",
-            "users": [],
-            "managed_files": [],
-            "excluded": [],
-            "notes": [],
-        },
-        "services": [],
-        "packages": [],
-        "apt_config": {
-            "role_name": "apt_config",
-            "managed_files": [],
-            "excluded": [],
-            "notes": [],
-        },
-        "etc_custom": {
-            "role_name": "etc_custom",
-            "managed_files": [],
-            "excluded": [],
-            "notes": [],
-        },
-        "usr_local_custom": {
-            "role_name": "usr_local_custom",
-            "managed_files": [],
-            "excluded": [],
-            "notes": [],
-        },
-        "extra_paths": {
-            "role_name": "extra_paths",
-            "include_patterns": [],
-            "exclude_patterns": [],
-            "managed_files": [],
-            "excluded": [],
-            "notes": [],
-        },
-    }
-
-
-def test_diff_ignore_package_versions_suppresses_version_drift(tmp_path: Path):
-    from enroll.diff import compare_harvests
-
-    old = tmp_path / "old"
-    new = tmp_path / "new"
-
-    old_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1"},
-        "inventory": {
-            "packages": {
-                "curl": {
-                    "version": "1.0",
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
-                }
-            }
-        },
-        "roles": _minimal_roles(),
-    }
-    new_state = {
-        **old_state,
-        "inventory": {
-            "packages": {
-                "curl": {
-                    "version": "1.1",
-                    "installations": [{"version": "1.1", "arch": "amd64"}],
-                }
-            }
-        },
-    }
-
-    _write_bundle(old, old_state)
-    _write_bundle(new, new_state)
-
-    # Without ignore flag, version drift is reported and counts as changes.
-    report, has_changes = compare_harvests(str(old), str(new))
-    assert has_changes is True
-    assert report["packages"]["version_changed"]
-
-    # With ignore flag, version drift is suppressed and does not count as changes.
-    report2, has_changes2 = compare_harvests(
-        str(old), str(new), ignore_package_versions=True
-    )
-    assert has_changes2 is False
-    assert report2["packages"]["version_changed"] == []
-    assert report2["packages"]["version_changed_ignored_count"] == 1
-    assert report2["filters"]["ignore_package_versions"] is True
-
-
-def test_diff_exclude_path_filters_file_drift_and_affects_has_changes(tmp_path: Path):
-    from enroll.diff import compare_harvests
-
-    old = tmp_path / "old"
-    new = tmp_path / "new"
-
-    # Only file drift is under /var/anacron, which is excluded.
-    old_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1"},
-        "inventory": {"packages": {}},
-        "roles": {
-            **_minimal_roles(),
-            "extra_paths": {
-                **_minimal_roles()["extra_paths"],
-                "managed_files": [
-                    {
-                        "path": "/var/anacron/daily.stamp",
-                        "src_rel": "var/anacron/daily.stamp",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "extra_path",
-                    }
-                ],
-            },
-        },
-    }
-    new_state = json.loads(json.dumps(old_state))
-
-    _write_bundle(
-        old,
-        old_state,
-        {"artifacts/extra_paths/var/anacron/daily.stamp": b"yesterday\n"},
-    )
-    _write_bundle(
-        new,
-        new_state,
-        {"artifacts/extra_paths/var/anacron/daily.stamp": b"today\n"},
-    )
-
-    report, has_changes = compare_harvests(
-        str(old), str(new), exclude_paths=["/var/anacron"]
-    )
-    assert has_changes is False
-    assert report["files"]["changed"] == []
-    assert report["filters"]["exclude_paths"] == ["/var/anacron"]
-
-
-def test_diff_exclude_path_only_filters_files_not_packages(tmp_path: Path):
-    from enroll.diff import compare_harvests
-
-    old = tmp_path / "old"
-    new = tmp_path / "new"
-
-    old_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1"},
-        "inventory": {"packages": {"curl": {"version": "1.0"}}},
-        "roles": {
-            **_minimal_roles(),
-            "extra_paths": {
-                **_minimal_roles()["extra_paths"],
-                "managed_files": [
-                    {
-                        "path": "/var/anacron/daily.stamp",
-                        "src_rel": "var/anacron/daily.stamp",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "extra_path",
-                    }
-                ],
-            },
-        },
-    }
-    new_state = {
-        **old_state,
-        "inventory": {
-            "packages": {
-                "curl": {"version": "1.0"},
-                "htop": {"version": "3.0"},
-            }
-        },
-    }
-
-    _write_bundle(
-        old,
-        old_state,
-        {"artifacts/extra_paths/var/anacron/daily.stamp": b"yesterday\n"},
-    )
-    _write_bundle(
-        new,
-        new_state,
-        {
-            "artifacts/extra_paths/var/anacron/daily.stamp": b"today\n",
-        },
-    )
-
-    report, has_changes = compare_harvests(
-        str(old), str(new), exclude_paths=["/var/anacron"]
-    )
-    assert has_changes is True
-    # File drift is filtered, but package drift remains.
-    assert report["files"]["changed"] == []
-    assert report["packages"]["added"] == ["htop"]
-
-
-def test_enforce_old_harvest_requires_ansible_playbook(monkeypatch, tmp_path: Path):
-    import enroll.diff as d
-
-    monkeypatch.setattr(d.shutil, "which", lambda name: None)
-
-    old = tmp_path / "old"
-    _write_bundle(old, {"inventory": {"packages": {}}, "roles": _minimal_roles()})
-
-    with pytest.raises(RuntimeError, match="ansible-playbook not found"):
-        d.enforce_old_harvest(str(old))
-
-
-def test_enforce_old_harvest_runs_ansible_with_tags_from_file_drift(
-    monkeypatch, tmp_path: Path
-):
-    import enroll.diff as d
-    import enroll.manifest as mf
-
-    # Pretend ansible-playbook is installed.
-    monkeypatch.setattr(d.shutil, "which", lambda name: "/usr/bin/ansible-playbook")
-
-    calls: dict[str, object] = {}
-
-    # Stub manifest generation to only create playbook.yml (fast, no real roles needed).
-    def fake_manifest(_harvest_dir: str, out_dir: str, **_kwargs):
-        out = Path(out_dir)
-        (out / "playbook.yml").write_text(
-            "---\n- hosts: all\n  gather_facts: false\n  roles: []\n",
-            encoding="utf-8",
-        )
-
-    monkeypatch.setattr(mf, "manifest", fake_manifest)
-
-    def fake_run(
-        argv, cwd=None, env=None, capture_output=False, text=False, check=False
-    ):
-        calls["argv"] = list(argv)
-        calls["cwd"] = cwd
-        return types.SimpleNamespace(returncode=0, stdout="ok", stderr="")
-
-    monkeypatch.setattr(d.subprocess, "run", fake_run)
-
-    old = tmp_path / "old"
-    old_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1"},
-        "inventory": {"packages": {}},
-        "roles": {
-            **_minimal_roles(),
-            "usr_local_custom": {
-                **_minimal_roles()["usr_local_custom"],
-                "managed_files": [
-                    {
-                        "path": "/etc/myapp.conf",
-                        "src_rel": "etc/myapp.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "custom",
-                    }
-                ],
-            },
-        },
-    }
-    _write_bundle(old, old_state)
-
-    # Minimal report containing enforceable drift: a baseline file is "removed".
-    report = {
-        "packages": {"added": [], "removed": [], "version_changed": []},
-        "services": {"enabled_added": [], "enabled_removed": [], "changed": []},
-        "users": {"added": [], "removed": [], "changed": []},
-        "files": {
-            "added": [],
-            "removed": [{"path": "/etc/myapp.conf", "role": "usr_local_custom"}],
-            "changed": [],
-        },
-    }
-
-    info = d.enforce_old_harvest(str(old), report=report)
-    assert info["status"] == "applied"
-    assert "--tags" in info["command"]
-    assert "role_usr_local_custom" in ",".join(info.get("tags") or [])
-
-    argv = calls.get("argv")
-    assert argv and argv[0].endswith("ansible-playbook")
-    assert "--tags" in argv
-    # Ensure we pass the computed tag.
-    i = argv.index("--tags")
-    assert "role_usr_local_custom" in str(argv[i + 1])
-
-
-def test_cli_diff_forwards_exclude_and_ignore_flags(monkeypatch, capsys):
-    import enroll.cli as cli
-
-    calls: dict[str, object] = {}
-
-    def fake_compare(
-        old, new, *, sops_mode=False, exclude_paths=None, ignore_package_versions=False
-    ):
-        calls["compare"] = {
-            "old": old,
-            "new": new,
-            "sops_mode": sops_mode,
-            "exclude_paths": exclude_paths,
-            "ignore_package_versions": ignore_package_versions,
-        }
-        # No changes -> should not try to enforce.
-        return {"packages": {}, "services": {}, "users": {}, "files": {}}, False
-
-    monkeypatch.setattr(cli, "compare_harvests", fake_compare)
-    monkeypatch.setattr(cli, "format_report", lambda report, fmt="text": "R\n")
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "diff",
-            "--old",
-            "/tmp/old",
-            "--new",
-            "/tmp/new",
-            "--exclude-path",
-            "/var/anacron",
-            "--ignore-package-versions",
-        ],
-    )
-
-    cli.main()
-    _ = capsys.readouterr()
-    assert calls["compare"]["exclude_paths"] == ["/var/anacron"]
-    assert calls["compare"]["ignore_package_versions"] is True
-
-
-def test_cli_diff_enforce_skips_when_no_enforceable_drift(monkeypatch):
-    import enroll.cli as cli
-
-    # Drift exists, but is not enforceable (only additions / version changes).
-    report = {
-        "packages": {"added": ["htop"], "removed": [], "version_changed": []},
-        "services": {
-            "enabled_added": ["x.service"],
-            "enabled_removed": [],
-            "changed": [],
-        },
-        "users": {"added": ["bob"], "removed": [], "changed": []},
-        "files": {"added": [{"path": "/tmp/new"}], "removed": [], "changed": []},
-    }
-
-    monkeypatch.setattr(cli, "compare_harvests", lambda *a, **k: (report, True))
-    monkeypatch.setattr(cli, "has_enforceable_drift", lambda r: False)
-    called = {"enforce": False}
-    monkeypatch.setattr(
-        cli, "enforce_old_harvest", lambda *a, **k: called.update({"enforce": True})
-    )
-
-    captured = {}
-
-    def fake_format(rep, fmt="text"):
-        captured["report"] = rep
-        return "R\n"
-
-    monkeypatch.setattr(cli, "format_report", fake_format)
-
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "diff",
-            "--old",
-            "/tmp/old",
-            "--new",
-            "/tmp/new",
-            "--enforce",
-        ],
-    )
-
-    cli.main()
-    assert called["enforce"] is False
-    assert captured["report"]["enforcement"]["status"] == "skipped"

tests/test_diff_notifications.py

@@ -1,83 +0,0 @@
-from __future__ import annotations
-
-import types
-
-import pytest
-
-
-def test_post_webhook_success(monkeypatch):
-    from enroll.diff import post_webhook
-
-    class FakeResp:
-        status = 204
-
-        def read(self):
-            return b"OK"
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, exc_type, exc, tb):
-            return False
-
-    monkeypatch.setattr(
-        "enroll.diff.urllib.request.urlopen",
-        lambda req, timeout=30: FakeResp(),
-    )
-
-    status, body = post_webhook("https://example.com", b"x")
-    assert status == 204
-    assert body == "OK"
-
-
-def test_post_webhook_raises_on_error(monkeypatch):
-    from enroll.diff import post_webhook
-
-    def boom(_req, timeout=30):
-        raise OSError("nope")
-
-    monkeypatch.setattr("enroll.diff.urllib.request.urlopen", boom)
-
-    with pytest.raises(RuntimeError):
-        post_webhook("https://example.com", b"x")
-
-
-def test_send_email_uses_sendmail_when_present(monkeypatch):
-    from enroll.diff import send_email
-
-    calls = {}
-
-    monkeypatch.setattr("enroll.diff.shutil.which", lambda name: "/usr/sbin/sendmail")
-
-    def fake_run(argv, input=None, check=False, **_kwargs):
-        calls["argv"] = argv
-        calls["input"] = input
-        return types.SimpleNamespace(returncode=0)
-
-    monkeypatch.setattr("enroll.diff.subprocess.run", fake_run)
-
-    send_email(
-        subject="Subj",
-        body="Body",
-        from_addr="a@example.com",
-        to_addrs=["b@example.com"],
-    )
-
-    assert calls["argv"][0].endswith("sendmail")
-    msg = (calls["input"] or b"").decode("utf-8", errors="replace")
-    assert "Subject: Subj" in msg
-    assert "To: b@example.com" in msg
-
-
-def test_send_email_raises_when_no_delivery_method(monkeypatch):
-    from enroll.diff import send_email
-
-    monkeypatch.setattr("enroll.diff.shutil.which", lambda name: None)
-
-    with pytest.raises(RuntimeError):
-        send_email(
-            subject="Subj",
-            body="Body",
-            from_addr="a@example.com",
-            to_addrs=["b@example.com"],
-        )

tests/test_diff_usr_local_custom.py

@@ -18,106 +18,65 @@ def test_diff_includes_usr_local_custom_files(tmp_path: Path):
     new = tmp_path / "new"
 
     old_state = {
-        "schema_version": 3,
+        "host": {"hostname": "h1", "os": "debian"},
-        "host": {"hostname": "h1", "os": "debian", "pkg_backend": "dpkg"},
+        "users": {
-        "inventory": {
+            "role_name": "users",
-            "packages": {
+            "users": [],
-                "curl": {
+            "managed_files": [],
-                    "version": "1.0",
+            "excluded": [],
-                    "arches": [],
+            "notes": [],
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
-                    "observed_via": [{"kind": "user_installed"}],
-                    "roles": [],
-                }
-            }
         },
-        "roles": {
+        "services": [],
-            "users": {
+        "package_roles": [],
-                "role_name": "users",
+        "manual_packages": ["curl"],
-                "users": [],
+        "manual_packages_skipped": [],
-                "managed_files": [],
+        "etc_custom": {
-                "excluded": [],
+            "role_name": "etc_custom",
-                "notes": [],
+            "managed_files": [],
-            },
+            "excluded": [],
-            "services": [],
+            "notes": [],
-            "packages": [],
+        },
-            "apt_config": {
+        "usr_local_custom": {
-                "role_name": "apt_config",
+            "role_name": "usr_local_custom",
-                "managed_files": [],
+            "managed_files": [
-                "excluded": [],
+                {
-                "notes": [],
+                    "path": "/usr/local/etc/myapp.conf",
-            },
+                    "src_rel": "usr/local/etc/myapp.conf",
-            "etc_custom": {
+                    "owner": "root",
-                "role_name": "etc_custom",
+                    "group": "root",
-                "managed_files": [],
+                    "mode": "0644",
-                "excluded": [],
+                    "reason": "usr_local_etc_custom",
-                "notes": [],
+                }
-            },
+            ],
-            "usr_local_custom": {
+            "excluded": [],
-                "role_name": "usr_local_custom",
+            "notes": [],
-                "managed_files": [
-                    {
-                        "path": "/usr/local/etc/myapp.conf",
-                        "src_rel": "usr/local/etc/myapp.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "usr_local_etc_custom",
-                    }
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
         },
     }
-
     new_state = {
         **old_state,
-        "inventory": {
+        "manual_packages": ["curl", "htop"],
-            "packages": {
+        "usr_local_custom": {
-                **old_state["inventory"]["packages"],
+            "role_name": "usr_local_custom",
-                "htop": {
+            "managed_files": [
-                    "version": "3.0",
+                {
-                    "arches": [],
+                    "path": "/usr/local/etc/myapp.conf",
-                    "installations": [{"version": "3.0", "arch": "amd64"}],
+                    "src_rel": "usr/local/etc/myapp.conf",
-                    "observed_via": [{"kind": "user_installed"}],
+                    "owner": "root",
-                    "roles": [],
+                    "group": "root",
+                    "mode": "0644",
+                    "reason": "usr_local_etc_custom",
                 },
-            }
+                {
-        },
+                    "path": "/usr/local/bin/myscript",
-        "roles": {
+                    "src_rel": "usr/local/bin/myscript",
-            **old_state["roles"],
+                    "owner": "root",
-            "usr_local_custom": {
+                    "group": "root",
-                "role_name": "usr_local_custom",
+                    "mode": "0755",
-                "managed_files": [
+                    "reason": "usr_local_bin_script",
-                    {
+                },
-                        "path": "/usr/local/etc/myapp.conf",
+            ],
-                        "src_rel": "usr/local/etc/myapp.conf",
+            "excluded": [],
-                        "owner": "root",
+            "notes": [],
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "usr_local_etc_custom",
-                    },
-                    {
-                        "path": "/usr/local/bin/myscript",
-                        "src_rel": "usr/local/bin/myscript",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0755",
-                        "reason": "usr_local_bin_script",
-                    },
-                ],
-                "excluded": [],
-                "notes": [],
-            },
         },
     }
 

tests/test_explain.py

@@ -1,222 +0,0 @@
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import enroll.explain as ex
-
-
-def _write_state(bundle: Path, state: dict) -> Path:
-    bundle.mkdir(parents=True, exist_ok=True)
-    (bundle / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-    return bundle / "state.json"
-
-
-def test_explain_state_text_renders_roles_inventory_and_reasons(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1", "os": "debian", "pkg_backend": "dpkg"},
-        "enroll": {"version": "0.0.0"},
-        "inventory": {
-            "packages": {
-                "foo": {
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
-                    "observed_via": [
-                        {"kind": "systemd_unit", "ref": "foo.service"},
-                        {"kind": "package_role", "ref": "foo"},
-                    ],
-                    "roles": ["foo"],
-                },
-                "bar": {
-                    "installations": [{"version": "2.0", "arch": "amd64"}],
-                    "observed_via": [{"kind": "user_installed", "ref": "manual"}],
-                    "roles": ["bar"],
-                },
-            }
-        },
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [{"name": "alice"}],
-                "managed_files": [
-                    {
-                        "path": "/home/alice/.ssh/authorized_keys",
-                        "src_rel": "home/alice/.ssh/authorized_keys",
-                        "owner": "alice",
-                        "group": "alice",
-                        "mode": "0600",
-                        "reason": "authorized_keys",
-                    }
-                ],
-                "managed_dirs": [
-                    {
-                        "path": "/home/alice/.ssh",
-                        "owner": "alice",
-                        "group": "alice",
-                        "mode": "0700",
-                        "reason": "parent_of_managed_file",
-                    }
-                ],
-                "excluded": [{"path": "/etc/shadow", "reason": "sensitive_content"}],
-                "notes": ["n1", "n2"],
-            },
-            "services": [
-                {
-                    "unit": "foo.service",
-                    "role_name": "foo",
-                    "packages": ["foo"],
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo.conf",
-                            "src_rel": "etc/foo.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "modified_conffile",
-                        },
-                        # Unknown reason should fall back to generic text.
-                        {
-                            "path": "/etc/odd.conf",
-                            "src_rel": "etc/odd.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "mystery_reason",
-                        },
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "packages": [
-                {
-                    "package": "bar",
-                    "role_name": "bar",
-                    "managed_files": [],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": ["/etc/a", "/etc/b"],
-                "exclude_patterns": ["/etc/x", "/etc/y"],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-
-    state_path = _write_state(bundle, state)
-
-    out = ex.explain_state(str(state_path), fmt="text", max_examples=1)
-
-    assert "Enroll explained:" in out
-    assert "Host: h1" in out
-    assert "Inventory" in out
-    # observed_via summary should include both kinds (order not strictly guaranteed)
-    assert "observed_via" in out
-    assert "systemd_unit" in out
-    assert "user_installed" in out
-
-    # extra_paths include/exclude patterns should be rendered with max_examples truncation.
-    assert "include_patterns:" in out
-    assert "/etc/a" in out
-    assert "exclude_patterns:" in out
-
-    # Reasons section should mention known and unknown reasons.
-    assert "modified_conffile" in out
-    assert "mystery_reason" in out
-    assert "Captured with reason 'mystery_reason'" in out
-
-    # Excluded paths section.
-    assert "Why paths were excluded" in out
-    assert "sensitive_content" in out
-
-
-def test_explain_state_json_contains_structured_report(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    state = {
-        "schema_version": 3,
-        "host": {"hostname": "h2", "os": "rhel", "pkg_backend": "rpm"},
-        "enroll": {"version": "1.2.3"},
-        "inventory": {"packages": {}},
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-    state_path = _write_state(bundle, state)
-
-    raw = ex.explain_state(str(state_path), fmt="json", max_examples=2)
-    rep = json.loads(raw)
-    assert rep["host"]["hostname"] == "h2"
-    assert rep["enroll"]["version"] == "1.2.3"
-    assert rep["inventory"]["package_count"] == 0
-    assert isinstance(rep["roles"], list)
-    assert "reasons" in rep

tests/test_fsutil.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import os
-from pathlib import Path
-
-from enroll.fsutil import file_md5, stat_triplet
-
-
-def test_file_md5_matches_hashlib(tmp_path: Path):
-    p = tmp_path / "x"
-    p.write_bytes(b"hello world")
-    expected = hashlib.md5(b"hello world").hexdigest()  # nosec
-    assert file_md5(str(p)) == expected
-
-
-def test_stat_triplet_reports_mode(tmp_path: Path):
-    p = tmp_path / "x"
-    p.write_text("x", encoding="utf-8")
-    os.chmod(p, 0o600)
-
-    owner, group, mode = stat_triplet(str(p))
-    assert mode == "0600"
-    assert owner  # non-empty string
-    assert group  # non-empty string

tests/test_fsutil_extra.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-
-def test_stat_triplet_falls_back_to_numeric_ids(tmp_path: Path, monkeypatch):
-    """If uid/gid cannot be resolved, stat_triplet should return numeric strings."""
-    from enroll.fsutil import stat_triplet
-
-    p = tmp_path / "f"
-    p.write_text("x", encoding="utf-8")
-    os.chmod(p, 0o644)
-
-    import grp
-    import pwd
-
-    def _no_user(_uid):  # pragma: no cover - executed via monkeypatch
-        raise KeyError
-
-    def _no_group(_gid):  # pragma: no cover - executed via monkeypatch
-        raise KeyError
-
-    monkeypatch.setattr(pwd, "getpwuid", _no_user)
-    monkeypatch.setattr(grp, "getgrgid", _no_group)
-
-    owner, group, mode = stat_triplet(str(p))
-
-    assert owner.isdigit()
-    assert group.isdigit()
-    assert mode == "0644"

tests/test_harvest.py

@@ -2,7 +2,6 @@ import json
 from pathlib import Path
 
 import enroll.harvest as h
-from enroll.platform import PlatformInfo
 from enroll.systemd import UnitInfo
 
 
@@ -11,74 +10,6 @@ class AllowAllPolicy:
         return None
 
 
-class FakeBackend:
-    """Minimal backend stub for harvest tests.
-
-    The real backends (dpkg/rpm) enumerate the live system (dpkg status, rpm
-    databases, etc). These tests instead control all backend behaviour.
-    """
-
-    def __init__(
-        self,
-        *,
-        name: str,
-        owned_etc: set[str],
-        etc_owner_map: dict[str, str],
-        topdir_to_pkgs: dict[str, set[str]],
-        pkg_to_etc_paths: dict[str, list[str]],
-        manual_pkgs: list[str],
-        owner_fn,
-        modified_by_pkg: dict[str, dict[str, str]] | None = None,
-        pkg_config_prefixes: tuple[str, ...] = ("/etc/apt/",),
-        installed: dict[str, list[dict[str, str]]] | None = None,
-    ):
-        self.name = name
-        self.pkg_config_prefixes = pkg_config_prefixes
-        self._owned_etc = owned_etc
-        self._etc_owner_map = etc_owner_map
-        self._topdir_to_pkgs = topdir_to_pkgs
-        self._pkg_to_etc_paths = pkg_to_etc_paths
-        self._manual = manual_pkgs
-        self._owner_fn = owner_fn
-        self._modified_by_pkg = modified_by_pkg or {}
-        self._installed = installed or {}
-
-    def build_etc_index(self):
-        return (
-            self._owned_etc,
-            self._etc_owner_map,
-            self._topdir_to_pkgs,
-            self._pkg_to_etc_paths,
-        )
-
-    def owner_of_path(self, path: str):
-        return self._owner_fn(path)
-
-    def list_manual_packages(self):
-        return list(self._manual)
-
-    def installed_packages(self):
-        """Return mapping package -> installations.
-
-        The real backends return:
-          {"pkg": [{"version": "...", "arch": "..."}, ...]}
-        """
-        return dict(self._installed)
-
-    def specific_paths_for_hints(self, hints: set[str]):
-        return []
-
-    def is_pkg_config_path(self, path: str) -> bool:
-        for pfx in self.pkg_config_prefixes:
-            if path == pfx or path.startswith(pfx):
-                return True
-        return False
-
-    def modified_paths(self, pkg: str, etc_paths: list[str]):
-        # Test-controlled; ignore etc_paths.
-        return dict(self._modified_by_pkg.get(pkg, {}))
-
-
 def test_harvest_dedup_manual_packages_and_builds_etc_custom(
     monkeypatch, tmp_path: Path
 ):
@@ -91,7 +22,7 @@ def test_harvest_dedup_manual_packages_and_builds_etc_custom(
     real_exists = os.path.exists
     real_islink = os.path.islink
 
-    # Fake filesystem: two /etc files exist, only one is package-owned.
+    # Fake filesystem: two /etc files exist, only one is dpkg-owned.
     # Also include some /usr/local files to populate usr_local_custom.
     files = {
         "/etc/openvpn/server.conf": b"server",
@@ -162,7 +93,6 @@ def test_harvest_dedup_manual_packages_and_builds_etc_custom(
 
     # Avoid real system access
     monkeypatch.setattr(h, "list_enabled_services", lambda: ["openvpn.service"])
-    monkeypatch.setattr(h, "list_enabled_timers", lambda: [])
     monkeypatch.setattr(
         h,
         "get_unit_info",
@@ -179,30 +109,29 @@ def test_harvest_dedup_manual_packages_and_builds_etc_custom(
         ),
     )
 
-    # Package index: openvpn owns /etc/openvpn/server.conf; keyboard is unowned.
+    # Debian package index: openvpn owns /etc/openvpn/server.conf; keyboard is unowned.
-    owned_etc = {"/etc/openvpn/server.conf"}
+    def fake_build_index():
-    etc_owner_map = {"/etc/openvpn/server.conf": "openvpn"}
+        owned_etc = {"/etc/openvpn/server.conf"}
-    topdir_to_pkgs = {"openvpn": {"openvpn"}}
+        etc_owner_map = {"/etc/openvpn/server.conf": "openvpn"}
-    pkg_to_etc_paths = {"openvpn": ["/etc/openvpn/server.conf"], "curl": []}
+        topdir_to_pkgs = {"openvpn": {"openvpn"}}
+        pkg_to_etc_paths = {"openvpn": ["/etc/openvpn/server.conf"], "curl": []}
+        return owned_etc, etc_owner_map, topdir_to_pkgs, pkg_to_etc_paths
 
-    backend = FakeBackend(
+    monkeypatch.setattr(h, "build_dpkg_etc_index", fake_build_index)
-        name="dpkg",
+
-        owned_etc=owned_etc,
+    # openvpn conffile hash mismatch => should be captured under service role
-        etc_owner_map=etc_owner_map,
+    monkeypatch.setattr(
-        topdir_to_pkgs=topdir_to_pkgs,
+        h,
-        pkg_to_etc_paths=pkg_to_etc_paths,
+        "parse_status_conffiles",
-        manual_pkgs=["openvpn", "curl"],
+        lambda: {"openvpn": {"/etc/openvpn/server.conf": "old"}},
-        owner_fn=lambda p: "openvpn" if "openvpn" in (p or "") else None,
-        modified_by_pkg={
-            "openvpn": {"/etc/openvpn/server.conf": "modified_conffile"},
-        },
     )
+    monkeypatch.setattr(h, "read_pkg_md5sums", lambda pkg: {})
+    monkeypatch.setattr(h, "file_md5", lambda path: "new")
 
     monkeypatch.setattr(
-        h, "detect_platform", lambda: PlatformInfo("debian", "dpkg", {})
+        h, "dpkg_owner", lambda p: "openvpn" if "openvpn" in p else None
     )
-    monkeypatch.setattr(h, "get_backend", lambda info=None: backend)
+    monkeypatch.setattr(h, "list_manual_packages", lambda: ["openvpn", "curl"])
-
     monkeypatch.setattr(h, "collect_non_system_users", lambda: [])
 
     def fake_stat_triplet(p: str):
@@ -224,146 +153,26 @@ def test_harvest_dedup_manual_packages_and_builds_etc_custom(
     state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
     st = json.loads(Path(state_path).read_text(encoding="utf-8"))
 
-    inv = st["inventory"]["packages"]
+    assert "openvpn" in st["manual_packages"]
-    assert "openvpn" in inv
+    assert "curl" in st["manual_packages"]
-    assert "curl" in inv
+    assert "openvpn" in st["manual_packages_skipped"]
-
+    assert all(pr["package"] != "openvpn" for pr in st["package_roles"])
-    # openvpn is managed by the service role, so it should NOT appear as a package role.
+    assert any(pr["package"] == "curl" for pr in st["package_roles"])
-    pkg_roles = st["roles"]["packages"]
-    assert all(pr["package"] != "openvpn" for pr in pkg_roles)
-    assert any(pr["package"] == "curl" for pr in pkg_roles)
-
-    # Inventory provenance: openvpn should be observed via systemd unit.
-    openvpn_obs = inv["openvpn"]["observed_via"]
-    assert any(
-        o.get("kind") == "systemd_unit" and o.get("ref") == "openvpn.service"
-        for o in openvpn_obs
-    )
 
     # Service role captured modified conffile
-    svc = st["roles"]["services"][0]
+    svc = st["services"][0]
     assert svc["unit"] == "openvpn.service"
     assert "openvpn" in svc["packages"]
     assert any(mf["path"] == "/etc/openvpn/server.conf" for mf in svc["managed_files"])
 
     # Unowned /etc/default/keyboard is attributed to etc_custom only
-    etc_custom = st["roles"]["etc_custom"]
+    etc_custom = st["etc_custom"]
     assert any(
         mf["path"] == "/etc/default/keyboard" for mf in etc_custom["managed_files"]
     )
 
     # /usr/local content is attributed to usr_local_custom
-    ul = st["roles"]["usr_local_custom"]
+    ul = st["usr_local_custom"]
     assert any(mf["path"] == "/usr/local/etc/myapp.conf" for mf in ul["managed_files"])
     assert any(mf["path"] == "/usr/local/bin/myscript" for mf in ul["managed_files"])
     assert all(mf["path"] != "/usr/local/bin/readme.txt" for mf in ul["managed_files"])
-
-
-def test_shared_cron_snippet_prefers_matching_role_over_lexicographic(
-    monkeypatch, tmp_path: Path
-):
-    """Regression test for shared snippet routing.
-
-    When multiple service roles reference the same owning package, we prefer the
-    role whose name matches the snippet/package (e.g. ntpsec) rather than a
-    lexicographic tie-break that could incorrectly pick another role.
-    """
-
-    bundle = tmp_path / "bundle"
-
-    files = {"/etc/cron.d/ntpsec": b"# cron\n"}
-    dirs = {"/etc", "/etc/cron.d"}
-
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: p in files)
-    monkeypatch.setattr(h.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: p in dirs)
-    monkeypatch.setattr(h.os.path, "exists", lambda p: p in files or p in dirs)
-    monkeypatch.setattr(h.os, "walk", lambda root: [("/etc/cron.d", [], ["ntpsec"])])
-
-    # Only include the cron snippet in the system capture set.
-    monkeypatch.setattr(
-        h, "_iter_system_capture_paths", lambda: [("/etc/cron.d/ntpsec", "system_cron")]
-    )
-
-    monkeypatch.setattr(
-        h, "list_enabled_services", lambda: ["apparmor.service", "ntpsec.service"]
-    )
-    monkeypatch.setattr(h, "list_enabled_timers", lambda: [])
-
-    def fake_unit_info(unit: str) -> UnitInfo:
-        if unit == "apparmor.service":
-            return UnitInfo(
-                name=unit,
-                fragment_path="/lib/systemd/system/apparmor.service",
-                dropin_paths=[],
-                env_files=[],
-                exec_paths=["/usr/sbin/apparmor"],
-                active_state="active",
-                sub_state="running",
-                unit_file_state="enabled",
-                condition_result=None,
-            )
-        return UnitInfo(
-            name=unit,
-            fragment_path="/lib/systemd/system/ntpsec.service",
-            dropin_paths=[],
-            env_files=[],
-            exec_paths=["/usr/sbin/ntpd"],
-            active_state="active",
-            sub_state="running",
-            unit_file_state="enabled",
-            condition_result=None,
-        )
-
-    monkeypatch.setattr(h, "get_unit_info", fake_unit_info)
-
-    # Make apparmor *also* claim the ntpsec package (simulates overly-broad
-    # package inference). The snippet routing should still prefer role 'ntpsec'.
-    def fake_owner(p: str):
-        if p == "/etc/cron.d/ntpsec":
-            return "ntpsec"
-        if "apparmor" in (p or ""):
-            return "ntpsec"  # intentionally misleading
-        if "ntpsec" in (p or "") or "ntpd" in (p or ""):
-            return "ntpsec"
-        return None
-
-    backend = FakeBackend(
-        name="dpkg",
-        owned_etc=set(),
-        etc_owner_map={},
-        topdir_to_pkgs={},
-        pkg_to_etc_paths={},
-        manual_pkgs=[],
-        owner_fn=fake_owner,
-        modified_by_pkg={},
-    )
-
-    monkeypatch.setattr(
-        h, "detect_platform", lambda: PlatformInfo("debian", "dpkg", {})
-    )
-    monkeypatch.setattr(h, "get_backend", lambda info=None: backend)
-
-    monkeypatch.setattr(h, "stat_triplet", lambda p: ("root", "root", "0644"))
-    monkeypatch.setattr(h, "collect_non_system_users", lambda: [])
-
-    def fake_copy(bundle_dir: str, role_name: str, abs_path: str, src_rel: str):
-        dst = Path(bundle_dir) / "artifacts" / role_name / src_rel
-        dst.parent.mkdir(parents=True, exist_ok=True)
-        dst.write_bytes(files[abs_path])
-
-    monkeypatch.setattr(h, "_copy_into_bundle", fake_copy)
-
-    state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    # Cron snippet should end up attached to the ntpsec role, not apparmor.
-    svc_ntpsec = next(s for s in st["roles"]["services"] if s["role_name"] == "ntpsec")
-    assert any(mf["path"] == "/etc/cron.d/ntpsec" for mf in svc_ntpsec["managed_files"])
-
-    svc_apparmor = next(
-        s for s in st["roles"]["services"] if s["role_name"] == "apparmor"
-    )
-    assert all(
-        mf["path"] != "/etc/cron.d/ntpsec" for mf in svc_apparmor["managed_files"]
-    )

tests/test_harvest_cron_logrotate.py

@@ -1,164 +0,0 @@
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import enroll.harvest as h
-from enroll.platform import PlatformInfo
-from enroll.systemd import UnitInfo
-
-
-class AllowAllPolicy:
-    def deny_reason(self, path: str):
-        return None
-
-
-class FakeBackend:
-    def __init__(
-        self,
-        *,
-        name: str,
-        installed: dict[str, list[dict[str, str]]],
-        manual: list[str],
-    ):
-        self.name = name
-        self._installed = dict(installed)
-        self._manual = list(manual)
-
-    def build_etc_index(self):
-        # No package ownership information needed for this test.
-        return set(), {}, {}, {}
-
-    def installed_packages(self):
-        return dict(self._installed)
-
-    def list_manual_packages(self):
-        return list(self._manual)
-
-    def owner_of_path(self, path: str):
-        return None
-
-    def specific_paths_for_hints(self, hints: set[str]):
-        return []
-
-    def is_pkg_config_path(self, path: str) -> bool:
-        return False
-
-    def modified_paths(self, pkg: str, etc_paths: list[str]):
-        return {}
-
-
-def test_harvest_unifies_cron_and_logrotate_into_dedicated_package_roles(
-    monkeypatch, tmp_path: Path
-):
-    bundle = tmp_path / "bundle"
-
-    # Fake files we want harvested.
-    files = {
-        "/etc/crontab": b"* * * * * root echo hi\n",
-        "/etc/cron.d/php": b"# php cron\n",
-        "/var/spool/cron/crontabs/alice": b"@daily echo user\n",
-        "/etc/logrotate.conf": b"weekly\n",
-        "/etc/logrotate.d/rsyslog": b"/var/log/syslog { rotate 7 }\n",
-    }
-
-    monkeypatch.setattr(h.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: p in files)
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: False)
-    monkeypatch.setattr(h.os.path, "exists", lambda p: (p in files) or False)
-
-    # Expand cron/logrotate globs deterministically.
-    def fake_iter_matching(spec: str, cap: int = 10000):
-        mapping = {
-            "/etc/crontab": ["/etc/crontab"],
-            "/etc/cron.d/*": ["/etc/cron.d/php"],
-            "/etc/cron.hourly/*": [],
-            "/etc/cron.daily/*": [],
-            "/etc/cron.weekly/*": [],
-            "/etc/cron.monthly/*": [],
-            "/etc/cron.allow": [],
-            "/etc/cron.deny": [],
-            "/etc/anacrontab": [],
-            "/etc/anacron/*": [],
-            "/var/spool/cron/*": [],
-            "/var/spool/cron/crontabs/*": ["/var/spool/cron/crontabs/alice"],
-            "/var/spool/crontabs/*": [],
-            "/var/spool/anacron/*": [],
-            "/etc/logrotate.conf": ["/etc/logrotate.conf"],
-            "/etc/logrotate.d/*": ["/etc/logrotate.d/rsyslog"],
-        }
-        return list(mapping.get(spec, []))[:cap]
-
-    monkeypatch.setattr(h, "_iter_matching_files", fake_iter_matching)
-
-    # Avoid real system probing.
-    monkeypatch.setattr(
-        h, "detect_platform", lambda: PlatformInfo("debian", "dpkg", {})
-    )
-    backend = FakeBackend(
-        name="dpkg",
-        installed={
-            "cron": [{"version": "1", "arch": "amd64"}],
-            "logrotate": [{"version": "1", "arch": "amd64"}],
-        },
-        # Include cron/logrotate in manual packages to ensure they are skipped in the generic loop.
-        manual=["cron", "logrotate"],
-    )
-    monkeypatch.setattr(h, "get_backend", lambda info=None: backend)
-
-    # Include a service that would collide with cron role naming.
-    monkeypatch.setattr(
-        h, "list_enabled_services", lambda: ["cron.service", "foo.service"]
-    )
-    monkeypatch.setattr(h, "list_enabled_timers", lambda: [])
-    monkeypatch.setattr(
-        h,
-        "get_unit_info",
-        lambda unit: UnitInfo(
-            name=unit,
-            fragment_path=None,
-            dropin_paths=[],
-            env_files=[],
-            exec_paths=[],
-            active_state="active",
-            sub_state="running",
-            unit_file_state="enabled",
-            condition_result=None,
-        ),
-    )
-    monkeypatch.setattr(h, "collect_non_system_users", lambda: [])
-    monkeypatch.setattr(
-        h,
-        "stat_triplet",
-        lambda p: ("alice" if "alice" in p else "root", "root", "0644"),
-    )
-
-    # Avoid needing real source files by implementing our own bundle copier.
-    def fake_copy(bundle_dir: str, role_name: str, abs_path: str, src_rel: str):
-        dst = Path(bundle_dir) / "artifacts" / role_name / src_rel
-        dst.parent.mkdir(parents=True, exist_ok=True)
-        dst.write_bytes(files.get(abs_path, b""))
-
-    monkeypatch.setattr(h, "_copy_into_bundle", fake_copy)
-
-    state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    # cron.service must be skipped to avoid colliding with the dedicated "cron" package role.
-    svc_units = [s["unit"] for s in st["roles"]["services"]]
-    assert "cron.service" not in svc_units
-    assert "foo.service" in svc_units
-
-    pkgs = st["roles"]["packages"]
-    cron = next(p for p in pkgs if p["role_name"] == "cron")
-    logrotate = next(p for p in pkgs if p["role_name"] == "logrotate")
-
-    cron_paths = {mf["path"] for mf in cron["managed_files"]}
-    assert "/etc/crontab" in cron_paths
-    assert "/etc/cron.d/php" in cron_paths
-    # user crontab captured
-    assert "/var/spool/cron/crontabs/alice" in cron_paths
-
-    lr_paths = {mf["path"] for mf in logrotate["managed_files"]}
-    assert "/etc/logrotate.conf" in lr_paths
-    assert "/etc/logrotate.d/rsyslog" in lr_paths

tests/test_harvest_helpers.py

@@ -1,170 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-import enroll.harvest as h
-
-
-def test_iter_matching_files_skips_symlinks_and_walks_dirs(monkeypatch, tmp_path: Path):
-    # Layout:
-    #   root/real.txt (file)
-    #   root/sub/nested.txt
-    #   root/link -> ... (ignored)
-    root = tmp_path / "root"
-    (root / "sub").mkdir(parents=True)
-    (root / "real.txt").write_text("a", encoding="utf-8")
-    (root / "sub" / "nested.txt").write_text("b", encoding="utf-8")
-
-    paths = {
-        str(root): "dir",
-        str(root / "real.txt"): "file",
-        str(root / "sub"): "dir",
-        str(root / "sub" / "nested.txt"): "file",
-        str(root / "link"): "link",
-    }
-
-    monkeypatch.setattr(h.glob, "glob", lambda spec: [str(root), str(root / "link")])
-    monkeypatch.setattr(h.os.path, "islink", lambda p: paths.get(p) == "link")
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: paths.get(p) == "file")
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: paths.get(p) == "dir")
-    monkeypatch.setattr(
-        h.os,
-        "walk",
-        lambda p: [
-            (str(root), ["sub"], ["real.txt", "link"]),
-            (str(root / "sub"), [], ["nested.txt"]),
-        ],
-    )
-
-    out = h._iter_matching_files("/whatever/*", cap=100)
-    assert str(root / "real.txt") in out
-    assert str(root / "sub" / "nested.txt") in out
-    assert str(root / "link") not in out
-
-
-def test_parse_apt_signed_by_extracts_keyrings(tmp_path: Path):
-    f1 = tmp_path / "a.list"
-    f1.write_text(
-        "deb [signed-by=/usr/share/keyrings/foo.gpg] https://example.invalid stable main\n",
-        encoding="utf-8",
-    )
-    f2 = tmp_path / "b.sources"
-    f2.write_text(
-        "Types: deb\nSigned-By: /etc/apt/keyrings/bar.gpg, /usr/share/keyrings/baz.gpg\n",
-        encoding="utf-8",
-    )
-    f3 = tmp_path / "c.sources"
-    f3.write_text("Signed-By: | /bin/echo nope\n", encoding="utf-8")
-
-    out = h._parse_apt_signed_by([str(f1), str(f2), str(f3)])
-    assert "/usr/share/keyrings/foo.gpg" in out
-    assert "/etc/apt/keyrings/bar.gpg" in out
-    assert "/usr/share/keyrings/baz.gpg" in out
-
-
-def test_iter_apt_capture_paths_includes_signed_by_keyring(monkeypatch):
-    # Simulate:
-    #   /etc/apt/apt.conf.d/00test
-    #   /etc/apt/sources.list.d/test.list (signed-by outside /etc/apt)
-    #   /usr/share/keyrings/ext.gpg
-    files = {
-        "/etc/apt/apt.conf.d/00test": "file",
-        "/etc/apt/sources.list.d/test.list": "file",
-        "/usr/share/keyrings/ext.gpg": "file",
-    }
-
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: p in {"/etc/apt"})
-    monkeypatch.setattr(
-        h.os,
-        "walk",
-        lambda root: [
-            ("/etc/apt", ["apt.conf.d", "sources.list.d"], []),
-            ("/etc/apt/apt.conf.d", [], ["00test"]),
-            ("/etc/apt/sources.list.d", [], ["test.list"]),
-        ],
-    )
-    monkeypatch.setattr(h.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: files.get(p) == "file")
-
-    # Only treat the sources glob as having a hit.
-    def fake_iter_matching(spec: str, cap: int = 10000):
-        if spec == "/etc/apt/sources.list.d/*.list":
-            return ["/etc/apt/sources.list.d/test.list"]
-        return []
-
-    monkeypatch.setattr(h, "_iter_matching_files", fake_iter_matching)
-
-    # Provide file contents for the sources file.
-    real_open = open
-
-    def fake_open(path, *a, **k):
-        if path == "/etc/apt/sources.list.d/test.list":
-            return real_open(os.devnull, "r", encoding="utf-8")  # placeholder
-        return real_open(path, *a, **k)
-
-    # Easier: patch _parse_apt_signed_by directly to avoid filesystem reads.
-    monkeypatch.setattr(
-        h, "_parse_apt_signed_by", lambda sfs: {"/usr/share/keyrings/ext.gpg"}
-    )
-
-    out = h._iter_apt_capture_paths()
-    paths = {p for p, _r in out}
-    reasons = {p: r for p, r in out}
-    assert "/etc/apt/apt.conf.d/00test" in paths
-    assert "/etc/apt/sources.list.d/test.list" in paths
-    assert "/usr/share/keyrings/ext.gpg" in paths
-    assert reasons["/usr/share/keyrings/ext.gpg"] == "apt_signed_by_keyring"
-
-
-def test_iter_dnf_capture_paths(monkeypatch):
-    files = {
-        "/etc/dnf/dnf.conf": "file",
-        "/etc/yum/yum.conf": "file",
-        "/etc/yum.conf": "file",
-        "/etc/yum.repos.d/test.repo": "file",
-        "/etc/pki/rpm-gpg/RPM-GPG-KEY": "file",
-    }
-
-    def isdir(p):
-        return p in {"/etc/dnf", "/etc/yum", "/etc/yum.repos.d", "/etc/pki/rpm-gpg"}
-
-    def walk(root):
-        if root == "/etc/dnf":
-            return [("/etc/dnf", [], ["dnf.conf"])]
-        if root == "/etc/yum":
-            return [("/etc/yum", [], ["yum.conf"])]
-        if root == "/etc/pki/rpm-gpg":
-            return [("/etc/pki/rpm-gpg", [], ["RPM-GPG-KEY"])]
-        return []
-
-    monkeypatch.setattr(h.os.path, "isdir", isdir)
-    monkeypatch.setattr(h.os, "walk", walk)
-    monkeypatch.setattr(h.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: files.get(p) == "file")
-    monkeypatch.setattr(
-        h,
-        "_iter_matching_files",
-        lambda spec, cap=10000: (
-            ["/etc/yum.repos.d/test.repo"] if spec.endswith("*.repo") else []
-        ),
-    )
-
-    out = h._iter_dnf_capture_paths()
-    paths = {p for p, _r in out}
-    assert "/etc/dnf/dnf.conf" in paths
-    assert "/etc/yum/yum.conf" in paths
-    assert "/etc/yum.conf" in paths
-    assert "/etc/yum.repos.d/test.repo" in paths
-    assert "/etc/pki/rpm-gpg/RPM-GPG-KEY" in paths
-
-
-def test_iter_system_capture_paths_dedupes_first_reason(monkeypatch):
-    monkeypatch.setattr(h, "_SYSTEM_CAPTURE_GLOBS", [("/a", "r1"), ("/b", "r2")])
-    monkeypatch.setattr(
-        h,
-        "_iter_matching_files",
-        lambda spec, cap=10000: ["/dup"] if spec in {"/a", "/b"} else [],
-    )
-    out = h._iter_system_capture_paths()
-    assert out == [("/dup", "r1")]

tests/test_harvest_symlinks.py

@@ -1,263 +0,0 @@
-import json
-from pathlib import Path
-
-import enroll.harvest as h
-from enroll.platform import PlatformInfo
-from enroll.systemd import UnitInfo
-
-
-class AllowAllPolicy:
-    def deny_reason(self, path: str):
-        return None
-
-    def deny_reason_link(self, path: str):
-        return None
-
-
-class FakeBackend:
-    """Minimal backend stub for harvest tests.
-
-    Keep harvest deterministic and avoid enumerating the real system.
-    """
-
-    name = "dpkg"
-
-    def build_etc_index(self):
-        return (set(), {}, {}, {})
-
-    def owner_of_path(self, path: str):
-        return None
-
-    def list_manual_packages(self):
-        return []
-
-    def installed_packages(self):
-        return {}
-
-    def specific_paths_for_hints(self, hints: set[str]):
-        return []
-
-    def is_pkg_config_path(self, path: str) -> bool:
-        return False
-
-    def modified_paths(self, pkg: str, etc_paths: list[str]):
-        return {}
-
-
-def _base_monkeypatches(monkeypatch, *, unit: str):
-    """Patch harvest to avoid live system access."""
-
-    monkeypatch.setattr(
-        h, "detect_platform", lambda: PlatformInfo("debian", "dpkg", {})
-    )
-    monkeypatch.setattr(h, "get_backend", lambda info=None: FakeBackend())
-
-    monkeypatch.setattr(h, "list_enabled_timers", lambda: [])
-    monkeypatch.setattr(
-        h,
-        "get_unit_info",
-        lambda u: UnitInfo(
-            name=u,
-            fragment_path=None,
-            dropin_paths=[],
-            env_files=[],
-            exec_paths=[],
-            active_state="inactive",
-            sub_state="dead",
-            unit_file_state="enabled",
-            condition_result=None,
-        ),
-    )
-
-    # Keep users empty and avoid touching /etc/skel.
-    monkeypatch.setattr(h, "collect_non_system_users", lambda: [])
-
-    # Avoid warning spam from non-root test runs.
-    if hasattr(h.os, "geteuid"):
-        monkeypatch.setattr(h.os, "geteuid", lambda: 0)
-
-    # Avoid walking the real filesystem.
-    monkeypatch.setattr(h.os, "walk", lambda root: iter(()))
-    monkeypatch.setattr(h, "_copy_into_bundle", lambda *a, **k: None)
-
-    # Default to a "no files exist" view of the world unless a test overrides.
-    monkeypatch.setattr(h.os.path, "isfile", lambda p: False)
-    monkeypatch.setattr(h.os.path, "exists", lambda p: False)
-
-    # Minimal enabled services list.
-    monkeypatch.setattr(h, "list_enabled_services", lambda: [unit] if unit else [])
-
-
-def test_harvest_captures_nginx_enabled_symlinks(monkeypatch, tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    unit = "nginx.service"
-    _base_monkeypatches(monkeypatch, unit=unit)
-
-    # Fake filesystem for nginx enabled dirs.
-    dirs = {
-        "/etc",
-        "/etc/nginx",
-        "/etc/nginx/sites-enabled",
-        "/etc/nginx/modules-enabled",
-    }
-    links = {
-        "/etc/nginx/sites-enabled/default": "../sites-available/default",
-        "/etc/nginx/modules-enabled/mod-http": "../modules-available/mod-http",
-    }
-
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: p in dirs)
-    monkeypatch.setattr(h.os.path, "islink", lambda p: p in links)
-    monkeypatch.setattr(h.os, "readlink", lambda p: links[p])
-
-    def fake_glob(pat: str):
-        if pat == "/etc/nginx/sites-enabled/*":
-            return [
-                "/etc/nginx/sites-enabled/default",
-                "/etc/nginx/sites-enabled/README",
-            ]
-        if pat == "/etc/nginx/modules-enabled/*":
-            return ["/etc/nginx/modules-enabled/mod-http"]
-        return []
-
-    monkeypatch.setattr(h.glob, "glob", fake_glob)
-
-    state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    svc = next(s for s in st["roles"]["services"] if s["role_name"] == "nginx")
-    managed_links = svc.get("managed_links") or []
-    assert {(ml["path"], ml["target"], ml["reason"]) for ml in managed_links} == {
-        (
-            "/etc/nginx/sites-enabled/default",
-            "../sites-available/default",
-            "enabled_symlink",
-        ),
-        (
-            "/etc/nginx/modules-enabled/mod-http",
-            "../modules-available/mod-http",
-            "enabled_symlink",
-        ),
-    }
-
-
-def test_harvest_does_not_capture_enabled_symlinks_without_role(
-    monkeypatch, tmp_path: Path
-):
-    bundle = tmp_path / "bundle"
-    _base_monkeypatches(monkeypatch, unit="")
-
-    # Dirs exist but nginx isn't detected, so nothing should be captured.
-    monkeypatch.setattr(
-        h.os.path,
-        "isdir",
-        lambda p: p
-        in {
-            "/etc",
-            "/etc/nginx/sites-enabled",
-            "/etc/nginx/modules-enabled",
-        },
-    )
-    monkeypatch.setattr(
-        h.glob, "glob", lambda pat: ["/etc/nginx/sites-enabled/default"]
-    )
-    monkeypatch.setattr(h.os.path, "islink", lambda p: True)
-    monkeypatch.setattr(h.os, "readlink", lambda p: "../sites-available/default")
-
-    state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    # No services => no place to attach nginx links.
-    assert st["roles"]["services"] == []
-    # And no package snapshots either.
-    assert st["roles"]["packages"] == []
-
-
-def test_harvest_symlink_capture_respects_ignore_policy(monkeypatch, tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    _base_monkeypatches(monkeypatch, unit="nginx.service")
-
-    dirs = {"/etc", "/etc/nginx/sites-enabled", "/etc/nginx/modules-enabled"}
-    links = {
-        "/etc/nginx/sites-enabled/default": "../sites-available/default",
-        "/etc/nginx/sites-enabled/ok": "../sites-available/ok",
-    }
-
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: p in dirs)
-    monkeypatch.setattr(h.os.path, "islink", lambda p: p in links)
-    monkeypatch.setattr(h.os, "readlink", lambda p: links[p])
-    monkeypatch.setattr(
-        h.glob,
-        "glob",
-        lambda pat: (
-            sorted(list(links.keys())) if pat == "/etc/nginx/sites-enabled/*" else []
-        ),
-    )
-
-    calls: list[str] = []
-
-    class Policy:
-        def deny_reason(self, path: str):
-            return None
-
-        def deny_reason_link(self, path: str):
-            calls.append(path)
-            if path.endswith("/default"):
-                return "denied_path"
-            return None
-
-    state_path = h.harvest(str(bundle), policy=Policy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    svc = next(s for s in st["roles"]["services"] if s["role_name"] == "nginx")
-    managed_links = svc.get("managed_links") or []
-    excluded = svc.get("excluded") or []
-
-    assert any(p.endswith("/default") for p in calls)
-    assert any(p.endswith("/ok") for p in calls)
-    assert {ml["path"] for ml in managed_links} == {"/etc/nginx/sites-enabled/ok"}
-    assert {ex["path"] for ex in excluded} == {"/etc/nginx/sites-enabled/default"}
-    assert (
-        next(ex["reason"] for ex in excluded if ex["path"].endswith("/default"))
-        == "denied_path"
-    )
-
-
-def test_harvest_captures_apache2_enabled_symlinks(monkeypatch, tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    _base_monkeypatches(monkeypatch, unit="apache2.service")
-
-    dirs = {
-        "/etc",
-        "/etc/apache2/conf-enabled",
-        "/etc/apache2/mods-enabled",
-        "/etc/apache2/sites-enabled",
-    }
-    links = {
-        "/etc/apache2/sites-enabled/000-default.conf": "../sites-available/000-default.conf",
-        "/etc/apache2/mods-enabled/rewrite.load": "../mods-available/rewrite.load",
-        "/etc/apache2/conf-enabled/security.conf": "../conf-available/security.conf",
-    }
-
-    monkeypatch.setattr(h.os.path, "isdir", lambda p: p in dirs)
-    monkeypatch.setattr(h.os.path, "islink", lambda p: p in links)
-    monkeypatch.setattr(h.os, "readlink", lambda p: links[p])
-
-    def fake_glob(pat: str):
-        if pat == "/etc/apache2/sites-enabled/*":
-            return ["/etc/apache2/sites-enabled/000-default.conf"]
-        if pat == "/etc/apache2/mods-enabled/*":
-            return ["/etc/apache2/mods-enabled/rewrite.load"]
-        if pat == "/etc/apache2/conf-enabled/*":
-            return ["/etc/apache2/conf-enabled/security.conf"]
-        return []
-
-    monkeypatch.setattr(h.glob, "glob", fake_glob)
-
-    state_path = h.harvest(str(bundle), policy=AllowAllPolicy())
-    st = json.loads(Path(state_path).read_text(encoding="utf-8"))
-
-    svc = next(s for s in st["roles"]["services"] if s["role_name"] == "apache2")
-    managed_links = svc.get("managed_links") or []
-    assert {ml["path"] for ml in managed_links} == set(links.keys())
-    assert {ml["target"] for ml in managed_links} == set(links.values())
-    assert all(ml["reason"] == "enabled_symlink" for ml in managed_links)

tests/test_ignore.py

@@ -3,8 +3,7 @@ from enroll.ignore import IgnorePolicy
 
 def test_ignore_policy_denies_common_backup_files():
     pol = IgnorePolicy()
-    assert pol.deny_reason("/etc/shadow-") == "backup_file"
+    assert pol.deny_reason("/etc/shadow-") == "denied_path"
-    assert pol.deny_reason("/etc/passwd-") == "backup_file"
+    assert pol.deny_reason("/etc/passwd-") == "denied_path"
-    assert pol.deny_reason("/etc/group-") == "backup_file"
+    assert pol.deny_reason("/etc/group-") == "denied_path"
-    assert pol.deny_reason("/etc/something~") == "backup_file"
     assert pol.deny_reason("/foobar") == "unreadable"

tests/test_ignore_dir.py

@@ -1,56 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-
-def test_iter_effective_lines_skips_comments_and_block_comments():
-    from enroll.ignore import IgnorePolicy
-
-    policy = IgnorePolicy(deny_globs=[])
-
-    content = b"""
-# comment
-; semi
-// slash
-* c-star
-
-valid=1
-/* block
-ignored=1
-*/
-valid=2
-"""
-
-    lines = [l.strip() for l in policy.iter_effective_lines(content)]
-    assert lines == [b"valid=1", b"valid=2"]
-
-
-def test_deny_reason_dir_behaviour(tmp_path: Path):
-    from enroll.ignore import IgnorePolicy
-
-    # Use an absolute pattern matching our temporary path.
-    deny_glob = str(tmp_path / "deny") + "/*"
-    pol = IgnorePolicy(deny_globs=[deny_glob], dangerous=False)
-
-    d = tmp_path / "dir"
-    d.mkdir()
-    f = tmp_path / "file"
-    f.write_text("x", encoding="utf-8")
-    link = tmp_path / "link"
-    link.symlink_to(d)
-
-    assert pol.deny_reason_dir(str(d)) is None
-    assert pol.deny_reason_dir(str(link)) == "symlink"
-    assert pol.deny_reason_dir(str(f)) == "not_directory"
-
-    # Denied by glob.
-    deny_path = tmp_path / "deny" / "x"
-    deny_path.mkdir(parents=True)
-    assert pol.deny_reason_dir(str(deny_path)) == "denied_path"
-
-    # Missing/unreadable.
-    assert pol.deny_reason_dir(str(tmp_path / "missing")) == "unreadable"
-
-    # Dangerous disables deny_globs.
-    pol2 = IgnorePolicy(deny_globs=[deny_glob], dangerous=True)
-    assert pol2.deny_reason_dir(str(deny_path)) is None

tests/test_jinjaturtle.py

@@ -24,78 +24,44 @@ def test_manifest_uses_jinjaturtle_templates_and_does_not_copy_raw(
     )
 
     state = {
-        "schema_version": 3,
+        "host": {"hostname": "test", "os": "debian"},
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
+        "users": {
-        "inventory": {
+            "role_name": "users",
-            "packages": {
+            "users": [],
-                "foo": {
+            "managed_files": [],
-                    "version": "1.0",
+            "excluded": [],
-                    "arches": [],
+            "notes": [],
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
+        },
-                    "observed_via": [{"kind": "systemd_unit", "ref": "foo.service"}],
+        "etc_custom": {
-                    "roles": ["foo"],
+            "role_name": "etc_custom",
-                }
+            "managed_files": [],
+            "excluded": [],
+            "notes": [],
+        },
+        "services": [
+            {
+                "unit": "foo.service",
+                "role_name": "foo",
+                "packages": ["foo"],
+                "active_state": "inactive",
+                "sub_state": "dead",
+                "unit_file_state": "disabled",
+                "condition_result": "no",
+                "managed_files": [
+                    {
+                        "path": "/etc/foo.ini",
+                        "src_rel": "etc/foo.ini",
+                        "owner": "root",
+                        "group": "root",
+                        "mode": "0644",
+                        "reason": "modified_conffile",
+                    }
+                ],
+                "excluded": [],
+                "notes": [],
             }
-        },
+        ],
-        "roles": {
+        "package_roles": [],
-            "users": {
-                "role_name": "users",
-                "users": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [
-                {
-                    "unit": "foo.service",
-                    "role_name": "foo",
-                    "packages": ["foo"],
-                    "active_state": "inactive",
-                    "sub_state": "dead",
-                    "unit_file_state": "disabled",
-                    "condition_result": "no",
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo.ini",
-                            "src_rel": "etc/foo.ini",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "modified_conffile",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
     }
 
     bundle.mkdir(parents=True, exist_ok=True)

tests/test_manifest.py

@@ -1,12 +1,7 @@
 import json
 from pathlib import Path
 
-import os
+from enroll.manifest import manifest
-import stat
-import tarfile
-import pytest
-
-import enroll.manifest as manifest
 
 
 def test_manifest_writes_roles_and_playbook_with_clean_when(tmp_path: Path):
@@ -18,136 +13,95 @@ def test_manifest_writes_roles_and_playbook_with_clean_when(tmp_path: Path):
     )
 
     state = {
-        "schema_version": 3,
+        "host": {"hostname": "test", "os": "debian"},
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
+        "users": {
-        "inventory": {
+            "role_name": "users",
-            "packages": {
+            "users": [
-                "foo": {
+                {
-                    "version": "1.0",
+                    "name": "alice",
-                    "arches": [],
+                    "uid": 1000,
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
+                    "gid": 1000,
-                    "observed_via": [{"kind": "systemd_unit", "ref": "foo.service"}],
+                    "gecos": "Alice",
-                    "roles": ["foo"],
+                    "home": "/home/alice",
+                    "shell": "/bin/bash",
+                    "primary_group": "alice",
+                    "supplementary_groups": ["docker", "qubes"],
+                }
+            ],
+            "managed_files": [],
+            "excluded": [],
+            "notes": [],
+        },
+        "etc_custom": {
+            "role_name": "etc_custom",
+            "managed_files": [
+                {
+                    "path": "/etc/default/keyboard",
+                    "src_rel": "etc/default/keyboard",
+                    "owner": "root",
+                    "group": "root",
+                    "mode": "0644",
+                    "reason": "custom_unowned",
+                }
+            ],
+            "excluded": [],
+            "notes": [],
+        },
+        "usr_local_custom": {
+            "role_name": "usr_local_custom",
+            "managed_files": [
+                {
+                    "path": "/usr/local/etc/myapp.conf",
+                    "src_rel": "usr/local/etc/myapp.conf",
+                    "owner": "root",
+                    "group": "root",
+                    "mode": "0644",
+                    "reason": "usr_local_etc_custom",
                 },
-                "curl": {
+                {
-                    "version": "8.0",
+                    "path": "/usr/local/bin/myscript",
-                    "arches": [],
+                    "src_rel": "usr/local/bin/myscript",
-                    "installations": [{"version": "8.0", "arch": "amd64"}],
+                    "owner": "root",
-                    "observed_via": [{"kind": "package_role", "ref": "curl"}],
+                    "group": "root",
-                    "roles": ["curl"],
+                    "mode": "0755",
+                    "reason": "usr_local_bin_script",
                 },
+            ],
+            "excluded": [],
+            "notes": [],
+        },
+        "services": [
+            {
+                "unit": "foo.service",
+                "role_name": "foo",
+                "packages": ["foo"],
+                "active_state": "inactive",
+                "sub_state": "dead",
+                "unit_file_state": "enabled",
+                "condition_result": "no",
+                "managed_files": [
+                    {
+                        "path": "/etc/foo.conf",
+                        "src_rel": "etc/foo.conf",
+                        "owner": "root",
+                        "group": "root",
+                        "mode": "0644",
+                        "reason": "modified_conffile",
+                    }
+                ],
+                "excluded": [],
+                "notes": [],
             }
-        },
+        ],
-        "roles": {
+        "package_roles": [
-            "users": {
+            {
-                "role_name": "users",
+                "package": "curl",
-                "users": [
+                "role_name": "curl",
-                    {
-                        "name": "alice",
-                        "uid": 1000,
-                        "gid": 1000,
-                        "gecos": "Alice",
-                        "home": "/home/alice",
-                        "shell": "/bin/bash",
-                        "primary_group": "alice",
-                        "supplementary_groups": ["docker", "qubes"],
-                    }
-                ],
                 "managed_files": [],
                 "excluded": [],
                 "notes": [],
-            },
+            }
-            "services": [
+        ],
-                {
-                    "unit": "foo.service",
-                    "role_name": "foo",
-                    "packages": ["foo"],
-                    "active_state": "inactive",
-                    "sub_state": "dead",
-                    "unit_file_state": "enabled",
-                    "condition_result": "no",
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo.conf",
-                            "src_rel": "etc/foo.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "modified_conffile",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "packages": [
-                {
-                    "package": "curl",
-                    "role_name": "curl",
-                    "managed_files": [],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [
-                    {
-                        "path": "/etc/default/keyboard",
-                        "src_rel": "etc/default/keyboard",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "custom_unowned",
-                    }
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [
-                    {
-                        "path": "/usr/local/etc/myapp.conf",
-                        "src_rel": "usr/local/etc/myapp.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "usr_local_etc_custom",
-                    },
-                    {
-                        "path": "/usr/local/bin/myscript",
-                        "src_rel": "usr/local/bin/myscript",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0755",
-                        "reason": "usr_local_bin_script",
-                    },
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
     }
 
     bundle.mkdir(parents=True, exist_ok=True)
@@ -181,7 +135,7 @@ def test_manifest_writes_roles_and_playbook_with_clean_when(tmp_path: Path):
         bundle / "artifacts" / "usr_local_custom" / "usr" / "local" / "bin" / "myscript"
     ).write_text("#!/bin/sh\necho hi\n", encoding="utf-8")
 
-    manifest.manifest(str(bundle), str(out))
+    manifest(str(bundle), str(out))
 
     # Service role: systemd management should be gated on foo_manage_unit and a probe.
     tasks = (out / "roles" / "foo" / "tasks" / "main.yml").read_text(encoding="utf-8")
@@ -206,11 +160,11 @@ def test_manifest_writes_roles_and_playbook_with_clean_when(tmp_path: Path):
 
     # Playbook should include users, etc_custom, packages, and services
     pb = (out / "playbook.yml").read_text(encoding="utf-8")
-    assert "role: users" in pb
+    assert "- users" in pb
-    assert "role: etc_custom" in pb
+    assert "- etc_custom" in pb
-    assert "role: usr_local_custom" in pb
+    assert "- usr_local_custom" in pb
-    assert "role: curl" in pb
+    assert "- curl" in pb
-    assert "role: foo" in pb
+    assert "- foo" in pb
 
 
 def test_manifest_site_mode_creates_host_inventory_and_raw_files(tmp_path: Path):
@@ -235,102 +189,68 @@ def test_manifest_site_mode_creates_host_inventory_and_raw_files(tmp_path: Path)
     )
 
     state = {
-        "schema_version": 3,
+        "host": {"hostname": "test", "os": "debian"},
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
+        "users": {
-        "inventory": {
+            "role_name": "users",
-            "packages": {
+            "users": [],
-                "foo": {
+            "managed_files": [],
-                    "version": "1.0",
+            "excluded": [],
-                    "arches": [],
+            "notes": [],
-                    "installations": [{"version": "1.0", "arch": "amd64"}],
-                    "observed_via": [{"kind": "systemd_unit", "ref": "foo.service"}],
-                    "roles": ["foo"],
-                }
-            }
         },
-        "roles": {
+        "etc_custom": {
-            "users": {
+            "role_name": "etc_custom",
-                "role_name": "users",
+            "managed_files": [
-                "users": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [
                 {
-                    "unit": "foo.service",
+                    "path": "/etc/default/keyboard",
-                    "role_name": "foo",
+                    "src_rel": "etc/default/keyboard",
-                    "packages": ["foo"],
+                    "owner": "root",
-                    "active_state": "active",
+                    "group": "root",
-                    "sub_state": "running",
+                    "mode": "0644",
-                    "unit_file_state": "enabled",
+                    "reason": "custom_unowned",
-                    "condition_result": "yes",
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo.conf",
-                            "src_rel": "etc/foo.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "modified_conffile",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
                 }
             ],
-            "packages": [],
+            "excluded": [],
-            "apt_config": {
+            "notes": [],
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [
-                    {
-                        "path": "/etc/default/keyboard",
-                        "src_rel": "etc/default/keyboard",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "custom_unowned",
-                    }
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [
-                    {
-                        "path": "/usr/local/etc/myapp.conf",
-                        "src_rel": "usr/local/etc/myapp.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "usr_local_etc_custom",
-                    }
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
         },
+        "usr_local_custom": {
+            "role_name": "usr_local_custom",
+            "managed_files": [
+                {
+                    "path": "/usr/local/etc/myapp.conf",
+                    "src_rel": "usr/local/etc/myapp.conf",
+                    "owner": "root",
+                    "group": "root",
+                    "mode": "0644",
+                    "reason": "usr_local_etc_custom",
+                }
+            ],
+            "excluded": [],
+            "notes": [],
+        },
+        "services": [
+            {
+                "unit": "foo.service",
+                "role_name": "foo",
+                "packages": ["foo"],
+                "active_state": "active",
+                "sub_state": "running",
+                "unit_file_state": "enabled",
+                "condition_result": "yes",
+                "managed_files": [
+                    {
+                        "path": "/etc/foo.conf",
+                        "src_rel": "etc/foo.conf",
+                        "owner": "root",
+                        "group": "root",
+                        "mode": "0644",
+                        "reason": "modified_conffile",
+                    }
+                ],
+                "excluded": [],
+                "notes": [],
+            }
+        ],
+        "package_roles": [],
     }
 
     bundle.mkdir(parents=True, exist_ok=True)
@@ -350,7 +270,7 @@ def test_manifest_site_mode_creates_host_inventory_and_raw_files(tmp_path: Path)
         / "myapp.conf"
     ).write_text("myapp=1\n", encoding="utf-8")
 
-    manifest.manifest(str(bundle), str(out), fqdn=fqdn)
+    manifest(str(bundle), str(out), fqdn=fqdn)
 
     # Host playbook exists.
     assert (out / "playbooks" / f"{fqdn}.yml").exists()
@@ -402,396 +322,3 @@ def test_copy2_replace_overwrites_readonly_destination(tmp_path: Path):
     assert dst.read_text(encoding="utf-8") == "new"
     mode = stat.S_IMODE(dst.stat().st_mode)
     assert mode & stat.S_IWUSR  # destination should remain mergeable
-
-
-def test_manifest_includes_dnf_config_role_when_present(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "ansible"
-
-    # Create a dnf_config artifact.
-    (bundle / "artifacts" / "dnf_config" / "etc" / "dnf").mkdir(
-        parents=True, exist_ok=True
-    )
-    (bundle / "artifacts" / "dnf_config" / "etc" / "dnf" / "dnf.conf").write_text(
-        "[main]\n", encoding="utf-8"
-    )
-
-    state = {
-        "schema_version": 3,
-        "host": {"hostname": "test", "os": "redhat", "pkg_backend": "rpm"},
-        "inventory": {
-            "packages": {
-                "dnf": {
-                    "version": "4.0",
-                    "arches": [],
-                    "installations": [{"version": "4.0", "arch": "x86_64"}],
-                    "observed_via": [{"kind": "dnf_config"}],
-                    "roles": [],
-                }
-            }
-        },
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [
-                    {
-                        "path": "/etc/dnf/dnf.conf",
-                        "src_rel": "etc/dnf/dnf.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "dnf_config",
-                    }
-                ],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-
-    bundle.mkdir(parents=True, exist_ok=True)
-    (bundle / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-
-    manifest.manifest(str(bundle), str(out))
-
-    pb = (out / "playbook.yml").read_text(encoding="utf-8")
-    assert "role: dnf_config" in pb
-
-    tasks = (out / "roles" / "dnf_config" / "tasks" / "main.yml").read_text(
-        encoding="utf-8"
-    )
-    # Ensure the role exists and contains some file deployment logic.
-    assert "Deploy any other managed files" in tasks
-
-
-def test_render_install_packages_tasks_contains_dnf_branch():
-    from enroll.manifest import _render_install_packages_tasks
-
-    txt = _render_install_packages_tasks("role", "role")
-    assert "ansible.builtin.apt" in txt
-    assert "ansible.builtin.dnf" in txt
-    assert "ansible.builtin.package" in txt
-    assert "pkg_mgr" in txt
-
-
-def test_manifest_orders_cron_and_logrotate_at_playbook_tail(tmp_path: Path):
-    """Cron/logrotate roles should appear at the end.
-
-    The cron role may restore per-user crontabs under /var/spool, so it should
-    run after users have been created.
-    """
-
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "ansible"
-
-    state = {
-        "schema_version": 3,
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
-        "inventory": {"packages": {}},
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [{"name": "alice"}],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [],
-            "packages": [
-                {
-                    "package": "curl",
-                    "role_name": "curl",
-                    "managed_files": [],
-                    "excluded": [],
-                    "notes": [],
-                },
-                {
-                    "package": "cron",
-                    "role_name": "cron",
-                    "managed_files": [
-                        {
-                            "path": "/var/spool/cron/crontabs/alice",
-                            "src_rel": "var/spool/cron/crontabs/alice",
-                            "owner": "alice",
-                            "group": "root",
-                            "mode": "0600",
-                            "reason": "system_cron",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                },
-                {
-                    "package": "logrotate",
-                    "role_name": "logrotate",
-                    "managed_files": [
-                        {
-                            "path": "/etc/logrotate.conf",
-                            "src_rel": "etc/logrotate.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "system_logrotate",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                },
-            ],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-
-    # Minimal artifacts for managed files.
-    (bundle / "artifacts" / "cron" / "var" / "spool" / "cron" / "crontabs").mkdir(
-        parents=True, exist_ok=True
-    )
-    (
-        bundle / "artifacts" / "cron" / "var" / "spool" / "cron" / "crontabs" / "alice"
-    ).write_text("@daily echo hi\n", encoding="utf-8")
-    (bundle / "artifacts" / "logrotate" / "etc").mkdir(parents=True, exist_ok=True)
-    (bundle / "artifacts" / "logrotate" / "etc" / "logrotate.conf").write_text(
-        "weekly\n", encoding="utf-8"
-    )
-
-    bundle.mkdir(parents=True, exist_ok=True)
-    (bundle / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-
-    manifest.manifest(str(bundle), str(out))
-
-    pb = (out / "playbook.yml").read_text(encoding="utf-8").splitlines()
-    # Roles are emitted as indented list items under the `roles:` key.
-    roles = [
-        ln.strip().removeprefix("- ").strip() for ln in pb if ln.startswith("    - ")
-    ]
-
-    # Ensure tail ordering.
-    assert roles[-2:] == ["role: cron", "role: logrotate"]
-    assert "role: users" in roles
-    assert roles.index("role: users") < roles.index("role: cron")
-
-
-def test_yaml_helpers_fallback_when_yaml_unavailable(monkeypatch):
-    monkeypatch.setattr(manifest, "_try_yaml", lambda: None)
-    assert manifest._yaml_load_mapping("foo: 1\n") == {}
-    out = manifest._yaml_dump_mapping({"b": 2, "a": 1})
-    # Best-effort fallback is key: repr(value)
-    assert out.splitlines()[0].startswith("a: ")
-    assert out.endswith("\n")
-
-
-def test_copy2_replace_makes_readonly_sources_user_writable(
-    monkeypatch, tmp_path: Path
-):
-    src = tmp_path / "src.txt"
-    dst = tmp_path / "dst.txt"
-    src.write_text("hello", encoding="utf-8")
-    # Make source read-only; copy2 preserves mode, so tmp will be read-only too.
-    os.chmod(src, 0o444)
-
-    manifest._copy2_replace(str(src), str(dst))
-
-    st = os.stat(dst, follow_symlinks=False)
-    assert stat.S_IMODE(st.st_mode) & stat.S_IWUSR
-
-
-def test_prepare_bundle_dir_sops_decrypts_and_extracts(monkeypatch, tmp_path: Path):
-    enc = tmp_path / "harvest.tar.gz.sops"
-    enc.write_text("ignored", encoding="utf-8")
-
-    def fake_require():
-        return None
-
-    def fake_decrypt(src: str, dst: str, *, mode: int = 0o600):
-        # Create a minimal tar.gz with a state.json file.
-        with tarfile.open(dst, "w:gz") as tf:
-            p = tmp_path / "state.json"
-            p.write_text("{}", encoding="utf-8")
-            tf.add(p, arcname="state.json")
-
-    monkeypatch.setattr(manifest, "require_sops_cmd", fake_require)
-    monkeypatch.setattr(manifest, "decrypt_file_binary_to", fake_decrypt)
-
-    bundle_dir, td = manifest._prepare_bundle_dir(str(enc), sops_mode=True)
-    try:
-        assert (Path(bundle_dir) / "state.json").exists()
-    finally:
-        td.cleanup()
-
-
-def test_prepare_bundle_dir_rejects_non_dir_without_sops(tmp_path: Path):
-    fp = tmp_path / "bundle.tar.gz"
-    fp.write_text("x", encoding="utf-8")
-    with pytest.raises(RuntimeError):
-        manifest._prepare_bundle_dir(str(fp), sops_mode=False)
-
-
-def test_tar_dir_to_with_progress_writes_progress_when_tty(monkeypatch, tmp_path: Path):
-    src = tmp_path / "dir"
-    src.mkdir()
-    (src / "a.txt").write_text("a", encoding="utf-8")
-    (src / "b.txt").write_text("b", encoding="utf-8")
-
-    out = tmp_path / "out.tar.gz"
-    writes: list[bytes] = []
-
-    monkeypatch.setattr(manifest.os, "isatty", lambda fd: True)
-    monkeypatch.setattr(manifest.os, "write", lambda fd, b: writes.append(b) or len(b))
-
-    manifest._tar_dir_to_with_progress(str(src), str(out), desc="tarring")
-    assert out.exists()
-    assert writes  # progress was written
-    assert writes[-1].endswith(b"\n")
-
-
-def test_encrypt_manifest_out_dir_to_sops_handles_missing_tmp_cleanup(
-    monkeypatch, tmp_path: Path
-):
-    src_dir = tmp_path / "manifest"
-    src_dir.mkdir()
-    (src_dir / "x.txt").write_text("x", encoding="utf-8")
-
-    out = tmp_path / "manifest.tar.gz.sops"
-
-    monkeypatch.setattr(manifest, "require_sops_cmd", lambda: None)
-
-    def fake_encrypt(in_fp, out_fp, *args, **kwargs):
-        Path(out_fp).write_text("enc", encoding="utf-8")
-
-    monkeypatch.setattr(manifest, "encrypt_file_binary", fake_encrypt)
-    # Simulate race where tmp tar is already removed.
-    monkeypatch.setattr(
-        manifest.os, "unlink", lambda p: (_ for _ in ()).throw(FileNotFoundError())
-    )
-
-    res = manifest._encrypt_manifest_out_dir_to_sops(str(src_dir), str(out), ["ABC"])  # type: ignore[arg-type]
-    assert str(res).endswith(".sops")
-    assert out.exists()
-
-
-def test_manifest_applies_jinjaturtle_to_jinjifyable_managed_file(
-    monkeypatch, tmp_path: Path
-):
-    # Create a minimal bundle with just an apt_config snapshot.
-    bundle = tmp_path / "bundle"
-    (bundle / "artifacts" / "apt_config" / "etc" / "apt").mkdir(parents=True)
-    (bundle / "artifacts" / "apt_config" / "etc" / "apt" / "foo.ini").write_text(
-        "key=VALUE\n", encoding="utf-8"
-    )
-
-    state = {
-        "schema_version": 1,
-        "inventory": {"packages": {}},
-        "roles": {
-            "services": [],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [
-                    {
-                        "path": "/etc/apt/foo.ini",
-                        "src_rel": "etc/apt/foo.ini",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "apt_config",
-                    }
-                ],
-                "managed_dirs": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-    (bundle / "state.json").write_text(
-        __import__("json").dumps(state), encoding="utf-8"
-    )
-
-    monkeypatch.setattr(manifest, "find_jinjaturtle_cmd", lambda: "jinjaturtle")
-
-    class _Res:
-        template_text = "key={{ foo }}\n"
-        vars_text = "foo: 123\n"
-
-    monkeypatch.setattr(manifest, "run_jinjaturtle", lambda *a, **k: _Res())
-
-    out_dir = tmp_path / "out"
-    manifest.manifest(str(bundle), str(out_dir), jinjaturtle="on")
-
-    tmpl = out_dir / "roles" / "apt_config" / "templates" / "etc" / "apt" / "foo.ini.j2"
-    assert tmpl.exists()
-    assert "{{ foo }}" in tmpl.read_text(encoding="utf-8")
-
-    defaults = out_dir / "roles" / "apt_config" / "defaults" / "main.yml"
-    txt = defaults.read_text(encoding="utf-8")
-    assert "foo: 123" in txt
-    # Non-templated file should not exist under files/.
-    assert not (
-        out_dir / "roles" / "apt_config" / "files" / "etc" / "apt" / "foo.ini"
-    ).exists()

tests/test_manifest_symlinks.py

@@ -1,96 +0,0 @@
-import json
-from pathlib import Path
-
-import enroll.manifest as manifest
-
-
-def test_manifest_emits_symlink_tasks_and_vars(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "ansible"
-
-    state = {
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
-        "inventory": {"packages": {}},
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [
-                {
-                    "unit": "nginx.service",
-                    "role_name": "nginx",
-                    "packages": ["nginx"],
-                    "active_state": "active",
-                    "sub_state": "running",
-                    "unit_file_state": "enabled",
-                    "condition_result": None,
-                    "managed_files": [],
-                    "managed_links": [
-                        {
-                            "path": "/etc/nginx/sites-enabled/default",
-                            "target": "../sites-available/default",
-                            "reason": "enabled_symlink",
-                        }
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_files": [],
-                "managed_links": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-
-    bundle.mkdir(parents=True, exist_ok=True)
-    (bundle / "artifacts").mkdir(parents=True, exist_ok=True)
-    (bundle / "state.json").write_text(json.dumps(state), encoding="utf-8")
-
-    manifest.manifest(str(bundle), str(out))
-
-    tasks = (out / "roles" / "nginx" / "tasks" / "main.yml").read_text(encoding="utf-8")
-    assert "- name: Ensure managed symlinks exist" in tasks
-    assert 'loop: "{{ nginx_managed_links | default([]) }}"' in tasks
-
-    defaults = (out / "roles" / "nginx" / "defaults" / "main.yml").read_text(
-        encoding="utf-8"
-    )
-    # The role defaults should include the converted link mapping.
-    assert "nginx_managed_links:" in defaults
-    assert "dest: /etc/nginx/sites-enabled/default" in defaults
-    assert "src: ../sites-available/default" in defaults

tests/test_misc_coverage.py

@@ -1,13 +1,5 @@
-from __future__ import annotations
-
-import json
-import os
 import stat
-import subprocess
-import sys
-import types
 from pathlib import Path
-from types import SimpleNamespace
 
 import pytest
 
@@ -102,315 +94,3 @@ def test_sops_pgp_arg_and_encrypt_decrypt_roundtrip(tmp_path: Path, monkeypatch)
     # Sanity: we invoked encrypt and decrypt.
     assert any("--encrypt" in c for c in calls)
     assert any("--decrypt" in c for c in calls)
-
-
-def test_cache_dir_defaults_to_home_cache(monkeypatch, tmp_path: Path):
-    # Ensure default path uses ~/.cache when XDG_CACHE_HOME is unset.
-    from enroll.cache import enroll_cache_dir
-
-    monkeypatch.delenv("XDG_CACHE_HOME", raising=False)
-    monkeypatch.setattr(Path, "home", lambda: tmp_path)
-
-    p = enroll_cache_dir()
-    assert str(p).startswith(str(tmp_path))
-    assert p.name == "enroll"
-
-
-def test_harvest_cache_state_json_property(tmp_path: Path):
-    from enroll.cache import HarvestCache
-
-    hc = HarvestCache(tmp_path / "h1")
-    assert hc.state_json == hc.dir / "state.json"
-
-
-def test_cache_dir_security_rejects_symlink(tmp_path: Path):
-    from enroll.cache import _ensure_dir_secure
-
-    real = tmp_path / "real"
-    real.mkdir()
-    link = tmp_path / "link"
-    link.symlink_to(real, target_is_directory=True)
-
-    with pytest.raises(RuntimeError, match="Refusing to use symlink"):
-        _ensure_dir_secure(link)
-
-
-def test_cache_dir_chmod_failures_are_ignored(monkeypatch, tmp_path: Path):
-    from enroll import cache
-
-    # Make the cache base path deterministic and writable.
-    monkeypatch.setattr(cache, "enroll_cache_dir", lambda: tmp_path)
-
-    # Force os.chmod to fail to cover the "except OSError: pass" paths.
-    monkeypatch.setattr(
-        os, "chmod", lambda *a, **k: (_ for _ in ()).throw(OSError("nope"))
-    )
-
-    hc = cache.new_harvest_cache_dir()
-    assert hc.dir.exists()
-    assert hc.dir.is_dir()
-
-
-def test_stat_triplet_falls_back_to_numeric_ids(monkeypatch, tmp_path: Path):
-    from enroll.fsutil import stat_triplet
-    import pwd
-    import grp
-
-    p = tmp_path / "x"
-    p.write_text("x", encoding="utf-8")
-
-    # Force username/group resolution failures.
-    monkeypatch.setattr(
-        pwd, "getpwuid", lambda _uid: (_ for _ in ()).throw(KeyError("no user"))
-    )
-    monkeypatch.setattr(
-        grp, "getgrgid", lambda _gid: (_ for _ in ()).throw(KeyError("no group"))
-    )
-
-    owner, group, mode = stat_triplet(str(p))
-    assert owner.isdigit()
-    assert group.isdigit()
-    assert len(mode) == 4
-
-
-def test_ignore_policy_iter_effective_lines_removes_block_comments():
-    from enroll.ignore import IgnorePolicy
-
-    pol = IgnorePolicy()
-    data = b"""keep1
-/*
-drop me
-*/
-keep2
-"""
-    assert list(pol.iter_effective_lines(data)) == [b"keep1", b"keep2"]
-
-
-def test_ignore_policy_deny_reason_dir_variants(tmp_path: Path):
-    from enroll.ignore import IgnorePolicy
-
-    pol = IgnorePolicy()
-
-    # denied by glob
-    assert pol.deny_reason_dir("/etc/shadow") == "denied_path"
-
-    # symlink rejected
-    d = tmp_path / "d"
-    d.mkdir()
-    link = tmp_path / "l"
-    link.symlink_to(d, target_is_directory=True)
-    assert pol.deny_reason_dir(str(link)) == "symlink"
-
-    # not a directory
-    f = tmp_path / "f"
-    f.write_text("x", encoding="utf-8")
-    assert pol.deny_reason_dir(str(f)) == "not_directory"
-
-    # ok
-    assert pol.deny_reason_dir(str(d)) is None
-
-
-def test_run_jinjaturtle_parses_outputs(monkeypatch, tmp_path: Path):
-    # Fully unit-test enroll.jinjaturtle.run_jinjaturtle by stubbing subprocess.run.
-    from enroll.jinjaturtle import run_jinjaturtle
-
-    def fake_run(cmd, **kwargs):  # noqa: ARG001
-        # cmd includes "-d <defaults> -t <template>"
-        d_idx = cmd.index("-d") + 1
-        t_idx = cmd.index("-t") + 1
-        defaults = Path(cmd[d_idx])
-        template = Path(cmd[t_idx])
-        defaults.write_text("---\nfoo: 1\n", encoding="utf-8")
-        template.write_text("value={{ foo }}\n", encoding="utf-8")
-        return SimpleNamespace(returncode=0, stdout="ok", stderr="")
-
-    monkeypatch.setattr(subprocess, "run", fake_run)
-
-    src = tmp_path / "src.ini"
-    src.write_text("foo=1\n", encoding="utf-8")
-
-    res = run_jinjaturtle("/bin/jinjaturtle", str(src), role_name="role1")
-    assert "foo: 1" in res.vars_text
-    assert "value=" in res.template_text
-
-
-def test_run_jinjaturtle_raises_on_failure(monkeypatch, tmp_path: Path):
-    from enroll.jinjaturtle import run_jinjaturtle
-
-    def fake_run(cmd, **kwargs):  # noqa: ARG001
-        return SimpleNamespace(returncode=2, stdout="out", stderr="bad")
-
-    monkeypatch.setattr(subprocess, "run", fake_run)
-
-    src = tmp_path / "src.ini"
-    src.write_text("x", encoding="utf-8")
-    with pytest.raises(RuntimeError, match="jinjaturtle failed"):
-        run_jinjaturtle("/bin/jinjaturtle", str(src), role_name="role1")
-
-
-def test_require_sops_cmd_errors_when_missing(monkeypatch):
-    from enroll.sopsutil import require_sops_cmd, SopsError
-
-    monkeypatch.setattr("enroll.sopsutil.shutil.which", lambda _: None)
-    with pytest.raises(SopsError, match="not found on PATH"):
-        require_sops_cmd()
-
-
-def test_get_enroll_version_reports_unknown_on_metadata_failure(monkeypatch):
-    import enroll.version as v
-
-    fake_meta = types.ModuleType("importlib.metadata")
-
-    def boom():
-        raise RuntimeError("boom")
-
-    fake_meta.packages_distributions = boom
-    fake_meta.version = lambda _dist: boom()
-
-    monkeypatch.setitem(sys.modules, "importlib.metadata", fake_meta)
-    assert v.get_enroll_version() == "unknown"
-
-
-def test_get_enroll_version_returns_unknown_if_importlib_metadata_unavailable(
-    monkeypatch,
-):
-    import builtins
-    import enroll.version as v
-
-    real_import = builtins.__import__
-
-    def fake_import(
-        name, globals=None, locals=None, fromlist=(), level=0
-    ):  # noqa: A002
-        if name == "importlib.metadata":
-            raise ImportError("no metadata")
-        return real_import(name, globals, locals, fromlist, level)
-
-    monkeypatch.setattr(builtins, "__import__", fake_import)
-    assert v.get_enroll_version() == "unknown"
-
-
-def test_compare_harvests_and_format_report(tmp_path: Path):
-    from enroll.diff import compare_harvests, format_report
-
-    old = tmp_path / "old"
-    new = tmp_path / "new"
-    (old / "artifacts").mkdir(parents=True)
-    (new / "artifacts").mkdir(parents=True)
-
-    def write_state(base: Path, state: dict) -> None:
-        base.mkdir(parents=True, exist_ok=True)
-        (base / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-
-    # Old bundle: pkg a@1.0, pkg b@1.0, one service, one user, one managed file.
-    old_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h1"},
-        "inventory": {"packages": {"a": {"version": "1.0"}, "b": {"version": "1.0"}}},
-        "roles": {
-            "services": [
-                {
-                    "unit": "svc.service",
-                    "role_name": "svc",
-                    "packages": ["a"],
-                    "active_state": "inactive",
-                    "sub_state": "dead",
-                    "unit_file_state": "enabled",
-                    "condition_result": None,
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo.conf",
-                            "src_rel": "etc/foo.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                            "reason": "modified_conffile",
-                        }
-                    ],
-                }
-            ],
-            "packages": [],
-            "users": {
-                "role_name": "users",
-                "users": [{"name": "alice", "shell": "/bin/sh"}],
-            },
-            "apt_config": {"role_name": "apt_config", "managed_files": []},
-            "etc_custom": {"role_name": "etc_custom", "managed_files": []},
-            "usr_local_custom": {"role_name": "usr_local_custom", "managed_files": []},
-            "extra_paths": {"role_name": "extra_paths", "managed_files": []},
-        },
-    }
-    (old / "artifacts" / "svc" / "etc").mkdir(parents=True, exist_ok=True)
-    (old / "artifacts" / "svc" / "etc" / "foo.conf").write_text("old", encoding="utf-8")
-    write_state(old, old_state)
-
-    # New bundle: pkg a@2.0, pkg c@1.0, service changed, user changed, file moved role+content.
-    new_state = {
-        "schema_version": 3,
-        "host": {"hostname": "h2"},
-        "inventory": {"packages": {"a": {"version": "2.0"}, "c": {"version": "1.0"}}},
-        "roles": {
-            "services": [
-                {
-                    "unit": "svc.service",
-                    "role_name": "svc",
-                    "packages": ["a", "c"],
-                    "active_state": "active",
-                    "sub_state": "running",
-                    "unit_file_state": "enabled",
-                    "condition_result": None,
-                    "managed_files": [],
-                }
-            ],
-            "packages": [],
-            "users": {
-                "role_name": "users",
-                "users": [{"name": "alice", "shell": "/bin/bash"}, {"name": "bob"}],
-            },
-            "apt_config": {"role_name": "apt_config", "managed_files": []},
-            "etc_custom": {"role_name": "etc_custom", "managed_files": []},
-            "usr_local_custom": {"role_name": "usr_local_custom", "managed_files": []},
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "managed_files": [
-                    {
-                        "path": "/etc/foo.conf",
-                        "src_rel": "etc/foo.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0600",
-                        "reason": "user_include",
-                    },
-                    {
-                        "path": "/etc/added.conf",
-                        "src_rel": "etc/added.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                        "reason": "user_include",
-                    },
-                ],
-            },
-        },
-    }
-    (new / "artifacts" / "extra_paths" / "etc").mkdir(parents=True, exist_ok=True)
-    (new / "artifacts" / "extra_paths" / "etc" / "foo.conf").write_text(
-        "new", encoding="utf-8"
-    )
-    (new / "artifacts" / "extra_paths" / "etc" / "added.conf").write_text(
-        "x", encoding="utf-8"
-    )
-    write_state(new, new_state)
-
-    report, changed = compare_harvests(str(old), str(new))
-    assert changed is True
-
-    txt = format_report(report, fmt="text")
-    assert "Packages" in txt
-
-    md = format_report(report, fmt="markdown")
-    assert "# enroll diff report" in md
-
-    js = format_report(report, fmt="json")
-    parsed = json.loads(js)
-    assert parsed["packages"]["added"] == ["c"]

tests/test_pathfilter.py

@@ -1,186 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-import enroll.pathfilter as pf
-
-
-def test_compile_and_match_prefix_glob_and_regex(tmp_path: Path):
-    from enroll.pathfilter import PathFilter, compile_path_pattern
-
-    # prefix semantics: matches the exact path and subtree
-    p = compile_path_pattern("/etc/nginx")
-    assert p.kind == "prefix"
-    assert p.matches("/etc/nginx")
-    assert p.matches("/etc/nginx/nginx.conf")
-    assert not p.matches("/etc/nginx2/nginx.conf")
-
-    # glob semantics
-    g = compile_path_pattern("/etc/**/*.conf")
-    assert g.kind == "glob"
-    assert g.matches("/etc/nginx/nginx.conf")
-    assert not g.matches("/var/etc/nginx.conf")
-
-    # explicit glob
-    g2 = compile_path_pattern("glob:/home/*/.bashrc")
-    assert g2.kind == "glob"
-    assert g2.matches("/home/alice/.bashrc")
-
-    # regex semantics (search, not match)
-    r = compile_path_pattern(r"re:/home/[^/]+/\.ssh/authorized_keys$")
-    assert r.kind == "regex"
-    assert r.matches("/home/alice/.ssh/authorized_keys")
-    assert not r.matches("/home/alice/.ssh/authorized_keys2")
-
-    # invalid regex: never matches
-    bad = compile_path_pattern("re:[")
-    assert bad.kind == "regex"
-    assert not bad.matches("/etc/passwd")
-
-    # exclude wins
-    pf = PathFilter(exclude=["/etc/nginx"], include=["/etc/nginx/nginx.conf"])
-    assert pf.is_excluded("/etc/nginx/nginx.conf")
-
-
-def test_expand_includes_respects_exclude_symlinks_and_caps(tmp_path: Path):
-    from enroll.pathfilter import PathFilter, compile_path_pattern, expand_includes
-
-    root = tmp_path / "root"
-    (root / "a").mkdir(parents=True)
-    (root / "a" / "one.txt").write_text("1", encoding="utf-8")
-    (root / "a" / "two.txt").write_text("2", encoding="utf-8")
-    (root / "b").mkdir()
-    (root / "b" / "secret.txt").write_text("s", encoding="utf-8")
-
-    # symlink file should be ignored
-    os.symlink(str(root / "a" / "one.txt"), str(root / "a" / "link.txt"))
-
-    exclude = PathFilter(exclude=[str(root / "b")])
-
-    pats = [
-        compile_path_pattern(str(root / "a")),
-        compile_path_pattern("glob:" + str(root / "**" / "*.txt")),
-    ]
-
-    paths, notes = expand_includes(pats, exclude=exclude, max_files=2)
-    # cap should limit to 2 files
-    assert len(paths) == 2
-    assert any("cap" in n.lower() for n in notes)
-    # excluded dir should not contribute
-    assert all("/b/" not in p for p in paths)
-    # symlink ignored
-    assert all(not p.endswith("link.txt") for p in paths)
-
-
-def test_expand_includes_notes_on_no_matches(tmp_path: Path):
-    from enroll.pathfilter import compile_path_pattern, expand_includes
-
-    pats = [compile_path_pattern(str(tmp_path / "does_not_exist"))]
-    paths, notes = expand_includes(pats, max_files=10)
-    assert paths == []
-    assert any("matched no files" in n.lower() for n in notes)
-
-
-def test_expand_includes_supports_regex_with_inferred_root(tmp_path: Path):
-    """Regex includes are expanded by walking an inferred literal prefix root."""
-    from enroll.pathfilter import compile_path_pattern, expand_includes
-
-    root = tmp_path / "root"
-    (root / "home" / "alice" / ".config" / "myapp").mkdir(parents=True)
-    target = root / "home" / "alice" / ".config" / "myapp" / "settings.ini"
-    target.write_text("x=1\n", encoding="utf-8")
-
-    # This is anchored and begins with an absolute path, so expand_includes should
-    # infer a narrow walk root instead of scanning '/'.
-    rex = rf"re:^{root}/home/[^/]+/\.config/myapp/.*$"
-    pat = compile_path_pattern(rex)
-    paths, notes = expand_includes([pat], max_files=10)
-    assert str(target) in paths
-    assert notes == []
-
-
-def test_compile_path_pattern_normalises_relative_prefix():
-    from enroll.pathfilter import compile_path_pattern
-
-    p = compile_path_pattern("etc/ssh")
-    assert p.kind == "prefix"
-    assert p.value == "/etc/ssh"
-
-
-def test_norm_abs_empty_string_is_root():
-    assert pf._norm_abs("") == "/"
-
-
-def test_posix_match_invalid_pattern_fails_closed(monkeypatch):
-    # Force PurePosixPath.match to raise to cover the exception handler.
-    real_match = pf.PurePosixPath.match
-
-    def boom(self, pat):
-        raise ValueError("bad pattern")
-
-    monkeypatch.setattr(pf.PurePosixPath, "match", boom)
-    try:
-        assert pf._posix_match("/etc/hosts", "[bad") is False
-    finally:
-        monkeypatch.setattr(pf.PurePosixPath, "match", real_match)
-
-
-def test_regex_literal_prefix_handles_escapes():
-    # Prefix stops at meta chars but includes escaped literals.
-    assert pf._regex_literal_prefix(r"^/etc/\./foo") == "/etc/./foo"
-
-
-def test_expand_includes_maybe_add_file_skips_non_files(monkeypatch, tmp_path: Path):
-    # Drive the _maybe_add_file branch that rejects symlinks/non-files.
-    pats = [pf.compile_path_pattern(str(tmp_path / "missing"))]
-
-    monkeypatch.setattr(pf.os.path, "isfile", lambda p: False)
-    monkeypatch.setattr(pf.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(pf.os.path, "isdir", lambda p: False)
-
-    paths, notes = pf.expand_includes(pats, max_files=10)
-    assert paths == []
-    assert any("matched no files" in n for n in notes)
-
-
-def test_expand_includes_prunes_excluded_dirs(monkeypatch):
-    include = [pf.compile_path_pattern("/root/**")]
-    exclude = pf.PathFilter(exclude=["/root/skip/**"])
-
-    # Simulate filesystem walk:
-    # /root has dirnames ['skip', 'keep'] but skip should be pruned.
-    monkeypatch.setattr(
-        pf.os.path,
-        "isdir",
-        lambda p: p in {"/root", "/root/keep", "/root/skip"},
-    )
-    monkeypatch.setattr(pf.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(pf.os.path, "isfile", lambda p: True)
-
-    def walk(root, followlinks=False):
-        assert root == "/root"
-        yield ("/root", ["skip", "keep"], [])
-        yield ("/root/keep", [], ["a.txt"])
-        # If pruning works, we should never walk into /root/skip.
-
-    monkeypatch.setattr(pf.os, "walk", walk)
-
-    paths, _notes = pf.expand_includes(include, exclude=exclude, max_files=10)
-    assert "/root/keep/a.txt" in paths
-    assert not any(p.startswith("/root/skip") for p in paths)
-
-
-def test_expand_includes_respects_max_files(monkeypatch):
-    include = [pf.compile_path_pattern("/root/**")]
-    monkeypatch.setattr(pf.os.path, "isdir", lambda p: p == "/root")
-    monkeypatch.setattr(pf.os.path, "islink", lambda p: False)
-    monkeypatch.setattr(pf.os.path, "isfile", lambda p: True)
-    monkeypatch.setattr(
-        pf.os,
-        "walk",
-        lambda root, followlinks=False: [("/root", [], ["a", "b", "c"])],
-    )
-    paths, notes = pf.expand_includes(include, max_files=2)
-    assert len(paths) == 2
-    assert "/root/c" not in paths

tests/test_platform.py

@@ -1,93 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-import enroll.platform as platform
-
-
-def test_read_os_release_parses_kv_and_strips_quotes(tmp_path: Path):
-    p = tmp_path / "os-release"
-    p.write_text(
-        """
-# comment
-ID=fedora
-ID_LIKE=\"rhel centos\"
-NAME=\"Fedora Linux\"
-EMPTY=
-NOEQUALS
-""",
-        encoding="utf-8",
-    )
-
-    osr = platform._read_os_release(str(p))
-    assert osr["ID"] == "fedora"
-    assert osr["ID_LIKE"] == "rhel centos"
-    assert osr["NAME"] == "Fedora Linux"
-    assert osr["EMPTY"] == ""
-    assert "NOEQUALS" not in osr
-
-
-def test_detect_platform_prefers_os_release(monkeypatch):
-    monkeypatch.setattr(
-        platform,
-        "_read_os_release",
-        lambda path="/etc/os-release": {"ID": "fedora", "ID_LIKE": "rhel"},
-    )
-    # If os-release is decisive we shouldn't need which()
-    monkeypatch.setattr(platform.shutil, "which", lambda exe: None)
-
-    info = platform.detect_platform()
-    assert info.os_family == "redhat"
-    assert info.pkg_backend == "rpm"
-
-
-def test_detect_platform_fallbacks_to_dpkg_when_unknown(monkeypatch):
-    monkeypatch.setattr(platform, "_read_os_release", lambda path="/etc/os-release": {})
-    monkeypatch.setattr(
-        platform.shutil, "which", lambda exe: "/usr/bin/dpkg" if exe == "dpkg" else None
-    )
-
-    info = platform.detect_platform()
-    assert info.os_family == "debian"
-    assert info.pkg_backend == "dpkg"
-
-
-def test_get_backend_unknown_prefers_rpm_if_present(monkeypatch):
-    monkeypatch.setattr(
-        platform.shutil, "which", lambda exe: "/usr/bin/rpm" if exe == "rpm" else None
-    )
-
-    b = platform.get_backend(
-        platform.PlatformInfo(os_family="unknown", pkg_backend="unknown", os_release={})
-    )
-    assert isinstance(b, platform.RpmBackend)
-
-
-def test_rpm_backend_modified_paths_labels_conffiles(monkeypatch):
-    b = platform.RpmBackend()
-
-    # Pretend rpm -V says both files changed, but only one is a config file.
-    monkeypatch.setattr(b, "_modified_files", lambda pkg: {"/etc/foo.conf", "/etc/bar"})
-    monkeypatch.setattr(b, "_config_files", lambda pkg: {"/etc/foo.conf"})
-
-    out = b.modified_paths("mypkg", ["/etc/foo.conf", "/etc/bar", "/etc/dnf/dnf.conf"])
-    assert out["/etc/foo.conf"] == "modified_conffile"
-    assert out["/etc/bar"] == "modified_packaged_file"
-    # Package-manager config paths are excluded.
-    assert "/etc/dnf/dnf.conf" not in out
-
-
-def test_specific_paths_for_hints_differs_between_backends():
-    # We can exercise this without instantiating DpkgBackend (which reads dpkg status)
-    class Dummy(platform.PackageBackend):
-        name = "dummy"
-        pkg_config_prefixes = ("/etc/apt/",)
-
-    d = Dummy()
-    assert d.is_pkg_config_path("/etc/apt/sources.list")
-    assert not d.is_pkg_config_path("/etc/ssh/sshd_config")
-
-    r = platform.RpmBackend()
-    paths = set(r.specific_paths_for_hints({"nginx"}))
-    assert "/etc/sysconfig/nginx" in paths
-    assert "/etc/sysconfig/nginx.conf" in paths

tests/test_platform_backends.py

@@ -1,72 +0,0 @@
-from __future__ import annotations
-
-from collections import defaultdict
-
-
-def test_dpkg_backend_modified_paths_marks_conffiles_and_packaged(monkeypatch):
-    from enroll.platform import DpkgBackend
-
-    # Provide fake conffiles md5sums.
-    monkeypatch.setattr(
-        "enroll.debian.parse_status_conffiles",
-        lambda: {"mypkg": {"/etc/mypkg.conf": "aaaa"}},
-    )
-    monkeypatch.setattr(
-        "enroll.debian.read_pkg_md5sums",
-        lambda _pkg: {"etc/other.conf": "bbbb"},
-    )
-
-    # Fake file_md5 values (avoids touching /etc).
-    def fake_md5(p: str):
-        if p == "/etc/mypkg.conf":
-            return "zzzz"  # differs from conffile baseline
-        if p == "/etc/other.conf":
-            return "cccc"  # differs from packaged baseline
-        if p == "/etc/apt/sources.list":
-            return "bbbb"
-        return None
-
-    monkeypatch.setattr("enroll.platform.file_md5", fake_md5)
-
-    b = DpkgBackend()
-    out = b.modified_paths(
-        "mypkg",
-        ["/etc/mypkg.conf", "/etc/other.conf", "/etc/apt/sources.list"],
-    )
-
-    assert out["/etc/mypkg.conf"] == "modified_conffile"
-    assert out["/etc/other.conf"] == "modified_packaged_file"
-    # pkg config paths (like /etc/apt/...) are excluded.
-    assert "/etc/apt/sources.list" not in out
-
-
-def test_rpm_backend_modified_paths_caches_queries(monkeypatch):
-    from enroll.platform import RpmBackend
-
-    calls = defaultdict(int)
-
-    def fake_modified(_pkg=None):
-        calls["modified"] += 1
-        return {"/etc/foo.conf", "/etc/bar.conf"}
-
-    def fake_config(_pkg=None):
-        calls["config"] += 1
-        return {"/etc/foo.conf"}
-
-    monkeypatch.setattr("enroll.rpm.rpm_modified_files", fake_modified)
-    monkeypatch.setattr("enroll.rpm.rpm_config_files", fake_config)
-
-    b = RpmBackend()
-    etc = ["/etc/foo.conf", "/etc/bar.conf", "/etc/baz.conf"]
-
-    out1 = b.modified_paths("ignored", etc)
-    out2 = b.modified_paths("ignored", etc)
-
-    assert out1 == out2
-    assert out1["/etc/foo.conf"] == "modified_conffile"
-    assert out1["/etc/bar.conf"] == "modified_packaged_file"
-    assert "/etc/baz.conf" not in out1
-
-    # Caches should mean we only queried rpm once.
-    assert calls["modified"] == 1
-    assert calls["config"] == 1

tests/test_remote.py

@@ -1,567 +0,0 @@
-from __future__ import annotations
-
-import io
-import tarfile
-from pathlib import Path
-
-import pytest
-
-
-def _make_tgz_bytes(files: dict[str, bytes]) -> bytes:
-    bio = io.BytesIO()
-    with tarfile.open(fileobj=bio, mode="w:gz") as tf:
-        for name, content in files.items():
-            ti = tarfile.TarInfo(name=name)
-            ti.size = len(content)
-            tf.addfile(ti, io.BytesIO(content))
-    return bio.getvalue()
-
-
-def test_safe_extract_tar_rejects_path_traversal(tmp_path: Path):
-    from enroll.remote import _safe_extract_tar
-
-    # Build an unsafe tar with ../ traversal
-    bio = io.BytesIO()
-    with tarfile.open(fileobj=bio, mode="w:gz") as tf:
-        ti = tarfile.TarInfo(name="../evil")
-        ti.size = 1
-        tf.addfile(ti, io.BytesIO(b"x"))
-
-    bio.seek(0)
-    with tarfile.open(fileobj=bio, mode="r:gz") as tf:
-        with pytest.raises(RuntimeError, match="Unsafe tar member path"):
-            _safe_extract_tar(tf, tmp_path)
-
-
-def test_safe_extract_tar_rejects_symlinks(tmp_path: Path):
-    from enroll.remote import _safe_extract_tar
-
-    bio = io.BytesIO()
-    with tarfile.open(fileobj=bio, mode="w:gz") as tf:
-        ti = tarfile.TarInfo(name="link")
-        ti.type = tarfile.SYMTYPE
-        ti.linkname = "/etc/passwd"
-        tf.addfile(ti)
-
-    bio.seek(0)
-    with tarfile.open(fileobj=bio, mode="r:gz") as tf:
-        with pytest.raises(RuntimeError, match="Refusing to extract"):
-            _safe_extract_tar(tf, tmp_path)
-
-
-def test_remote_harvest_happy_path(tmp_path: Path, monkeypatch):
-    import sys
-
-    import enroll.remote as r
-
-    # Avoid building a real zipapp; just create a file.
-    def fake_build(_td: Path) -> Path:
-        p = _td / "enroll.pyz"
-        p.write_bytes(b"PYZ")
-        return p
-
-    monkeypatch.setattr(r, "_build_enroll_pyz", fake_build)
-
-    # Prepare a tiny harvest bundle tar stream from the "remote".
-    tgz = _make_tgz_bytes({"state.json": b'{"ok": true}\n'})
-
-    # Track each SSH exec_command call with whether a PTY was requested.
-    calls: list[tuple[str, bool]] = []
-
-    class _Chan:
-        def __init__(self, out: bytes = b"", err: bytes = b"", rc: int = 0):
-            self._out = out
-            self._err = err
-            self._out_i = 0
-            self._err_i = 0
-            self._rc = rc
-            self._closed = False
-
-        def recv_ready(self) -> bool:
-            return (not self._closed) and self._out_i < len(self._out)
-
-        def recv(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._out[self._out_i : self._out_i + n]
-            self._out_i += len(chunk)
-            return chunk
-
-        def recv_stderr_ready(self) -> bool:
-            return (not self._closed) and self._err_i < len(self._err)
-
-        def recv_stderr(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._err[self._err_i : self._err_i + n]
-            self._err_i += len(chunk)
-            return chunk
-
-        def exit_status_ready(self) -> bool:
-            return self._closed or (
-                self._out_i >= len(self._out) and self._err_i >= len(self._err)
-            )
-
-        def recv_exit_status(self) -> int:
-            return self._rc
-
-        def shutdown_write(self) -> None:
-            return
-
-        def close(self) -> None:
-            self._closed = True
-
-    class _Stdout:
-        def __init__(self, payload: bytes = b"", rc: int = 0, err: bytes = b""):
-            self._bio = io.BytesIO(payload)
-            # _ssh_run reads stdout/stderr via the underlying channel.
-            self.channel = _Chan(out=payload, err=err, rc=rc)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _Stderr:
-        def __init__(self, payload: bytes = b""):
-            self._bio = io.BytesIO(payload)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _SFTP:
-        def __init__(self):
-            self.put_calls: list[tuple[str, str]] = []
-
-        def put(self, local: str, remote: str) -> None:
-            self.put_calls.append((local, remote))
-
-        def close(self) -> None:
-            return
-
-    class FakeSSH:
-        def __init__(self):
-            self._sftp = _SFTP()
-
-        def load_system_host_keys(self):
-            return
-
-        def set_missing_host_key_policy(self, _policy):
-            return
-
-        def connect(self, **kwargs):
-            # Accept any connect parameters.
-            return
-
-        def open_sftp(self):
-            return self._sftp
-
-        def exec_command(self, cmd: str, *, get_pty: bool = False, **_kwargs):
-            calls.append((cmd, bool(get_pty)))
-            # The tar stream uses exec_command directly.
-            if cmd.startswith("tar -cz -C"):
-                return (None, _Stdout(tgz, rc=0), _Stderr(b""))
-
-            # _ssh_run path: id -un, mktemp -d, chmod, sudo harvest, sudo chown, rm -rf
-            if cmd == "id -un":
-                return (None, _Stdout(b"alice\n"), _Stderr())
-            if cmd == "mktemp -d":
-                return (None, _Stdout(b"/tmp/enroll-remote-123\n"), _Stderr())
-            if cmd.startswith("chmod 700"):
-                return (None, _Stdout(b""), _Stderr())
-            if cmd.startswith("sudo -n") and " harvest " in cmd:
-                if not get_pty:
-                    msg = b"sudo: sorry, you must have a tty to run sudo\n"
-                    return (None, _Stdout(b"", rc=1, err=msg), _Stderr(msg))
-                return (None, _Stdout(b"", rc=0), _Stderr(b""))
-            if cmd.startswith("sudo -S") and " harvest " in cmd:
-                return (None, _Stdout(b""), _Stderr())
-            if " harvest " in cmd:
-                return (None, _Stdout(b""), _Stderr())
-            if cmd.startswith("sudo -n") and " chown -R" in cmd:
-                if not get_pty:
-                    msg = b"sudo: sorry, you must have a tty to run sudo\n"
-                    return (None, _Stdout(b"", rc=1, err=msg), _Stderr(msg))
-                return (None, _Stdout(b"", rc=0), _Stderr(b""))
-            if cmd.startswith("rm -rf"):
-                return (None, _Stdout(b""), _Stderr())
-
-            return (None, _Stdout(b""), _Stderr(b"unknown"))
-
-        def close(self):
-            return
-
-    import types
-
-    class RejectPolicy:
-        pass
-
-    FakeParamiko = types.SimpleNamespace(SSHClient=FakeSSH, RejectPolicy=RejectPolicy)
-
-    # Provide a fake paramiko module.
-    monkeypatch.setitem(sys.modules, "paramiko", FakeParamiko)
-
-    out_dir = tmp_path / "out"
-    state_path = r.remote_harvest(
-        ask_become_pass=False,
-        local_out_dir=out_dir,
-        remote_host="example.com",
-        remote_port=2222,
-        remote_user=None,
-        include_paths=["/etc/nginx/nginx.conf"],
-        exclude_paths=["/etc/shadow"],
-        dangerous=True,
-        no_sudo=False,
-    )
-
-    assert state_path == out_dir / "state.json"
-    assert state_path.exists()
-    assert b"ok" in state_path.read_bytes()
-
-    # Ensure we attempted remote harvest with sudo and passed include/exclude and dangerous.
-    joined = "\n".join([c for c, _pty in calls])
-    assert "sudo" in joined
-    assert "--dangerous" in joined
-    assert "--include-path" in joined
-    assert "--exclude-path" in joined
-
-    # Ensure we fall back to PTY only when sudo reports it is required.
-    assert any(c == "id -un" and pty is False for c, pty in calls)
-
-    sudo_harvest = [
-        (c, pty) for c, pty in calls if c.startswith("sudo -n") and " harvest " in c
-    ]
-    assert any(pty is False for _c, pty in sudo_harvest)
-    assert any(pty is True for _c, pty in sudo_harvest)
-
-    sudo_chown = [
-        (c, pty) for c, pty in calls if c.startswith("sudo -n") and " chown -R" in c
-    ]
-    assert any(pty is False for _c, pty in sudo_chown)
-    assert any(pty is True for _c, pty in sudo_chown)
-
-    assert any(c.startswith("tar -cz -C") and pty is False for c, pty in calls)
-
-
-def test_remote_harvest_no_sudo_does_not_request_pty_or_chown(
-    tmp_path: Path, monkeypatch
-):
-    """When --no-sudo is used we should not request a PTY nor run sudo chown."""
-    import sys
-
-    import enroll.remote as r
-
-    monkeypatch.setattr(
-        r,
-        "_build_enroll_pyz",
-        lambda td: (Path(td) / "enroll.pyz").write_bytes(b"PYZ")
-        or (Path(td) / "enroll.pyz"),
-    )
-
-    tgz = _make_tgz_bytes({"state.json": b"{}"})
-    calls: list[tuple[str, bool]] = []
-
-    class _Chan:
-        def __init__(self, out: bytes = b"", err: bytes = b"", rc: int = 0):
-            self._out = out
-            self._err = err
-            self._out_i = 0
-            self._err_i = 0
-            self._rc = rc
-            self._closed = False
-
-        def recv_ready(self) -> bool:
-            return (not self._closed) and self._out_i < len(self._out)
-
-        def recv(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._out[self._out_i : self._out_i + n]
-            self._out_i += len(chunk)
-            return chunk
-
-        def recv_stderr_ready(self) -> bool:
-            return (not self._closed) and self._err_i < len(self._err)
-
-        def recv_stderr(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._err[self._err_i : self._err_i + n]
-            self._err_i += len(chunk)
-            return chunk
-
-        def exit_status_ready(self) -> bool:
-            return self._closed or (
-                self._out_i >= len(self._out) and self._err_i >= len(self._err)
-            )
-
-        def recv_exit_status(self) -> int:
-            return self._rc
-
-        def shutdown_write(self) -> None:
-            return
-
-        def close(self) -> None:
-            self._closed = True
-
-    class _Stdout:
-        def __init__(self, payload: bytes = b"", rc: int = 0, err: bytes = b""):
-            self._bio = io.BytesIO(payload)
-            # _ssh_run reads stdout/stderr via the underlying channel.
-            self.channel = _Chan(out=payload, err=err, rc=rc)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _Stderr:
-        def __init__(self, payload: bytes = b""):
-            self._bio = io.BytesIO(payload)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _SFTP:
-        def put(self, _local: str, _remote: str) -> None:
-            return
-
-        def close(self) -> None:
-            return
-
-    class FakeSSH:
-        def __init__(self):
-            self._sftp = _SFTP()
-
-        def load_system_host_keys(self):
-            return
-
-        def set_missing_host_key_policy(self, _policy):
-            return
-
-        def connect(self, **_kwargs):
-            return
-
-        def open_sftp(self):
-            return self._sftp
-
-        def exec_command(self, cmd: str, *, get_pty: bool = False, **_kwargs):
-            calls.append((cmd, bool(get_pty)))
-            if cmd == "mktemp -d":
-                return (None, _Stdout(b"/tmp/enroll-remote-456\n"), _Stderr())
-            if cmd.startswith("chmod 700"):
-                return (None, _Stdout(b""), _Stderr())
-            if cmd.startswith("tar -cz -C"):
-                return (None, _Stdout(tgz, rc=0), _Stderr())
-            if " harvest " in cmd:
-                return (None, _Stdout(b""), _Stderr())
-            if cmd.startswith("rm -rf"):
-                return (None, _Stdout(b""), _Stderr())
-            return (None, _Stdout(b""), _Stderr())
-
-        def close(self):
-            return
-
-    import types
-
-    class RejectPolicy:
-        pass
-
-    monkeypatch.setitem(
-        sys.modules,
-        "paramiko",
-        types.SimpleNamespace(SSHClient=FakeSSH, RejectPolicy=RejectPolicy),
-    )
-
-    out_dir = tmp_path / "out"
-    r.remote_harvest(
-        ask_become_pass=False,
-        local_out_dir=out_dir,
-        remote_host="example.com",
-        remote_user="alice",
-        no_sudo=True,
-    )
-
-    joined = "\n".join([c for c, _pty in calls])
-    assert "sudo" not in joined
-    assert "sudo chown" not in joined
-    assert any(" harvest " in c and pty is False for c, pty in calls)
-
-
-def test_remote_harvest_sudo_password_retry_uses_sudo_s_and_writes_password(
-    tmp_path: Path, monkeypatch
-):
-    """If sudo requires a password, we should fall back from -n to -S and feed stdin."""
-    import sys
-    import types
-
-    import enroll.remote as r
-
-    # Avoid building a real zipapp; just create a file.
-    monkeypatch.setattr(
-        r,
-        "_build_enroll_pyz",
-        lambda td: (Path(td) / "enroll.pyz").write_bytes(b"PYZ")
-        or (Path(td) / "enroll.pyz"),
-    )
-
-    tgz = _make_tgz_bytes({"state.json": b'{"ok": true}\n'})
-    calls: list[tuple[str, bool]] = []
-    stdin_by_cmd: dict[str, list[str]] = {}
-
-    class _Chan:
-        def __init__(self, out: bytes = b"", err: bytes = b"", rc: int = 0):
-            self._out = out
-            self._err = err
-            self._out_i = 0
-            self._err_i = 0
-            self._rc = rc
-            self._closed = False
-
-        def recv_ready(self) -> bool:
-            return (not self._closed) and self._out_i < len(self._out)
-
-        def recv(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._out[self._out_i : self._out_i + n]
-            self._out_i += len(chunk)
-            return chunk
-
-        def recv_stderr_ready(self) -> bool:
-            return (not self._closed) and self._err_i < len(self._err)
-
-        def recv_stderr(self, n: int) -> bytes:
-            if self._closed:
-                return b""
-            chunk = self._err[self._err_i : self._err_i + n]
-            self._err_i += len(chunk)
-            return chunk
-
-        def exit_status_ready(self) -> bool:
-            return self._closed or (
-                self._out_i >= len(self._out) and self._err_i >= len(self._err)
-            )
-
-        def recv_exit_status(self) -> int:
-            return self._rc
-
-        def shutdown_write(self) -> None:
-            return
-
-        def close(self) -> None:
-            self._closed = True
-
-    class _Stdout:
-        def __init__(self, payload: bytes = b"", rc: int = 0, err: bytes = b""):
-            self._bio = io.BytesIO(payload)
-            # _ssh_run reads stdout/stderr via the underlying channel.
-            self.channel = _Chan(out=payload, err=err, rc=rc)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _Stderr:
-        def __init__(self, payload: bytes = b""):
-            self._bio = io.BytesIO(payload)
-
-        def read(self, n: int = -1) -> bytes:
-            return self._bio.read(n)
-
-    class _Stdin:
-        def __init__(self, cmd: str):
-            self._cmd = cmd
-            stdin_by_cmd.setdefault(cmd, [])
-
-        def write(self, s: str) -> None:
-            stdin_by_cmd[self._cmd].append(s)
-
-        def flush(self) -> None:
-            return
-
-    class _SFTP:
-        def put(self, _local: str, _remote: str) -> None:
-            return
-
-        def close(self) -> None:
-            return
-
-    class FakeSSH:
-        def __init__(self):
-            self._sftp = _SFTP()
-
-        def load_system_host_keys(self):
-            return
-
-        def set_missing_host_key_policy(self, _policy):
-            return
-
-        def connect(self, **_kwargs):
-            return
-
-        def open_sftp(self):
-            return self._sftp
-
-        def exec_command(self, cmd: str, *, get_pty: bool = False, **_kwargs):
-            calls.append((cmd, bool(get_pty)))
-
-            # Tar stream
-            if cmd.startswith("tar -cz -C"):
-                return (_Stdin(cmd), _Stdout(tgz, rc=0), _Stderr(b""))
-
-            if cmd == "mktemp -d":
-                return (_Stdin(cmd), _Stdout(b"/tmp/enroll-remote-789\n"), _Stderr())
-            if cmd.startswith("chmod 700"):
-                return (_Stdin(cmd), _Stdout(b""), _Stderr())
-
-            # First attempt: sudo -n fails, prompting is not allowed.
-            if cmd.startswith("sudo -n") and " harvest " in cmd:
-                return (
-                    _Stdin(cmd),
-                    _Stdout(b"", rc=1, err=b"sudo: a password is required\n"),
-                    _Stderr(b"sudo: a password is required\n"),
-                )
-
-            # Retry: sudo -S succeeds and should have been fed the password via stdin.
-            if cmd.startswith("sudo -S") and " harvest " in cmd:
-                return (_Stdin(cmd), _Stdout(b"", rc=0), _Stderr(b""))
-
-            # chown succeeds passwordlessly (e.g., sudo timestamp is warm).
-            if cmd.startswith("sudo -n") and " chown -R" in cmd:
-                return (_Stdin(cmd), _Stdout(b"", rc=0), _Stderr(b""))
-
-            if cmd.startswith("rm -rf"):
-                return (_Stdin(cmd), _Stdout(b"", rc=0), _Stderr(b""))
-
-            # Fallback for unexpected commands.
-            return (_Stdin(cmd), _Stdout(b"", rc=0), _Stderr(b""))
-
-        def close(self):
-            return
-
-    class RejectPolicy:
-        pass
-
-    monkeypatch.setitem(
-        sys.modules,
-        "paramiko",
-        types.SimpleNamespace(SSHClient=FakeSSH, RejectPolicy=RejectPolicy),
-    )
-
-    out_dir = tmp_path / "out"
-    state_path = r.remote_harvest(
-        ask_become_pass=True,
-        getpass_fn=lambda _prompt="": "s3cr3t",
-        local_out_dir=out_dir,
-        remote_host="example.com",
-        remote_user="alice",
-        no_sudo=False,
-    )
-
-    assert state_path.exists()
-    assert b"ok" in state_path.read_bytes()
-
-    # Ensure we attempted with sudo -n first, then sudo -S.
-    sudo_n = [c for c, _pty in calls if c.startswith("sudo -n") and " harvest " in c]
-    sudo_s = [c for c, _pty in calls if c.startswith("sudo -S") and " harvest " in c]
-    assert len(sudo_n) == 1
-    assert len(sudo_s) == 1
-
-    # Ensure the password was written to stdin for the -S invocation.
-    assert stdin_by_cmd.get(sudo_s[0]) == ["s3cr3t\n"]

tests/test_rpm.py

@@ -1,178 +0,0 @@
-from __future__ import annotations
-
-import enroll.rpm as rpm
-
-
-def test_rpm_owner_returns_none_when_unowned(monkeypatch):
-    monkeypatch.setattr(
-        rpm,
-        "_run",
-        lambda cmd, allow_fail=False, merge_err=False: (
-            1,
-            "file /etc/x is not owned by any package\n",
-        ),
-    )
-    assert rpm.rpm_owner("/etc/x") is None
-
-
-def test_rpm_owner_parses_name(monkeypatch):
-    monkeypatch.setattr(
-        rpm, "_run", lambda cmd, allow_fail=False, merge_err=False: (0, "bash\n")
-    )
-    assert rpm.rpm_owner("/bin/bash") == "bash"
-
-
-def test_strip_arch_strips_known_arches():
-    assert rpm._strip_arch("vim-enhanced.x86_64") == "vim-enhanced"
-    assert rpm._strip_arch("foo.noarch") == "foo"
-    assert rpm._strip_arch("weird.token") == "weird.token"
-
-
-def test_list_manual_packages_prefers_dnf_repoquery(monkeypatch):
-    monkeypatch.setattr(
-        rpm.shutil, "which", lambda exe: "/usr/bin/dnf" if exe == "dnf" else None
-    )
-
-    def fake_run(cmd, allow_fail=False, merge_err=False):
-        # First repoquery form returns usable output.
-        if cmd[:3] == ["dnf", "-q", "repoquery"]:
-            return 0, "vim-enhanced.x86_64\nhtop\nvim-enhanced.x86_64\n"
-        raise AssertionError(f"unexpected cmd: {cmd}")
-
-    monkeypatch.setattr(rpm, "_run", fake_run)
-
-    pkgs = rpm.list_manual_packages()
-    assert pkgs == ["htop", "vim-enhanced"]
-
-
-def test_list_manual_packages_falls_back_to_history(monkeypatch):
-    monkeypatch.setattr(
-        rpm.shutil, "which", lambda exe: "/usr/bin/dnf" if exe == "dnf" else None
-    )
-
-    def fake_run(cmd, allow_fail=False, merge_err=False):
-        # repoquery fails
-        if cmd[:3] == ["dnf", "-q", "repoquery"]:
-            return 1, ""
-        if cmd[:3] == ["dnf", "-q", "history"]:
-            return (
-                0,
-                "Installed Packages\nvim-enhanced.x86_64\nLast metadata expiration check: 0:01:00 ago\n",
-            )
-        raise AssertionError(f"unexpected cmd: {cmd}")
-
-    monkeypatch.setattr(rpm, "_run", fake_run)
-
-    pkgs = rpm.list_manual_packages()
-    assert pkgs == ["vim-enhanced"]
-
-
-def test_build_rpm_etc_index_uses_fallback_when_rpm_output_mismatches(monkeypatch):
-    # Two files in /etc, one owned, one unowned.
-    monkeypatch.setattr(
-        rpm, "_walk_etc_files", lambda: ["/etc/owned.conf", "/etc/unowned.conf"]
-    )
-
-    # Simulate chunk query producing unexpected extra line (mismatch) -> triggers per-file fallback.
-    monkeypatch.setattr(
-        rpm,
-        "_run",
-        lambda cmd, allow_fail=False, merge_err=False: (0, "ownedpkg\nEXTRA\nTHIRD\n"),
-    )
-    monkeypatch.setattr(
-        rpm, "rpm_owner", lambda p: "ownedpkg" if p == "/etc/owned.conf" else None
-    )
-
-    owned, owner_map, topdir_to_pkgs, pkg_to_etc = rpm.build_rpm_etc_index()
-
-    assert owned == {"/etc/owned.conf"}
-    assert owner_map["/etc/owned.conf"] == "ownedpkg"
-    assert "owned.conf" in topdir_to_pkgs
-    assert pkg_to_etc["ownedpkg"] == ["/etc/owned.conf"]
-
-
-def test_build_rpm_etc_index_parses_chunk_output(monkeypatch):
-    monkeypatch.setattr(
-        rpm, "_walk_etc_files", lambda: ["/etc/ssh/sshd_config", "/etc/notowned"]
-    )
-
-    def fake_run(cmd, allow_fail=False, merge_err=False):
-        # One output line per input path.
-        return 0, "openssh-server\nfile /etc/notowned is not owned by any package\n"
-
-    monkeypatch.setattr(rpm, "_run", fake_run)
-
-    owned, owner_map, topdir_to_pkgs, pkg_to_etc = rpm.build_rpm_etc_index()
-
-    assert "/etc/ssh/sshd_config" in owned
-    assert "/etc/notowned" not in owned
-    assert owner_map["/etc/ssh/sshd_config"] == "openssh-server"
-    assert "ssh" in topdir_to_pkgs
-    assert "openssh-server" in topdir_to_pkgs["ssh"]
-    assert pkg_to_etc["openssh-server"] == ["/etc/ssh/sshd_config"]
-
-
-def test_rpm_config_files_and_modified_files_parsing(monkeypatch):
-    monkeypatch.setattr(
-        rpm,
-        "_run",
-        lambda cmd, allow_fail=False, merge_err=False: (
-            0,
-            "/etc/foo.conf\n/usr/bin/tool\n",
-        ),
-    )
-    assert rpm.rpm_config_files("mypkg") == {"/etc/foo.conf", "/usr/bin/tool"}
-
-    # rpm -V returns only changed/missing files
-    out = "S.5....T.  c /etc/foo.conf\nmissing   /etc/bar\n"
-    monkeypatch.setattr(
-        rpm, "_run", lambda cmd, allow_fail=False, merge_err=False: (1, out)
-    )
-    assert rpm.rpm_modified_files("mypkg") == {"/etc/foo.conf", "/etc/bar"}
-
-
-def test_list_manual_packages_uses_yum_fallback(monkeypatch):
-    # No dnf, yum present.
-    monkeypatch.setattr(
-        rpm.shutil, "which", lambda exe: "/usr/bin/yum" if exe == "yum" else None
-    )
-
-    def fake_run(cmd, allow_fail=False, merge_err=False):
-        assert cmd[:3] == ["yum", "-q", "history"]
-        return 0, "Installed Packages\nvim-enhanced.x86_64\nhtop\n"
-
-    monkeypatch.setattr(rpm, "_run", fake_run)
-
-    assert rpm.list_manual_packages() == ["htop", "vim-enhanced"]
-
-
-def test_list_installed_packages_parses_epoch_and_sorts(monkeypatch):
-    out = (
-        "bash\t0\t5.2.26\t1.el9\tx86_64\n"
-        "bash\t1\t5.2.26\t1.el9\taarch64\n"
-        "coreutils\t(none)\t9.1\t2.el9\tx86_64\n"
-    )
-    monkeypatch.setattr(
-        rpm, "_run", lambda cmd, allow_fail=False, merge_err=False: (0, out)
-    )
-    pkgs = rpm.list_installed_packages()
-    assert pkgs["bash"][0]["arch"] == "aarch64"  # sorted by arch then version
-    assert pkgs["bash"][0]["version"].startswith("1:")
-    assert pkgs["coreutils"][0]["version"] == "9.1-2.el9"
-
-
-def test_rpm_config_files_returns_empty_on_failure(monkeypatch):
-    monkeypatch.setattr(
-        rpm, "_run", lambda cmd, allow_fail=False, merge_err=False: (1, "")
-    )
-    assert rpm.rpm_config_files("missing") == set()
-
-
-def test_rpm_owner_strips_epoch_prefix_when_present(monkeypatch):
-    # Defensive: rpm output might include epoch-like token.
-    monkeypatch.setattr(
-        rpm,
-        "_run",
-        lambda cmd, allow_fail=False, merge_err=False: (0, "1:bash\n"),
-    )
-    assert rpm.rpm_owner("/bin/bash") == "bash"

tests/test_rpm_run.py

@@ -1,31 +0,0 @@
-from __future__ import annotations
-
-import types
-
-import pytest
-
-import enroll.rpm as rpm
-
-
-def test_run_raises_on_nonzero_returncode_when_not_allow_fail(monkeypatch):
-    def fake_run(cmd, check, text, stdout, stderr):
-        return types.SimpleNamespace(returncode=1, stdout="OUT", stderr="ERR")
-
-    monkeypatch.setattr(rpm.subprocess, "run", fake_run)
-    with pytest.raises(RuntimeError) as e:
-        rpm._run(["rpm", "-q"])  # type: ignore[attr-defined]
-    assert "Command failed" in str(e.value)
-    assert "ERR" in str(e.value)
-    assert "OUT" in str(e.value)
-
-
-def test_run_merge_err_includes_stderr_in_stdout(monkeypatch):
-    def fake_run(cmd, check, text, stdout, stderr):
-        # When merge_err is True, stderr is redirected to STDOUT, so we only
-        # rely on stdout in our wrapper.
-        return types.SimpleNamespace(returncode=0, stdout="COMBINED", stderr=None)
-
-    monkeypatch.setattr(rpm.subprocess, "run", fake_run)
-    rc, out = rpm._run(["rpm", "-q"], merge_err=True)
-    assert rc == 0
-    assert out == "COMBINED"

tests/test_systemd.py

@@ -1,121 +0,0 @@
-from __future__ import annotations
-
-import pytest
-
-
-def test_list_enabled_services_and_timers_filters_templates(monkeypatch):
-    import enroll.systemd as s
-
-    def fake_run(cmd: list[str]) -> str:
-        if "--type=service" in cmd:
-            return "\n".join(
-                [
-                    "nginx.service enabled",
-                    "getty@.service enabled",  # template
-                    "foo@bar.service enabled",  # instance units are included
-                    "ssh.service enabled",
-                ]
-            )
-        if "--type=timer" in cmd:
-            return "\n".join(
-                [
-                    "apt-daily.timer enabled",
-                    "foo@.timer enabled",  # template
-                ]
-            )
-        raise AssertionError("unexpected")
-
-    monkeypatch.setattr(s, "_run", fake_run)
-    assert s.list_enabled_services() == [
-        "foo@bar.service",
-        "nginx.service",
-        "ssh.service",
-    ]
-    assert s.list_enabled_timers() == ["apt-daily.timer"]
-
-
-def test_get_unit_info_parses_fields(monkeypatch):
-    import enroll.systemd as s
-
-    class P:
-        def __init__(self, rc: int, out: str, err: str = ""):
-            self.returncode = rc
-            self.stdout = out
-            self.stderr = err
-
-    def fake_run(cmd, check, text, capture_output):
-        assert cmd[0:2] == ["systemctl", "show"]
-        return P(
-            0,
-            "\n".join(
-                [
-                    "FragmentPath=/lib/systemd/system/nginx.service",
-                    "DropInPaths=/etc/systemd/system/nginx.service.d/override.conf /etc/systemd/system/nginx.service.d/extra.conf",
-                    "EnvironmentFiles=-/etc/default/nginx /etc/nginx/env",
-                    "ExecStart={ path=/usr/sbin/nginx ; argv[]=/usr/sbin/nginx -g daemon off; }",
-                    "ActiveState=active",
-                    "SubState=running",
-                    "UnitFileState=enabled",
-                    "ConditionResult=yes",
-                ]
-            ),
-        )
-
-    monkeypatch.setattr(s.subprocess, "run", fake_run)
-    ui = s.get_unit_info("nginx.service")
-    assert ui.fragment_path == "/lib/systemd/system/nginx.service"
-    assert "/etc/default/nginx" in ui.env_files
-    assert "/etc/nginx/env" in ui.env_files
-    assert "/usr/sbin/nginx" in ui.exec_paths
-    assert ui.active_state == "active"
-
-
-def test_get_unit_info_raises_unit_query_error(monkeypatch):
-    import enroll.systemd as s
-
-    class P:
-        def __init__(self, rc: int, out: str, err: str):
-            self.returncode = rc
-            self.stdout = out
-            self.stderr = err
-
-    def fake_run(cmd, check, text, capture_output):
-        return P(1, "", "no such unit")
-
-    monkeypatch.setattr(s.subprocess, "run", fake_run)
-    with pytest.raises(s.UnitQueryError) as ei:
-        s.get_unit_info("missing.service")
-    assert "missing.service" in str(ei.value)
-    assert ei.value.unit == "missing.service"
-
-
-def test_get_timer_info_parses_fields(monkeypatch):
-    import enroll.systemd as s
-
-    class P:
-        def __init__(self, rc: int, out: str, err: str = ""):
-            self.returncode = rc
-            self.stdout = out
-            self.stderr = err
-
-    def fake_run(cmd, text, capture_output):
-        return P(
-            0,
-            "\n".join(
-                [
-                    "FragmentPath=/lib/systemd/system/apt-daily.timer",
-                    "DropInPaths=",
-                    "EnvironmentFiles=-/etc/default/apt",
-                    "Unit=apt-daily.service",
-                    "ActiveState=active",
-                    "SubState=waiting",
-                    "UnitFileState=enabled",
-                    "ConditionResult=yes",
-                ]
-            ),
-        )
-
-    monkeypatch.setattr(s.subprocess, "run", fake_run)
-    ti = s.get_timer_info("apt-daily.timer")
-    assert ti.trigger_unit == "apt-daily.service"
-    assert "/etc/default/apt" in ti.env_files

tests/test_validate.py

@@ -1,182 +0,0 @@
-from __future__ import annotations
-
-import json
-import sys
-from pathlib import Path
-
-import pytest
-
-import enroll.cli as cli
-from enroll.validate import validate_harvest
-
-
-def _base_state() -> dict:
-    return {
-        "enroll": {"version": "0.0.test", "harvest_time": 0},
-        "host": {
-            "hostname": "testhost",
-            "os": "unknown",
-            "pkg_backend": "dpkg",
-            "os_release": {},
-        },
-        "inventory": {"packages": {}},
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [],
-                "managed_dirs": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [],
-            "packages": [],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_dirs": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_dirs": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_dirs": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_dirs": [],
-                "managed_files": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "include_patterns": [],
-                "exclude_patterns": [],
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-                "excluded": [],
-                "notes": [],
-            },
-        },
-    }
-
-
-def _write_bundle(tmp_path: Path, state: dict) -> Path:
-    bundle = tmp_path / "bundle"
-    bundle.mkdir(parents=True)
-    (bundle / "artifacts").mkdir()
-    (bundle / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-    return bundle
-
-
-def test_validate_ok_bundle(tmp_path: Path):
-    state = _base_state()
-    state["roles"]["etc_custom"]["managed_files"].append(
-        {
-            "path": "/etc/hosts",
-            "src_rel": "etc/hosts",
-            "owner": "root",
-            "group": "root",
-            "mode": "0644",
-            "reason": "custom_specific_path",
-        }
-    )
-
-    bundle = _write_bundle(tmp_path, state)
-    art = bundle / "artifacts" / "etc_custom" / "etc" / "hosts"
-    art.parent.mkdir(parents=True, exist_ok=True)
-    art.write_text("127.0.0.1 localhost\n", encoding="utf-8")
-
-    res = validate_harvest(str(bundle))
-    assert res.ok
-    assert res.errors == []
-
-
-def test_validate_missing_artifact_is_error(tmp_path: Path):
-    state = _base_state()
-    state["roles"]["etc_custom"]["managed_files"].append(
-        {
-            "path": "/etc/hosts",
-            "src_rel": "etc/hosts",
-            "owner": "root",
-            "group": "root",
-            "mode": "0644",
-            "reason": "custom_specific_path",
-        }
-    )
-    bundle = _write_bundle(tmp_path, state)
-    res = validate_harvest(str(bundle))
-    assert not res.ok
-    assert any("missing artifact" in e for e in res.errors)
-
-
-def test_validate_schema_error_is_reported(tmp_path: Path):
-    state = _base_state()
-    state["host"]["os"] = "not_a_real_os"
-    bundle = _write_bundle(tmp_path, state)
-    res = validate_harvest(str(bundle))
-    assert not res.ok
-    assert any(e.startswith("schema /host/os") for e in res.errors)
-
-
-def test_cli_validate_exits_1_on_validation_error(monkeypatch, tmp_path: Path):
-    state = _base_state()
-    state["roles"]["etc_custom"]["managed_files"].append(
-        {
-            "path": "/etc/hosts",
-            "src_rel": "etc/hosts",
-            "owner": "root",
-            "group": "root",
-            "mode": "0644",
-            "reason": "custom_specific_path",
-        }
-    )
-    bundle = _write_bundle(tmp_path, state)
-
-    monkeypatch.setattr(sys, "argv", ["enroll", "validate", str(bundle)])
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert e.value.code == 1
-
-
-def test_cli_validate_exits_1_on_validation_warning_with_flag(
-    monkeypatch, tmp_path: Path
-):
-    state = _base_state()
-    state["roles"]["etc_custom"]["managed_files"].append(
-        {
-            "path": "/etc/hosts",
-            "src_rel": "etc/hosts",
-            "owner": "root",
-            "group": "root",
-            "mode": "0644",
-            "reason": "custom_specific_path",
-        }
-    )
-
-    bundle = _write_bundle(tmp_path, state)
-    art = bundle / "artifacts" / "etc_custom" / "etc" / "hosts"
-    art.parent.mkdir(parents=True, exist_ok=True)
-    art.write_text("127.0.0.1 localhost\n", encoding="utf-8")
-
-    art2 = bundle / "artifacts" / "etc_custom" / "etc" / "hosts2"
-    art2.write_text("hello\n", encoding="utf-8")
-
-    monkeypatch.setattr(
-        sys, "argv", ["enroll", "validate", str(bundle), "--fail-on-warnings"]
-    )
-    with pytest.raises(SystemExit) as e:
-        cli.main()
-    assert e.value.code == 1

tests/test_version_extra.py

@@ -1,36 +0,0 @@
-from __future__ import annotations
-
-import sys
-import types
-
-
-def test_get_enroll_version_returns_unknown_when_import_fails(monkeypatch):
-    from enroll.version import get_enroll_version
-
-    # Ensure both the module cache and the parent package attribute are redirected.
-    import importlib
-
-    dummy = types.ModuleType("importlib.metadata")
-    # Missing attributes will cause ImportError when importing names.
-    monkeypatch.setitem(sys.modules, "importlib.metadata", dummy)
-    monkeypatch.setattr(importlib, "metadata", dummy, raising=False)
-
-    assert get_enroll_version() == "unknown"
-
-
-def test_get_enroll_version_uses_packages_distributions(monkeypatch):
-    # Restore the real module for this test.
-    monkeypatch.delitem(sys.modules, "importlib.metadata", raising=False)
-
-    import importlib.metadata
-
-    from enroll.version import get_enroll_version
-
-    monkeypatch.setattr(
-        importlib.metadata,
-        "packages_distributions",
-        lambda: {"enroll": ["enroll-dist"]},
-    )
-    monkeypatch.setattr(importlib.metadata, "version", lambda dist: "9.9.9")
-
-    assert get_enroll_version() == "9.9.9"