.forgejo/workflows/ci.yml

@@ -13,14 +13,9 @@ jobs:
 
       - name: Install system dependencies
         run: |
-          mkdir -m 755 -p /etc/apt/keyrings
-          curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public | gpg --dearmor | sudo tee /etc/apt/keyrings/salt-archive-keyring.pgp > /dev/null
-          curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources | sudo tee /etc/apt/sources.list.d/salt.sources
           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 \
-            puppet hiera \
-            salt-master salt-minion salt-ssh salt-syndic salt-cloud salt-api
+            ansible ansible-lint python3-venv pipx systemctl python3-apt jq python3-jsonschema
 
       - name: Install Poetry
         run: |

CHANGELOG.md

@@ -6,8 +6,7 @@
  * Detect active sysctl parameters and write them to a `/etc/sysctl.d/99-enroll.conf` file
  * Use `no_log` on systemd unit interrogations to suppress potential sensitive output when applying Ansible
  * Support manifesting Puppet code, as well as Ansible!
- * Support manifesting Salt code as well!
- * A lot of under-the-bonnet refactoring to make it easier to extend to cover other config managers in future.
+ * A lot of under-the-bonnet refactoring to make it easier to extend to cover other config managers later e.g Salt
 
 # 0.6.0
 

README.md

@@ -120,7 +120,7 @@ enroll single-shot --remote-host myhost.example.com --remote-user myuser --ssh-k
 ---
 
 ### `enroll manifest`
-Generate configuration-management output from an existing harvest bundle. Ansible remains the default; use `--target puppet` for Puppet output or `--target salt` for Salt output.
+Generate configuration-management output from an existing harvest bundle. Ansible remains the default; use `--target puppet` for Puppet output.
 
 **Inputs**
 - `--harvest /path/to/harvest` (directory)
@@ -129,12 +129,11 @@ Generate configuration-management output from an existing harvest bundle. Ansibl
 **Output**
 - In plaintext Ansible mode: an Ansible repo-like directory structure (roles/playbooks, and inventory in multi-site mode).
 - In plaintext Puppet mode: a Puppet control-repo style layout with `manifests/site.pp` and generated modules under `modules/`. By default, package and service resources are grouped by Debian Section/RPM Group where possible; `--fqdn` or `--no-common-roles` preserves one generated module per Enroll role/snapshot.
-- In plaintext Salt mode: a Salt state tree under `states/`, plus `pillar/` data in `--fqdn` mode. By default, package and service resources are grouped by Debian Section/RPM Group where possible; `--fqdn` or `--no-common-roles` preserves one generated SLS role per Enroll role/snapshot.
 - In `--sops` mode: a single encrypted file `manifest.tar.gz.sops` containing the generated output.
 
 **Common flags**
-- `--target ansible|puppet|salt`: choose the manifest target (`ansible` is the default).
-- `--fqdn <host>`: enables **multi-site** output style for Ansible, emits Puppet Hiera/node output, or emits Salt top/pillar output targeted at that minion ID. Without `--fqdn`, Puppet emits `node default { ... }` and Salt targets `*` in `states/top.sls`.
+- `--target ansible|puppet`: choose the manifest target (`ansible` is the default).
+- `--fqdn <host>`: enables **multi-site** output style for Ansible, or emits a Puppet `node '<host>'` block. Without `--fqdn`, Puppet emits `node default { ... }`.
 - `--no-common-roles`: disables the default grouping of package and systemd-unit roles into Debian Section/RPM Group roles, preserving one generated role per package/unit. `--fqdn` implies this behaviour.
 
 **Role tags**
@@ -461,28 +460,6 @@ sudo puppet apply --modulepath /tmp/enroll-puppet/modules /tmp/enroll-puppet/man
 
 Flatpak, Snap, and live firewall runtime snapshots are listed as notes in the generated Puppet README rather than converted into Puppet resources.
 
-### Salt target
-```bash
-enroll manifest --harvest /tmp/enroll-harvest --out /tmp/enroll-salt --target salt
-```
-
-The Salt target renders native packages, users/groups, managed directories/files/symlinks, basic service state, and the generated sysctl file/apply command when present. Without `--fqdn`, it writes a self-contained state tree under `states/` and targets all minions in `states/top.sls`:
-
-```bash
-cd /tmp/enroll-salt
-sudo salt-call --local --file-root ./states state.apply test=True
-```
-
-With `--fqdn`, it uses Salt's state/pillar split: `states/top.sls` targets the minion ID to reusable generated role SLS files, while `pillar/top.sls` targets the same minion ID to node-specific data under `pillar/nodes/`. Host-specific file artifacts are stored under `states/roles/<role>/files/nodes/<fqdn>/...` and referenced through `salt://` URLs:
-
-```bash
-enroll manifest --harvest /tmp/enroll-harvest --out /tmp/enroll-salt --target salt --fqdn host.example.com
-cd /tmp/enroll-salt
-sudo salt-call --local --file-root ./states --pillar-root ./pillar --id host.example.com state.apply test=True
-```
-
-Re-running Salt `--fqdn` output into the same directory adds or replaces that minion's top/pillar data without deleting other generated minions. Flatpak, Snap, and live firewall runtime snapshots are listed as notes in the generated Salt README rather than converted into Salt states.
-
 ### Manifest with `--sops`
 ```bash
 # Generate encrypted manifest bundle (writes /tmp/enroll-ansible/manifest.tar.gz.sops)

enroll/cli.py

@@ -310,13 +310,13 @@ def _encrypt_harvest_dir_to_sops(
 def _add_common_manifest_args(p: argparse.ArgumentParser) -> None:
     p.add_argument(
         "--target",
-        choices=["ansible", "puppet", "salt"],
+        choices=["ansible", "puppet"],
         default="ansible",
         help="Manifest target to generate (default: ansible).",
     )
     p.add_argument(
         "--fqdn",
-        help="Host FQDN/name for site-mode output (creates target-specific host inventory/data such as Ansible host_vars, Puppet Hiera, or Salt pillar).",
+        help="Host FQDN/name for site-mode output (creates inventory/, inventory/host_vars/, playbooks/).",
     )
     p.add_argument(
         "--no-common-roles",

enroll/manifest.py

@@ -9,7 +9,6 @@ from typing import List, Optional
 
 from .ansible import manifest_from_bundle_dir as manifest_ansible_from_bundle_dir
 from .puppet import manifest_from_bundle_dir as manifest_puppet_from_bundle_dir
-from .salt import manifest_from_bundle_dir as manifest_salt_from_bundle_dir
 from .remote import _safe_extract_tar
 from .sopsutil import (
     decrypt_file_binary_to,
@@ -191,7 +190,7 @@ def manifest(
       - In plain mode: None
     """
     target = (target or "ansible").strip().lower()
-    if target not in {"ansible", "puppet", "salt"}:
+    if target not in {"ansible", "puppet"}:
         raise ValueError(f"unsupported manifest target: {target!r}")
 
     sops_mode = bool(sops_fingerprints)
@@ -211,13 +210,6 @@ def manifest(
                     fqdn=fqdn,
                     no_common_roles=no_common_roles,
                 )
-            elif target == "salt":
-                manifest_salt_from_bundle_dir(
-                    resolved_bundle_dir,
-                    out,
-                    fqdn=fqdn,
-                    no_common_roles=no_common_roles,
-                )
             else:
                 manifest_ansible_from_bundle_dir(
                     resolved_bundle_dir,
@@ -246,13 +238,6 @@ def manifest(
                 fqdn=fqdn,
                 no_common_roles=no_common_roles,
             )
-        elif target == "salt":
-            manifest_salt_from_bundle_dir(
-                resolved_bundle_dir,
-                str(tmp_out),
-                fqdn=fqdn,
-                no_common_roles=no_common_roles,
-            )
         else:
             manifest_ansible_from_bundle_dir(
                 resolved_bundle_dir,

enroll/salt.py

@@ -1,972 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import json
-import re
-import shutil
-from pathlib import Path
-from typing import Any, Dict, List, Optional
-
-import yaml
-
-from .cm import (
-    CMModule,
-    package_section_label,
-    resolve_catalog_conflicts,
-    role_order_key,
-    section_label_for_packages,
-)
-from .state import inventory_packages_from_state, roles_from_state
-
-
-class SaltRole(CMModule):
-    """Salt-specific view of a renderer-neutral CMModule."""
-
-    def __init__(self, role_name: str) -> None:
-        super().__init__(
-            role_name=role_name,
-            module_name=_salt_name(role_name, fallback="enroll_role"),
-        )
-
-    @property
-    def sls_name(self) -> str:
-        return f"roles.{self.module_name}"
-
-    def add_package_snapshot(self, snap: Dict[str, Any]) -> None:
-        pkg = str(snap.get("package") or "").strip()
-        if pkg:
-            self.packages.add(pkg)
-
-    def add_service_snapshot(self, snap: Dict[str, Any]) -> None:
-        for pkg in snap.get("packages", []) or []:
-            pkg_s = str(pkg or "").strip()
-            if pkg_s:
-                self.packages.add(pkg_s)
-        unit = str(snap.get("unit") or "").strip()
-        if unit:
-            unit_file_state = str(snap.get("unit_file_state") or "")
-            self.services[unit] = {
-                "name": unit,
-                "state": "running" if snap.get("active_state") == "active" else "dead",
-                "enable": unit_file_state in ("enabled", "enabled-runtime"),
-            }
-
-    def add_users_snapshot(self, snap: Dict[str, Any]) -> None:
-        for u in snap.get("users", []) or []:
-            if not isinstance(u, dict):
-                continue
-            name = str(u.get("name") or "").strip()
-            if not name:
-                continue
-            primary_group = str(u.get("primary_group") or name).strip()
-            if primary_group:
-                self.groups.add(primary_group)
-            supplementary = sorted(
-                {
-                    str(g).strip()
-                    for g in (u.get("supplementary_groups") or [])
-                    if str(g).strip()
-                }
-            )
-            self.groups.update(supplementary)
-            user_data: Dict[str, Any] = {
-                "name": name,
-                "uid": u.get("uid"),
-                "gid": primary_group or u.get("gid"),
-                "home": u.get("home") or f"/home/{name}",
-                "shell": u.get("shell"),
-                "groups": supplementary,
-            }
-            user_data.update(_gecos_attrs(u.get("gecos")))
-            self.users[name] = user_data
-
-        if snap.get("user_flatpaks") or snap.get("user_flatpak_remotes"):
-            self.notes.append(
-                "Per-user Flatpak resources were detected but are not rendered as native Salt states."
-            )
-
-    def add_managed_content(
-        self,
-        snap: Dict[str, Any],
-        *,
-        bundle_dir: str,
-        artifact_role: str,
-        role_files_dir: Path,
-        file_prefix: Optional[str] = None,
-    ) -> None:
-        for d in self.managed_dirs_from_snapshot(snap):
-            path = str(d.get("path") or "").strip()
-            self.add_managed_dir(
-                path,
-                user=d.get("owner") or "root",
-                group=d.get("group") or "root",
-                mode=d.get("mode") or "0755",
-                makedirs=True,
-                reason=d.get("reason") or "managed_dir",
-            )
-
-        for mf in self.managed_files_from_snapshot(snap):
-            path = str(mf.get("path") or "").strip()
-            src_rel = str(mf.get("src_rel") or "").strip()
-            if not path or not src_rel:
-                continue
-            role_rel = _copy_artifact(
-                bundle_dir,
-                artifact_role,
-                src_rel,
-                role_files_dir,
-                dst_prefix=file_prefix,
-            )
-            if not role_rel:
-                self.notes.append(
-                    f"Skipped {path}: harvested artifact {artifact_role}/{src_rel} was not present."
-                )
-                continue
-            self.add_managed_file(
-                path,
-                user=mf.get("owner") or "root",
-                group=mf.get("group") or "root",
-                mode=mf.get("mode") or "0644",
-                source=_source_uri(self.module_name, role_rel),
-                makedirs=True,
-                reason=mf.get("reason") or "managed_file",
-            )
-
-        for ml in self.managed_links_from_snapshot(snap):
-            path = str(ml.get("path") or "").strip()
-            target = str(ml.get("target") or "").strip()
-            if not path or not target:
-                continue
-            self.add_managed_link(
-                path,
-                target=target,
-                force=False,
-                makedirs=True,
-                reason=ml.get("reason") or "managed_link",
-            )
-
-        self.remove_directory_resource_conflicts()
-
-
-_RESERVED_SALT_NAMES = {"top", "init", "files", "pillar", "states", "roles"}
-
-
-def _salt_name(raw: str, *, fallback: str = "role") -> str:
-    s = re.sub(r"[^A-Za-z0-9_]+", "_", raw or fallback)
-    s = re.sub(r"_+", "_", s).strip("_").lower()
-    if not s:
-        s = fallback
-    if not re.match(r"^[a-z_]", s):
-        s = f"{fallback}_{s}"
-    if s in _RESERVED_SALT_NAMES:
-        s = f"{fallback}_{s}"
-    return s
-
-
-def _state_id(prefix: str, value: Any, *, role: str = "") -> str:
-    label = re.sub(r"[^A-Za-z0-9_]+", "_", str(value or "item").strip().lower())
-    label = re.sub(r"_+", "_", label).strip("_") or "item"
-    digest = hashlib.sha1(
-        str(value).encode("utf-8", errors="replace")
-    ).hexdigest()[  # nosec B324
-        :8
-    ]  # nosec B324
-    parts = ["enroll", prefix]
-    if role:
-        parts.append(role)
-    parts.extend([label[:40], digest])
-    return "_".join(parts)
-
-
-def _yaml_quote(value: Any) -> str:
-    return json.dumps(str(value), ensure_ascii=False)
-
-
-def _yaml_bool(value: Any) -> str:
-    return "true" if bool(value) else "false"
-
-
-def _clean_gecos_part(value: Any) -> Optional[str]:
-    text = str(value or "").strip()
-    return text or None
-
-
-def _gecos_attrs(value: Any) -> Dict[str, str]:
-    """Return Salt user.present-safe GECOS fields.
-
-    Linux passwd GECOS is comma-separated. Passing the raw field as Salt's
-    ``fullname`` can fail for values such as ``Node,,,`` because Salt validates
-    commas inside individual GECOS subfields. Split it into Salt's native
-    fields instead.
-    """
-
-    raw = str(value or "")
-    if not raw.strip():
-        return {}
-    parts = raw.split(",", 4)
-    keys = ("fullname", "roomnumber", "workphone", "homephone", "other")
-    out: Dict[str, str] = {}
-    for key, part in zip(keys, parts):
-        cleaned = _clean_gecos_part(part)
-        if cleaned:
-            out[key] = cleaned
-    return out
-
-
-def _copy_artifact(
-    bundle_dir: str,
-    role: str,
-    src_rel: str,
-    dst_files_dir: Path,
-    *,
-    dst_prefix: Optional[str] = None,
-) -> Optional[str]:
-    if not role or not src_rel:
-        return None
-    src = Path(bundle_dir) / "artifacts" / role / src_rel
-    if not src.is_file():
-        return None
-    role_rel = Path(dst_prefix or "") / src_rel
-    dst = dst_files_dir / role_rel
-    dst.parent.mkdir(parents=True, exist_ok=True)
-    shutil.copy2(src, dst)
-    return role_rel.as_posix()
-
-
-def _source_uri(module_name: str, role_rel: str) -> str:
-    return f"salt://roles/{module_name}/files/{role_rel}"
-
-
-def _node_file_prefix(fqdn: str) -> str:
-    name = re.sub(r"[^A-Za-z0-9_.-]+", "_", str(fqdn or "").strip())
-    name = name.strip("._-") or "node"
-    return f"nodes/{name}"
-
-
-def _node_sls_basename(fqdn: str) -> str:
-    raw = str(fqdn or "node").strip() or "node"
-    name = re.sub(r"[^A-Za-z0-9_]+", "_", raw).strip("_").lower() or "node"
-    digest = hashlib.sha1(
-        raw.encode("utf-8", errors="replace")
-    ).hexdigest()[  # nosec B324
-        :8
-    ]  # nosec B324
-    return f"{name}_{digest}"
-
-
-def _add_flatpak_snap_notes(roles: Dict[str, Any], out: Dict[str, SaltRole]) -> None:
-    flatpak = roles.get("flatpak") or {}
-    if isinstance(flatpak, dict) and (
-        flatpak.get("system_flatpaks") or flatpak.get("remotes")
-    ):
-        srole = out.setdefault("flatpak", SaltRole("flatpak"))
-        srole.notes.append(
-            "Flatpak resources were detected but are not rendered as native Salt states."
-        )
-    snap = roles.get("snap") or {}
-    if isinstance(snap, dict) and snap.get("system_snaps"):
-        srole = out.setdefault("snap", SaltRole("snap"))
-        srole.notes.append(
-            "Snap resources were detected but are not rendered as native Salt states."
-        )
-
-
-def _collect_salt_roles(
-    state: Dict[str, Any],
-    bundle_dir: str,
-    states_dir: Path,
-    *,
-    fqdn: Optional[str] = None,
-    no_common_roles: bool = False,
-) -> List[SaltRole]:
-    roles = roles_from_state(state)
-    inventory_packages = inventory_packages_from_state(state)
-    use_common_roles = not fqdn and not no_common_roles
-    node_file_prefix = _node_file_prefix(fqdn) if fqdn else None
-    out: Dict[str, SaltRole] = {}
-
-    def ensure_role(role_name: str) -> SaltRole:
-        role_name = _salt_name(role_name, fallback="enroll_role")
-        return out.setdefault(role_name, SaltRole(role_name))
-
-    for key in (
-        "apt_config",
-        "dnf_config",
-        "etc_custom",
-        "usr_local_custom",
-        "extra_paths",
-        "sysctl",
-    ):
-        snap = roles.get(key) or {}
-        if not isinstance(snap, dict):
-            continue
-        role_name = _salt_name(
-            str(snap.get("role_name") or key), fallback="enroll_role"
-        )
-        srole = ensure_role(role_name)
-        srole.add_managed_content(
-            snap,
-            bundle_dir=bundle_dir,
-            artifact_role=str(snap.get("role_name") or key),
-            role_files_dir=states_dir / "roles" / srole.module_name / "files",
-            file_prefix=node_file_prefix,
-        )
-
-    users_snap = roles.get("users") or {}
-    if isinstance(users_snap, dict):
-        role_name = _salt_name(
-            str(users_snap.get("role_name") or "users"), fallback="enroll_role"
-        )
-        srole = ensure_role(role_name)
-        srole.add_users_snapshot(users_snap)
-        srole.add_managed_content(
-            users_snap,
-            bundle_dir=bundle_dir,
-            artifact_role=str(users_snap.get("role_name") or "users"),
-            role_files_dir=states_dir / "roles" / srole.module_name / "files",
-            file_prefix=node_file_prefix,
-        )
-
-    for svc in roles.get("services", []) or []:
-        if not isinstance(svc, dict):
-            continue
-        original_role_name = _salt_name(
-            str(svc.get("role_name") or svc.get("unit") or "service"),
-            fallback="service",
-        )
-        if use_common_roles:
-            role_name = _salt_name(
-                section_label_for_packages(
-                    [
-                        str(p).strip()
-                        for p in (svc.get("packages") or [])
-                        if str(p).strip()
-                    ],
-                    inventory_packages,
-                ),
-                fallback="package_group",
-            )
-        else:
-            role_name = original_role_name
-        srole = ensure_role(role_name)
-        srole.add_service_snapshot(svc)
-        srole.add_managed_content(
-            svc,
-            bundle_dir=bundle_dir,
-            artifact_role=str(svc.get("role_name") or original_role_name),
-            role_files_dir=states_dir / "roles" / srole.module_name / "files",
-            file_prefix=node_file_prefix,
-        )
-
-    for pkg in roles.get("packages", []) or []:
-        if not isinstance(pkg, dict):
-            continue
-        original_role_name = _salt_name(
-            str(pkg.get("role_name") or pkg.get("package") or "package"),
-            fallback="package",
-        )
-        if use_common_roles:
-            role_name = _salt_name(
-                package_section_label(pkg, inventory_packages),
-                fallback="package_group",
-            )
-        else:
-            role_name = original_role_name
-        srole = ensure_role(role_name)
-        srole.add_package_snapshot(pkg)
-        srole.add_managed_content(
-            pkg,
-            bundle_dir=bundle_dir,
-            artifact_role=str(pkg.get("role_name") or original_role_name),
-            role_files_dir=states_dir / "roles" / srole.module_name / "files",
-            file_prefix=node_file_prefix,
-        )
-
-    fw = roles.get("firewall_runtime") or {}
-    if isinstance(fw, dict):
-        has_fw = (
-            fw.get("ipset_save")
-            or fw.get("iptables_v4_save")
-            or fw.get("iptables_v6_save")
-        )
-        packages = [
-            str(p).strip() for p in (fw.get("packages") or []) if str(p).strip()
-        ]
-        if has_fw or packages:
-            srole = ensure_role(str(fw.get("role_name") or "firewall_runtime"))
-            srole.packages.update(packages)
-            if has_fw:
-                srole.notes.append(
-                    "Live firewall runtime snapshots were detected but are not rendered as Salt states."
-                )
-
-    _add_flatpak_snap_notes(roles, out)
-
-    salt_roles = sorted(out.values(), key=lambda r: role_order_key(r.role_name))
-    resolve_catalog_conflicts(salt_roles)
-    return [r for r in salt_roles if r.has_resources()]
-
-
-def _render_static_role(srole: SaltRole) -> str:
-    lines: List[str] = ["# Generated by Enroll from harvest state.", ""]
-
-    for package in sorted(srole.packages):
-        lines.extend(
-            [
-                f"{_state_id('pkg', package, role=srole.module_name)}:",
-                "  pkg.installed:",
-                f"    - name: {_yaml_quote(package)}",
-                "",
-            ]
-        )
-
-    for group in sorted(srole.groups):
-        lines.extend(
-            [
-                f"{_state_id('group', group, role=srole.module_name)}:",
-                "  group.present:",
-                f"    - name: {_yaml_quote(group)}",
-                "",
-            ]
-        )
-
-    for name in sorted(srole.users):
-        user = srole.users[name]
-        lines.extend(
-            [
-                f"{_state_id('user', name, role=srole.module_name)}:",
-                "  user.present:",
-                f"    - name: {_yaml_quote(name)}",
-            ]
-        )
-        if user.get("uid") is not None:
-            lines.append(f"    - uid: {user['uid']}")
-        if user.get("gid") is not None:
-            lines.append(f"    - gid: {_yaml_quote(user['gid'])}")
-        if user.get("home"):
-            lines.append(f"    - home: {_yaml_quote(user['home'])}")
-        if user.get("shell"):
-            lines.append(f"    - shell: {_yaml_quote(user['shell'])}")
-        for gecos_key in ("fullname", "roomnumber", "workphone", "homephone", "other"):
-            if user.get(gecos_key):
-                lines.append(f"    - {gecos_key}: {_yaml_quote(user[gecos_key])}")
-        if user.get("groups"):
-            lines.append("    - groups:")
-            for group in user.get("groups") or []:
-                lines.append(f"      - {_yaml_quote(group)}")
-            lines.append("    - remove_groups: false")
-        lines.append("")
-
-    for path, attrs in sorted(srole.dirs.items()):
-        lines.extend(
-            [
-                f"{_yaml_quote(path)}:",
-                "  file.directory:",
-                f"    - user: {_yaml_quote(attrs.get('user') or attrs.get('owner') or 'root')}",
-                f"    - group: {_yaml_quote(attrs.get('group') or 'root')}",
-                f"    - mode: {_yaml_quote(str(attrs.get('mode') or '0755'))}",
-                "    - makedirs: true",
-                "",
-            ]
-        )
-
-    for path, attrs in sorted(srole.files.items()):
-        lines.extend(
-            [
-                f"{_yaml_quote(path)}:",
-                "  file.managed:",
-                f"    - source: {_yaml_quote(attrs.get('source') or '')}",
-                f"    - user: {_yaml_quote(attrs.get('user') or attrs.get('owner') or 'root')}",
-                f"    - group: {_yaml_quote(attrs.get('group') or 'root')}",
-                f"    - mode: {_yaml_quote(str(attrs.get('mode') or '0644'))}",
-                "    - makedirs: true",
-                "",
-            ]
-        )
-
-    for path, attrs in sorted(srole.links.items()):
-        lines.extend(
-            [
-                f"{_yaml_quote(path)}:",
-                "  file.symlink:",
-                f"    - target: {_yaml_quote(attrs.get('target') or '')}",
-                f"    - force: {_yaml_bool(attrs.get('force', False))}",
-                "    - makedirs: true",
-                "",
-            ]
-        )
-
-    for name in sorted(srole.services):
-        svc = srole.services[name]
-        state_fun = "running" if svc.get("state") == "running" else "dead"
-        lines.extend(
-            [
-                f"{_state_id('service', name, role=srole.module_name)}:",
-                f"  service.{state_fun}:",
-                f"    - name: {_yaml_quote(svc.get('name') or name)}",
-                f"    - enable: {_yaml_bool(svc.get('enable', False))}",
-                "",
-            ]
-        )
-
-    if "/etc/sysctl.d/99-enroll.conf" in srole.files:
-        lines.extend(
-            [
-                f"{_state_id('cmd', 'apply_sysctl', role=srole.module_name)}:",
-                "  cmd.run:",
-                "    - name: sysctl -e -p /etc/sysctl.d/99-enroll.conf || true",
-                "    - onchanges:",
-                "      - file: /etc/sysctl.d/99-enroll.conf",
-                "",
-            ]
-        )
-
-    if srole.notes:
-        lines.append("# Notes and limitations")
-        for note in srole.notes:
-            lines.append(f"# - {note}")
-        lines.append("")
-
-    return "\n".join(lines).rstrip() + "\n"
-
-
-def _role_pillar_values(srole: SaltRole) -> Dict[str, Any]:
-    data: Dict[str, Any] = {}
-    if srole.packages:
-        data["packages"] = sorted(srole.packages)
-    if srole.groups:
-        data["groups"] = {group: {} for group in sorted(srole.groups)}
-    if srole.users:
-        users: Dict[str, Dict[str, Any]] = {}
-        for name in sorted(srole.users):
-            raw = srole.users[name]
-            attrs: Dict[str, Any] = {}
-            for key in (
-                "uid",
-                "gid",
-                "home",
-                "shell",
-                "fullname",
-                "roomnumber",
-                "workphone",
-                "homephone",
-                "other",
-            ):
-                if raw.get(key) is not None:
-                    attrs[key] = raw[key]
-            if raw.get("groups"):
-                attrs["groups"] = list(raw["groups"])
-                attrs["remove_groups"] = False
-            users[name] = attrs
-        data["users"] = users
-    if srole.dirs:
-        data["dirs"] = {
-            path: {
-                "user": attrs.get("user") or attrs.get("owner") or "root",
-                "group": attrs.get("group") or "root",
-                "mode": str(attrs.get("mode") or "0755"),
-                "makedirs": True,
-            }
-            for path, attrs in sorted(srole.dirs.items())
-        }
-    if srole.files:
-        data["files"] = {
-            path: {
-                "source": attrs.get("source") or "",
-                "user": attrs.get("user") or attrs.get("owner") or "root",
-                "group": attrs.get("group") or "root",
-                "mode": str(attrs.get("mode") or "0644"),
-                "makedirs": True,
-            }
-            for path, attrs in sorted(srole.files.items())
-        }
-    if srole.links:
-        data["links"] = {
-            path: {
-                "target": attrs.get("target") or "",
-                "force": bool(attrs.get("force", False)),
-                "makedirs": True,
-            }
-            for path, attrs in sorted(srole.links.items())
-        }
-    if srole.services:
-        data["services"] = {
-            name: {
-                "name": svc.get("name") or name,
-                "state": "running" if svc.get("state") == "running" else "dead",
-                "enable": bool(svc.get("enable", False)),
-            }
-            for name, svc in sorted(srole.services.items())
-        }
-    if "/etc/sysctl.d/99-enroll.conf" in srole.files:
-        data["sysctl_apply"] = True
-    if srole.notes:
-        data["notes"] = list(srole.notes)
-    return data
-
-
-def _render_pillar_role(srole: SaltRole) -> str:
-    role_key = srole.module_name
-    lines = [
-        "# Generated by Enroll from harvest state.",
-        f"{{% set role = salt['pillar.get']('enroll:roles:{role_key}', {{}}) %}}",
-        "",
-        "{% for package_name in role.get('packages', []) %}",
-        f"enroll_pkg_{role_key}_{{{{ loop.index }}}}:",
-        "  pkg.installed:",
-        "    - name: {{ package_name|yaml_dquote }}",
-        "{% endfor %}",
-        "",
-        "{% for group_name, group_attrs in role.get('groups', {}).items() %}",
-        f"enroll_group_{role_key}_{{{{ loop.index }}}}:",
-        "  group.present:",
-        "    - name: {{ group_name|yaml_dquote }}",
-        "{% endfor %}",
-        "",
-        "{% for user_name, user_attrs in role.get('users', {}).items() %}",
-        f"enroll_user_{role_key}_{{{{ loop.index }}}}:",
-        "  user.present:",
-        "    - name: {{ user_name|yaml_dquote }}",
-        "{% if user_attrs.get('uid') is not none %}",
-        "    - uid: {{ user_attrs.get('uid') }}",
-        "{% endif %}",
-        "{% if user_attrs.get('gid') is not none %}",
-        "    - gid: {{ user_attrs.get('gid')|yaml_dquote }}",
-        "{% endif %}",
-        "{% if user_attrs.get('home') %}",
-        "    - home: {{ user_attrs.get('home')|yaml_dquote }}",
-        "{% endif %}",
-        "{% if user_attrs.get('shell') %}",
-        "    - shell: {{ user_attrs.get('shell')|yaml_dquote }}",
-        "{% endif %}",
-        "{% for gecos_key in ['fullname', 'roomnumber', 'workphone', 'homephone', 'other'] %}",
-        "{% if user_attrs.get(gecos_key) %}",
-        "    - {{ gecos_key }}: {{ user_attrs.get(gecos_key)|yaml_dquote }}",
-        "{% endif %}",
-        "{% endfor %}",
-        "{% if user_attrs.get('groups') %}",
-        "    - groups:",
-        "{% for group_name in user_attrs.get('groups', []) %}",
-        "      - {{ group_name|yaml_dquote }}",
-        "{% endfor %}",
-        "    - remove_groups: {{ user_attrs.get('remove_groups', False)|yaml_encode }}",
-        "{% endif %}",
-        "{% endfor %}",
-        "",
-        "{% for path, attrs in role.get('dirs', {}).items() %}",
-        "{{ path|yaml_dquote }}:",
-        "  file.directory:",
-        "    - user: {{ attrs.get('user', 'root')|yaml_dquote }}",
-        "    - group: {{ attrs.get('group', 'root')|yaml_dquote }}",
-        "    - mode: {{ attrs.get('mode', '0755')|string|yaml_dquote }}",
-        "    - makedirs: {{ attrs.get('makedirs', True)|yaml_encode }}",
-        "{% endfor %}",
-        "",
-        "{% for path, attrs in role.get('files', {}).items() %}",
-        "{{ path|yaml_dquote }}:",
-        "  file.managed:",
-        "    - source: {{ attrs.get('source', '')|yaml_dquote }}",
-        "    - user: {{ attrs.get('user', 'root')|yaml_dquote }}",
-        "    - group: {{ attrs.get('group', 'root')|yaml_dquote }}",
-        "    - mode: {{ attrs.get('mode', '0644')|string|yaml_dquote }}",
-        "    - makedirs: {{ attrs.get('makedirs', True)|yaml_encode }}",
-        "{% endfor %}",
-        "",
-        "{% for path, attrs in role.get('links', {}).items() %}",
-        "{{ path|yaml_dquote }}:",
-        "  file.symlink:",
-        "    - target: {{ attrs.get('target', '')|yaml_dquote }}",
-        "    - force: {{ attrs.get('force', False)|yaml_encode }}",
-        "    - makedirs: {{ attrs.get('makedirs', True)|yaml_encode }}",
-        "{% endfor %}",
-        "",
-        "{% for service_id, svc in role.get('services', {}).items() %}",
-        f"enroll_service_{role_key}_{{{{ loop.index }}}}:",
-        "  service.{{ 'running' if svc.get('state') == 'running' else 'dead' }}:",
-        "    - name: {{ svc.get('name', service_id)|yaml_dquote }}",
-        "    - enable: {{ svc.get('enable', False)|yaml_encode }}",
-        "{% endfor %}",
-        "",
-        "{% if role.get('sysctl_apply') and '/etc/sysctl.d/99-enroll.conf' in role.get('files', {}) %}",
-        f"enroll_apply_sysctl_{role_key}:",
-        "  cmd.run:",
-        "    - name: sysctl -e -p /etc/sysctl.d/99-enroll.conf || true",
-        "    - onchanges:",
-        "      - file: /etc/sysctl.d/99-enroll.conf",
-        "{% endif %}",
-        "",
-        "{% if role.get('notes') %}",
-        "# Notes and limitations",
-        "{% for note in role.get('notes', []) %}",
-        "# - {{ note }}",
-        "{% endfor %}",
-        "{% endif %}",
-        "",
-    ]
-    return "\n".join(lines).rstrip() + "\n"
-
-
-def _write_yaml(path: Path, data: Dict[str, Any]) -> None:
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text(
-        yaml.safe_dump(data, sort_keys=True, explicit_start=True),
-        encoding="utf-8",
-    )
-
-
-def _load_yaml_mapping(path: Path) -> Dict[str, Any]:
-    if not path.exists():
-        return {}
-    try:
-        obj = yaml.safe_load(path.read_text(encoding="utf-8"))
-    except Exception:
-        return {}
-    return obj if isinstance(obj, dict) else {}
-
-
-def _write_top(path: Path, mapping: Dict[str, List[str]]) -> None:
-    data = {
-        "base": {target: list(values) for target, values in sorted(mapping.items())}
-    }
-    _write_yaml(path, data)
-
-
-def _read_top(path: Path) -> Dict[str, List[str]]:
-    data = _load_yaml_mapping(path)
-    base = data.get("base") if isinstance(data.get("base"), dict) else {}
-    out: Dict[str, List[str]] = {}
-    for target, values in base.items():
-        if isinstance(values, list):
-            out[str(target)] = [str(v) for v in values if isinstance(v, str)]
-    return out
-
-
-def _write_state_top(
-    states_dir: Path, target: str, sls_names: List[str], *, preserve: bool
-) -> None:
-    top_path = states_dir / "top.sls"
-    mapping = _read_top(top_path) if preserve else {}
-    mapping[target] = list(sls_names)
-    _write_top(top_path, mapping)
-
-
-def _write_pillar_top(pillar_dir: Path, fqdn: str, node_sls: str) -> None:
-    top_path = pillar_dir / "top.sls"
-    mapping = _read_top(top_path)
-    mapping[fqdn] = [node_sls]
-    _write_top(top_path, mapping)
-
-
-def _write_pillar_node_data(
-    pillar_dir: Path, fqdn: str, salt_roles: List[SaltRole]
-) -> Path:
-    node_base = _node_sls_basename(fqdn)
-    node_path = pillar_dir / "nodes" / f"{node_base}.sls"
-    data = {
-        "enroll": {
-            "classes": [r.sls_name for r in salt_roles],
-            "roles": {r.module_name: _role_pillar_values(r) for r in salt_roles},
-        }
-    }
-    _write_yaml(node_path, data)
-    _write_pillar_top(pillar_dir, fqdn, f"nodes.{node_base}")
-    return node_path
-
-
-def _clean_node_artifacts(states_dir: Path, fqdn: str) -> None:
-    prefix = Path(_node_file_prefix(fqdn))
-    nodes_rel = prefix.parts
-    for files_dir in (states_dir / "roles").glob("*/files"):
-        target = files_dir.joinpath(*nodes_rel)
-        if target.exists():
-            shutil.rmtree(target)
-
-
-def _write_master_config(out: Path) -> None:
-    config_dir = out / "config"
-    config_dir.mkdir(parents=True, exist_ok=True)
-    (config_dir / "master.d" / "enroll.conf").parent.mkdir(parents=True, exist_ok=True)
-    (config_dir / "master.d" / "enroll.conf").write_text(
-        "# Generated by Enroll. Copy or merge into /etc/salt/master.d/enroll.conf.\n"
-        "file_roots:\n"
-        "  base:\n"
-        "    - /srv/salt\n"
-        "pillar_roots:\n"
-        "  base:\n"
-        "    - /srv/pillar\n",
-        encoding="utf-8",
-    )
-
-
-def _render_readme(
-    state: Dict[str, Any],
-    salt_roles: List[SaltRole],
-    *,
-    fqdn: Optional[str] = None,
-    node_path: Optional[Path] = None,
-) -> str:
-    host = state.get("host", {}) if isinstance(state.get("host"), dict) else {}
-    hostname = host.get("hostname") or "unknown"
-    role_lines = (
-        "\n".join(
-            f"- `{r.sls_name}` from Enroll role `{r.role_name}`" for r in salt_roles
-        )
-        or "- None."
-    )
-    notes: List[str] = []
-    for r in salt_roles:
-        for note in r.notes:
-            notes.append(f"`{r.sls_name}`: {note}")
-    notes_text = "\n".join(f"- {n}" for n in notes) or "- None."
-
-    if fqdn:
-        node_display = (
-            node_path.relative_to(Path(node_path).parents[1]).as_posix()
-            if node_path
-            else "pillar/nodes/<node>.sls"
-        )
-        layout = f"""- `states/top.sls` targets minion `{fqdn}` to this node's generated role SLS files.
-- `pillar/top.sls` targets minion `{fqdn}` to `{node_display}`.
-- `pillar/nodes/*.sls` contains per-minion resource data under `enroll:roles:<role>`.
-- `states/roles/<role>/init.sls` contains reusable, data-driven Salt states.
-- `states/roles/<role>/files/nodes/<fqdn>/...` contains node-specific harvested file artifacts."""
-        apply = f"""For a local dry run using the generated tree:
-
-```bash
-sudo salt-call --local --file-root ./states --pillar-root ./pillar --id {fqdn} state.apply test=True
-```
-
-For master/minion use, copy or sync `states/` to your Salt state tree, copy or sync `pillar/` to your pillar tree, refresh pillar, then apply the highstate or the selected SLS files to minion `{fqdn}`."""
-    else:
-        layout = """- `states/top.sls` targets `*` to the generated role SLS files.
-- `states/roles/<role>/init.sls` contains concrete Salt states for each generated Enroll role/snapshot or common package group.
-- `states/roles/<role>/files/` contains harvested file artifacts for that role or group.
-- `config/master.d/enroll.conf` documents the expected Salt `file_roots` and `pillar_roots` layout if copied under `/srv`."""
-        apply = """For a local dry run using the generated tree:
-
-```bash
-sudo salt-call --local --file-root ./states state.apply test=True
-```
-
-For master/minion use, copy or sync `states/` to your Salt state tree and apply highstate or the selected SLS files."""
-
-    return f"""# Enroll Salt manifest
-
-Generated by Enroll from harvest data for `{hostname}`.
-
-This Salt target reuses the existing harvest state without changing harvesting behaviour.
-
-## Layout
-
-{layout}
-
-## Generated SLS roles
-
-{role_lines}
-
-## Apply / check
-
-{apply}
-
-## Generated resources
-
-- Native packages observed in package and service snapshots.
-- Local users and groups from the users snapshot.
-- Managed directories, files, and symlinks from harvested roles.
-- Basic service enablement/running-state resources.
-- `/etc/sysctl.d/99-enroll.conf` plus an `onchanges` sysctl apply command when present.
-
-## Current limitations
-
-- Flatpak, Snap, and live firewall runtime snapshots are listed as notes when present rather than rendered as Salt states.
-- JinjaTurtle templating is currently Ansible-oriented and is not applied to Salt output.
-- Review generated resources before applying them broadly across unlike hosts.
-
-## Notes
-
-{notes_text}
-"""
-
-
-class SaltManifestRenderer:
-    """Render Salt state/pillar trees from a harvest bundle."""
-
-    def __init__(
-        self,
-        bundle_dir: str,
-        out_dir: str,
-        *,
-        fqdn: Optional[str] = None,
-        no_common_roles: bool = False,
-    ) -> None:
-        self.bundle_dir = bundle_dir
-        self.out_dir = out_dir
-        self.fqdn = fqdn
-        self.no_common_roles = no_common_roles
-
-    def render(self) -> None:
-        state = SaltRole.load_state(self.bundle_dir)
-        out = Path(self.out_dir)
-        states_dir = out / "states"
-        pillar_dir = out / "pillar"
-        fqdn_mode = bool(self.fqdn)
-
-        if out.exists() and not fqdn_mode:
-            shutil.rmtree(out)
-        states_dir.mkdir(parents=True, exist_ok=True)
-        if fqdn_mode:
-            pillar_dir.mkdir(parents=True, exist_ok=True)
-            _clean_node_artifacts(states_dir, str(self.fqdn))
-
-        salt_roles = _collect_salt_roles(
-            state,
-            self.bundle_dir,
-            states_dir,
-            fqdn=self.fqdn,
-            no_common_roles=self.no_common_roles,
-        )
-
-        for srole in salt_roles:
-            role_dir = states_dir / "roles" / srole.module_name
-            role_dir.mkdir(parents=True, exist_ok=True)
-            (role_dir / "init.sls").write_text(
-                _render_pillar_role(srole) if fqdn_mode else _render_static_role(srole),
-                encoding="utf-8",
-            )
-
-        node_path: Optional[Path] = None
-        if fqdn_mode and self.fqdn:
-            node_path = _write_pillar_node_data(pillar_dir, self.fqdn, salt_roles)
-            _write_state_top(
-                states_dir,
-                self.fqdn,
-                [r.sls_name for r in salt_roles],
-                preserve=True,
-            )
-        else:
-            _write_state_top(
-                states_dir,
-                "*",
-                [r.sls_name for r in salt_roles],
-                preserve=False,
-            )
-        _write_master_config(out)
-        (out / "README.md").write_text(
-            _render_readme(state, salt_roles, fqdn=self.fqdn, node_path=node_path),
-            encoding="utf-8",
-        )
-
-
-def manifest_from_bundle_dir(
-    bundle_dir: str,
-    out_dir: str,
-    *,
-    fqdn: Optional[str] = None,
-    no_common_roles: bool = False,
-) -> None:
-    SaltManifestRenderer(
-        bundle_dir,
-        out_dir,
-        fqdn=fqdn,
-        no_common_roles=no_common_roles,
-    ).render()

pytests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eou pipefail
-
-poetry run pytest -q tests -vvv --cov=enroll

tests.sh

@@ -1,211 +1,75 @@
 #!/bin/bash
 
-set -Eeuo pipefail
+set -eo pipefail
 
-PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TMP_PARENT="${TMPDIR:-/tmp}"
-KEEP_WORKDIR=0
-if [[ -n "${ENROLL_TEST_WORKDIR:-}" ]]; then
-  WORK_DIR="${ENROLL_TEST_WORKDIR}"
-  KEEP_WORKDIR=1
-  mkdir -p "${WORK_DIR}"
-else
-  WORK_DIR="$(mktemp -d "${TMP_PARENT%/}/enroll-tests.XXXXXX")"
-fi
+# Pytests
+poetry run pytest -vvvv --cov=enroll --cov-report=term-missing --disable-warnings
 
-BUNDLE_DIR="${WORK_DIR}/bundle"
-BUNDLE_DIFF_DIR="${WORK_DIR}/bundle-diff"
-ANSIBLE_DIR="${WORK_DIR}/ansible"
-ANSIBLE_NO_COMMON_DIR="${WORK_DIR}/ansible-no-common"
-ANSIBLE_FQDN_DIR="${WORK_DIR}/ansible-fqdn"
-PUPPET_DIR="${WORK_DIR}/puppet"
-PUPPET_FQDN_DIR="${WORK_DIR}/puppet-fqdn"
-SALT_DIR="${WORK_DIR}/salt"
-SALT_FQDN_DIR="${WORK_DIR}/salt-fqdn"
-TEST_FQDN="${ENROLL_TEST_FQDN:-enroll-ci.example.test}"
+BUNDLE_DIR="/tmp/bundle"
+ANSIBLE_DIR="/tmp/ansible"
+PUPPET_DIR="/tmp/puppet"
+rm -rf "${BUNDLE_DIR}" "${ANSIBLE_DIR}" "${PUPPET_DIR}"
 
-cleanup() {
-  if [[ "${KEEP_WORKDIR}" -eq 0 ]]; then
-    rm -rf "${WORK_DIR}"
-  else
-    printf '\nKeeping ENROLL_TEST_WORKDIR: %s\n' "${WORK_DIR}"
-  fi
-}
-trap cleanup EXIT
+# 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
 
-section() {
-  printf '\n================================================================================\n'
-  printf '%s\n' "$1"
-  printf '================================================================================\n'
-}
+# Generate data
+poetry run \
+	enroll single-shot \
+	  --harvest "${BUNDLE_DIR}" \
+	  --out "${ANSIBLE_DIR}"
 
-run() {
-  printf '+ '
-  printf '%q ' "$@"
-  printf '\n'
-  "$@"
-}
+# Analyse
+poetry run \
+	enroll explain "${BUNDLE_DIR}"
+poetry run \
+        enroll explain "${BUNDLE_DIR}" --format json | jq
 
-fail() {
-  printf 'ERROR: %s\n' "$*" >&2
-  exit 1
-}
+# Validate
+poetry run \
+	enroll validate --fail-on-warnings "${BUNDLE_DIR}"
 
-require_root() {
-  if [[ "$(id -u)" -ne 0 ]]; then
-    fail "tests.sh must be run as root so harvest and CM noop tests can inspect/apply system state."
-  fi
-}
+# 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
 
-require_debian_ci() {
-  if [[ -r /etc/os-release ]]; then
-    # shellcheck disable=SC1091
-    . /etc/os-release
-    if [[ "${ID:-}" != "debian" || "${VERSION_ID:-}" != "13" ]]; then
-      printf 'WARNING: tests.sh is maintained for Debian 13 CI; detected %s %s.\n' "${ID:-unknown}" "${VERSION_ID:-unknown}" >&2
-    fi
-  fi
-}
+# No common roles mode (tested later)
+poetry run \
+ 	enroll manifest \
+ 	--harvest "${BUNDLE_DIR}2" \
+ 	--out "${ANSIBLE_DIR}2" \
+	--no-common-roles
 
-apt_update_once() {
-  if [[ -z "${APT_UPDATED:-}" ]]; then
-    section "Setup: apt metadata"
-    run apt-get update
-    APT_UPDATED=1
-  fi
-}
+# Puppet mode!
+DEBIAN_FRONTEND=noninteractive apt-get install -y puppet
+poetry run \
+        enroll single-shot \
+	--harvest "${BUNDLE_DIR}3" \
+        --out "${PUPPET_DIR}3" \
+	--target puppet
+puppet apply --modulepath "${PUPPET_DIR}3/modules" "${PUPPET_DIR}3/manifests/site.pp" --noop
 
-apt_install() {
-  apt_update_once
-  run env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "$@"
-}
+# Ansible mode!
+builtin cd "${ANSIBLE_DIR}"
+# Lint
+ansible-lint "${ANSIBLE_DIR}"
 
-apt_remove_purge() {
-  run env DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge "$@"
-}
+# Run
+ansible-playbook playbook.yml -i "localhost," -c local --check --diff
 
-require_cmd() {
-  local cmd="$1"
-  local hint="$2"
-  if ! command -v "${cmd}" >/dev/null 2>&1; then
-    fail "Required command '${cmd}' was not found. ${hint}"
-  fi
-}
-
-ensure_ansible() {
-  if ! command -v ansible-playbook >/dev/null 2>&1 || ! command -v ansible-lint >/dev/null 2>&1; then
-    apt_install ansible ansible-lint
-  fi
-  require_cmd ansible-playbook "Install the Debian ansible package."
-  require_cmd ansible-lint "Install the Debian ansible-lint package."
-}
-
-ensure_puppet() {
-  if ! command -v puppet >/dev/null 2>&1; then
-    apt_install puppet || apt_install puppet-agent
-  fi
-  require_cmd puppet "Install Puppet before running the Puppet noop integration tests."
-}
-
-ensure_salt() {
-  if ! command -v salt-call >/dev/null 2>&1; then
-    apt_install salt-minion || true
-  fi
-  require_cmd salt-call "Install Salt's salt-call binary before running the Salt noop integration tests. On Debian 13 this may require configuring the upstream Salt/Broadcom package repository first."
-}
-
-run_pytests() {
-  section "Python unit tests"
-  cd "${PROJECT_ROOT}"
-  run poetry run pytest -vvvv --cov=enroll --cov-report=term-missing --disable-warnings
-}
-
-prepare_harvest_fixture() {
-  section "Common harvest fixture and CLI smoke checks"
-  apt_install jq apache2
-
-  cd "${PROJECT_ROOT}"
-  rm -rf "${BUNDLE_DIR}" "${BUNDLE_DIFF_DIR}"
-
-  run poetry run enroll harvest --out "${BUNDLE_DIR}"
-  run poetry run enroll explain "${BUNDLE_DIR}"
-  run bash -c "poetry run enroll explain '${BUNDLE_DIR}' --format json | jq"
-  run poetry run enroll validate --fail-on-warnings "${BUNDLE_DIR}"
-
-  apt_install cowsay
-  run poetry run enroll harvest --out "${BUNDLE_DIFF_DIR}"
-  run poetry run enroll validate --fail-on-warnings "${BUNDLE_DIFF_DIR}"
-  run bash -c "poetry run enroll diff --old '${BUNDLE_DIR}' --new '${BUNDLE_DIFF_DIR}' --format json | jq"
-  apt_remove_purge cowsay
-}
-
-run_ansible_noop_tests() {
-  section "Ansible manifest noop tests"
-  ensure_ansible
-  cd "${PROJECT_ROOT}"
-  rm -rf "${ANSIBLE_DIR}" "${ANSIBLE_NO_COMMON_DIR}" "${ANSIBLE_FQDN_DIR}"
-
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${ANSIBLE_DIR}" --target ansible
-  run ansible-lint "${ANSIBLE_DIR}"
-  cd "${ANSIBLE_DIR}"
-  run ansible-playbook playbook.yml -i "localhost," -c local --check --diff
-
-  cd "${PROJECT_ROOT}"
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${ANSIBLE_NO_COMMON_DIR}" --target ansible --no-common-roles
-  cd "${ANSIBLE_NO_COMMON_DIR}"
-  run ansible-playbook playbook.yml -i "localhost," -c local --check --diff
-
-  cd "${PROJECT_ROOT}"
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${ANSIBLE_FQDN_DIR}" --target ansible --fqdn "${TEST_FQDN}"
-  cd "${ANSIBLE_FQDN_DIR}"
-  run ansible-playbook "playbooks/${TEST_FQDN}.yml" -i inventory/hosts.ini -c local --limit "${TEST_FQDN}" --check --diff
-}
-
-run_puppet_noop_tests() {
-  section "Puppet manifest noop tests"
-  ensure_puppet
-  cd "${PROJECT_ROOT}"
-  rm -rf "${PUPPET_DIR}" "${PUPPET_FQDN_DIR}"
-
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${PUPPET_DIR}" --target puppet
-  run puppet apply --modulepath "${PUPPET_DIR}/modules" "${PUPPET_DIR}/manifests/site.pp" --noop
-
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${PUPPET_FQDN_DIR}" --target puppet --fqdn "${TEST_FQDN}"
-  run puppet apply \
-    --modulepath "${PUPPET_FQDN_DIR}/modules" \
-    --hiera_config "${PUPPET_FQDN_DIR}/hiera.yaml" \
-    --certname "${TEST_FQDN}" \
-    "${PUPPET_FQDN_DIR}/manifests/site.pp" \
-    --noop
-}
-
-run_salt_noop_tests() {
-  section "Salt manifest noop tests"
-  ensure_salt
-  cd "${PROJECT_ROOT}"
-  rm -rf "${SALT_DIR}" "${SALT_FQDN_DIR}"
-
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${SALT_DIR}" --target salt
-  run salt-call --local --retcode-passthrough --file-root "${SALT_DIR}/states" state.apply test=True
-
-  run poetry run enroll manifest --harvest "${BUNDLE_DIR}" --out "${SALT_FQDN_DIR}" --target salt --fqdn "${TEST_FQDN}"
-  run salt-call \
-    --local \
-    --retcode-passthrough \
-    --id "${TEST_FQDN}" \
-    --file-root "${SALT_FQDN_DIR}/states" \
-    --pillar-root "${SALT_FQDN_DIR}/pillar" \
-    state.apply test=True
-}
-
-main() {
-  require_root
-  require_debian_ci
-  run_pytests
-  prepare_harvest_fixture
-  run_ansible_noop_tests
-  run_puppet_noop_tests
-  run_salt_noop_tests
-}
-
-main "$@"
+# Test the --no-common-roles mode
+builtin cd "${ANSIBLE_DIR}2"
+ls "${ANSIBLE_DIR}2/roles"
+ansible-playbook playbook.yml -i "localhost," -c local --check --diff

tests/test_manifest_salt.py

@@ -1,356 +0,0 @@
-from __future__ import annotations
-
-import json
-from pathlib import Path
-
-import yaml
-
-from enroll import manifest
-
-
-def _write_state(bundle: Path, state: dict) -> None:
-    bundle.mkdir(parents=True, exist_ok=True)
-    (bundle / "state.json").write_text(json.dumps(state, indent=2), encoding="utf-8")
-
-
-def _sample_state() -> dict:
-    return {
-        "schema_version": 3,
-        "host": {"hostname": "test", "os": "debian", "pkg_backend": "dpkg"},
-        "inventory": {
-            "packages": {"foo": {"section": "net"}, "curl": {"section": "net"}}
-        },
-        "roles": {
-            "users": {
-                "role_name": "users",
-                "users": [
-                    {
-                        "name": "alice",
-                        "uid": 1000,
-                        "gid": 1000,
-                        "gecos": "Alice Example",
-                        "home": "/home/alice",
-                        "shell": "/bin/bash",
-                        "primary_group": "alice",
-                        "supplementary_groups": ["docker"],
-                    }
-                ],
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-                "excluded": [],
-                "notes": [],
-            },
-            "services": [
-                {
-                    "unit": "foo.service",
-                    "role_name": "foo",
-                    "packages": ["foo"],
-                    "active_state": "active",
-                    "unit_file_state": "enabled",
-                    "managed_dirs": [
-                        {
-                            "path": "/etc/foo",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0755",
-                        }
-                    ],
-                    "managed_files": [
-                        {
-                            "path": "/etc/foo/foo.conf",
-                            "src_rel": "etc/foo.conf",
-                            "owner": "root",
-                            "group": "root",
-                            "mode": "0644",
-                        }
-                    ],
-                    "managed_links": [
-                        {"path": "/etc/foo/enabled.conf", "target": "/etc/foo/foo.conf"}
-                    ],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "packages": [
-                {
-                    "package": "curl",
-                    "role_name": "curl",
-                    "section": "net",
-                    "managed_dirs": [],
-                    "managed_files": [],
-                    "managed_links": [],
-                    "excluded": [],
-                    "notes": [],
-                }
-            ],
-            "apt_config": {
-                "role_name": "apt_config",
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-            },
-            "dnf_config": {
-                "role_name": "dnf_config",
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-            },
-            "sysctl": {
-                "role_name": "sysctl",
-                "managed_dirs": [],
-                "managed_files": [
-                    {
-                        "path": "/etc/sysctl.d/99-enroll.conf",
-                        "src_rel": "sysctl/99-enroll.conf",
-                        "owner": "root",
-                        "group": "root",
-                        "mode": "0644",
-                    }
-                ],
-                "managed_links": [],
-                "parameters": {"net.ipv4.ip_forward": "1"},
-                "notes": [],
-            },
-            "firewall_runtime": {"role_name": "firewall_runtime", "packages": []},
-            "etc_custom": {
-                "role_name": "etc_custom",
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-            },
-            "usr_local_custom": {
-                "role_name": "usr_local_custom",
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-            },
-            "extra_paths": {
-                "role_name": "extra_paths",
-                "managed_dirs": [],
-                "managed_files": [],
-                "managed_links": [],
-            },
-        },
-    }
-
-
-def _write_sample_artifacts(bundle: Path) -> None:
-    artifact = bundle / "artifacts" / "foo" / "etc" / "foo.conf"
-    artifact.parent.mkdir(parents=True, exist_ok=True)
-    artifact.write_text("setting = true\n", encoding="utf-8")
-    sysctl_artifact = bundle / "artifacts" / "sysctl" / "sysctl" / "99-enroll.conf"
-    sysctl_artifact.parent.mkdir(parents=True, exist_ok=True)
-    sysctl_artifact.write_text("net.ipv4.ip_forward = 1\n", encoding="utf-8")
-
-
-def test_manifest_salt_writes_single_site_state_tree(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "salt"
-    _write_sample_artifacts(bundle)
-    _write_state(bundle, _sample_state())
-
-    manifest.manifest(str(bundle), str(out), target="salt")
-
-    top = yaml.safe_load((out / "states" / "top.sls").read_text(encoding="utf-8"))
-    assert top["base"]["*"] == ["roles.net", "roles.users", "roles.sysctl"]
-
-    net_sls = (out / "states" / "roles" / "net" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert "pkg.installed:" in net_sls
-    assert '- name: "curl"' in net_sls
-    assert '- name: "foo"' in net_sls
-    assert '"/etc/foo/foo.conf":' in net_sls
-    assert 'source: "salt://roles/net/files/etc/foo.conf"' in net_sls
-    assert "file.symlink:" in net_sls
-    assert "service.running:" in net_sls
-    assert (out / "states" / "roles" / "net" / "files" / "etc" / "foo.conf").exists()
-
-    users_sls = (out / "states" / "roles" / "users" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert "group.present:" in users_sls
-    assert "user.present:" in users_sls
-    assert "Alice Example" in users_sls
-    assert "optional_groups" not in users_sls
-    assert "- remove_groups: false" in users_sls
-
-    sysctl_sls = (out / "states" / "roles" / "sysctl" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert "cmd.run:" in sysctl_sls
-    assert "sysctl -e -p /etc/sysctl.d/99-enroll.conf || true" in sysctl_sls
-    assert (out / "README.md").exists()
-    assert (out / "config" / "master.d" / "enroll.conf").exists()
-
-
-def test_manifest_salt_fqdn_mode_uses_pillar_and_accumulates_nodes(tmp_path: Path):
-    out = tmp_path / "salt"
-
-    def write_bundle(name: str, content: str) -> Path:
-        bundle = tmp_path / name
-        _write_sample_artifacts(bundle)
-        (bundle / "artifacts" / "foo" / "etc" / "foo.conf").write_text(
-            content, encoding="utf-8"
-        )
-        state = _sample_state()
-        state["host"]["hostname"] = name
-        _write_state(bundle, state)
-        return bundle
-
-    first = write_bundle("first", "first=true\n")
-    second = write_bundle("second", "second=true\n")
-
-    manifest.manifest(str(first), str(out), target="salt", fqdn="first.example")
-    manifest.manifest(str(second), str(out), target="salt", fqdn="second.example")
-
-    state_top = yaml.safe_load((out / "states" / "top.sls").read_text(encoding="utf-8"))
-    assert state_top["base"]["first.example"] == [
-        "roles.curl",
-        "roles.foo",
-        "roles.users",
-        "roles.sysctl",
-    ]
-    assert state_top["base"]["second.example"] == [
-        "roles.curl",
-        "roles.foo",
-        "roles.users",
-        "roles.sysctl",
-    ]
-
-    pillar_top = yaml.safe_load(
-        (out / "pillar" / "top.sls").read_text(encoding="utf-8")
-    )
-    assert set(pillar_top["base"]) == {"first.example", "second.example"}
-    first_pillar_sls = pillar_top["base"]["first.example"][0]
-    first_node = out / "pillar" / Path(*first_pillar_sls.split("."))
-    first_data = yaml.safe_load(
-        first_node.with_suffix(".sls").read_text(encoding="utf-8")
-    )
-    assert first_data["enroll"]["classes"] == [
-        "roles.curl",
-        "roles.foo",
-        "roles.users",
-        "roles.sysctl",
-    ]
-    assert first_data["enroll"]["roles"]["foo"]["packages"] == ["foo"]
-    assert first_data["enroll"]["roles"]["foo"]["files"]["/etc/foo/foo.conf"][
-        "source"
-    ] == ("salt://roles/foo/files/nodes/first.example/etc/foo.conf")
-
-    foo_sls = (out / "states" / "roles" / "foo" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert "salt['pillar.get']('enroll:roles:foo'" in foo_sls
-    assert "pkg.installed:" in foo_sls
-    assert "file.managed:" in foo_sls
-    assert (
-        out
-        / "states"
-        / "roles"
-        / "foo"
-        / "files"
-        / "nodes"
-        / "first.example"
-        / "etc"
-        / "foo.conf"
-    ).exists()
-    assert (
-        out
-        / "states"
-        / "roles"
-        / "foo"
-        / "files"
-        / "nodes"
-        / "second.example"
-        / "etc"
-        / "foo.conf"
-    ).exists()
-
-
-def test_manifest_salt_user_gecos_and_groups_are_salt_safe(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "salt"
-    state = _sample_state()
-    state["roles"]["users"]["users"][0]["name"] = "node"
-    state["roles"]["users"]["users"][0]["primary_group"] = "node"
-    state["roles"]["users"]["users"][0]["gid"] = 1000
-    state["roles"]["users"]["users"][0]["gecos"] = "Node,,,"
-    _write_sample_artifacts(bundle)
-    _write_state(bundle, state)
-
-    manifest.manifest(str(bundle), str(out), target="salt")
-
-    users_sls = (out / "states" / "roles" / "users" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert '- fullname: "Node"' in users_sls
-    assert "Node,,," not in users_sls
-    assert "optional_groups" not in users_sls
-    assert "- remove_groups: false" in users_sls
-
-
-def test_manifest_salt_fqdn_user_pillar_gecos_and_groups_are_salt_safe(tmp_path: Path):
-    bundle = tmp_path / "bundle"
-    out = tmp_path / "salt"
-    state = _sample_state()
-    state["roles"]["users"]["users"][0]["gecos"] = "Node,,,"
-    _write_sample_artifacts(bundle)
-    _write_state(bundle, state)
-
-    manifest.manifest(str(bundle), str(out), target="salt", fqdn="node.example")
-
-    pillar_top = yaml.safe_load(
-        (out / "pillar" / "top.sls").read_text(encoding="utf-8")
-    )
-    node_sls = pillar_top["base"]["node.example"][0]
-    pillar_path = out / "pillar" / Path(*node_sls.split("."))
-    data = yaml.safe_load(pillar_path.with_suffix(".sls").read_text(encoding="utf-8"))
-    alice = data["enroll"]["roles"]["users"]["users"]["alice"]
-    assert alice["fullname"] == "Node"
-    assert "Node,,," not in pillar_path.with_suffix(".sls").read_text(encoding="utf-8")
-    assert alice["remove_groups"] is False
-    assert "optional_groups" not in pillar_path.with_suffix(".sls").read_text(
-        encoding="utf-8"
-    )
-
-    users_sls = (out / "states" / "roles" / "users" / "init.sls").read_text(
-        encoding="utf-8"
-    )
-    assert "optional_groups" not in users_sls
-    assert "remove_groups" in users_sls
-
-
-def test_cli_manifest_target_salt_is_forwarded(monkeypatch, tmp_path):
-    import sys
-
-    import enroll.cli as cli
-
-    called = {}
-
-    def fake_manifest(harvest_dir: str, out_dir: str, **kwargs):
-        called["harvest"] = harvest_dir
-        called["out"] = out_dir
-        called["target"] = kwargs.get("target")
-
-    monkeypatch.setattr(cli, "manifest", fake_manifest)
-    monkeypatch.setattr(
-        sys,
-        "argv",
-        [
-            "enroll",
-            "manifest",
-            "--harvest",
-            str(tmp_path / "bundle"),
-            "--out",
-            str(tmp_path / "salt"),
-            "--target",
-            "salt",
-        ],
-    )
-
-    cli.main()
-    assert called["harvest"] == str(tmp_path / "bundle")
-    assert called["out"] == str(tmp_path / "salt")
-    assert called["target"] == "salt"