Remove puppet and salt

tests/test_diff_ignore_versions_exclude_enforce.py

@@ -218,18 +218,6 @@ def test_diff_exclude_path_only_filters_files_not_packages(tmp_path: Path):
     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
 ):
@@ -310,121 +298,6 @@ def test_enforce_old_harvest_runs_ansible_with_tags_from_file_drift(
     assert "role_usr_local_custom" in str(argv[i + 1])
 
 
-def test_enforce_old_harvest_runs_puppet_target(monkeypatch, tmp_path: Path):
-    import enroll.diff as d
-    import enroll.manifest as mf
-
-    monkeypatch.setattr(
-        d.shutil,
-        "which",
-        lambda name: "/usr/bin/puppet" if name == "puppet" else None,
-    )
-
-    calls: dict[str, object] = {}
-
-    def fake_manifest(_harvest_dir: str, out_dir: str, **kwargs):
-        calls["manifest_target"] = kwargs.get("target")
-        out = Path(out_dir)
-        (out / "manifests").mkdir(parents=True)
-        (out / "modules").mkdir(parents=True)
-        (out / "manifests" / "site.pp").write_text(
-            "node default { }\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"
-    _write_bundle(old, {"inventory": {"packages": {}}, "roles": _minimal_roles()})
-
-    report = {
-        "packages": {"added": [], "removed": ["curl"], "version_changed": []},
-        "services": {"enabled_added": [], "enabled_removed": [], "changed": []},
-        "users": {"added": [], "removed": [], "changed": []},
-        "files": {"added": [], "removed": [], "changed": []},
-    }
-
-    info = d.enforce_old_harvest(str(old), report=report, target="puppet")
-
-    assert info["status"] == "applied"
-    assert info["target"] == "puppet"
-    assert info["tool"] == "puppet apply"
-    assert info["scope"] == "full_manifest"
-    assert info["tags"] == []
-    assert calls["manifest_target"] == "puppet"
-
-    argv = calls.get("argv")
-    assert argv and argv[:2] == ["/usr/bin/puppet", "apply"]
-    assert "--modulepath" in argv
-    assert any(
-        str(Path(calls["cwd"]) / "manifest" / "manifests" / "site.pp") == str(a)
-        for a in argv
-    )
-
-
-def test_enforce_old_harvest_runs_salt_target(monkeypatch, tmp_path: Path):
-    import enroll.diff as d
-    import enroll.manifest as mf
-
-    monkeypatch.setattr(
-        d.shutil,
-        "which",
-        lambda name: "/usr/bin/salt-call" if name == "salt-call" else None,
-    )
-
-    calls: dict[str, object] = {}
-
-    def fake_manifest(_harvest_dir: str, out_dir: str, **kwargs):
-        calls["manifest_target"] = kwargs.get("target")
-        out = Path(out_dir)
-        (out / "states").mkdir(parents=True)
-        (out / "states" / "top.sls").write_text("base:\n  '*': []\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"
-    _write_bundle(old, {"inventory": {"packages": {}}, "roles": _minimal_roles()})
-
-    report = {
-        "packages": {"added": [], "removed": ["curl"], "version_changed": []},
-        "services": {"enabled_added": [], "enabled_removed": [], "changed": []},
-        "users": {"added": [], "removed": [], "changed": []},
-        "files": {"added": [], "removed": [], "changed": []},
-    }
-
-    info = d.enforce_old_harvest(str(old), report=report, target="salt")
-
-    assert info["status"] == "applied"
-    assert info["target"] == "salt"
-    assert info["tool"] == "salt-call"
-    assert info["scope"] == "full_manifest"
-    assert calls["manifest_target"] == "salt"
-
-    argv = calls.get("argv")
-    assert argv and argv[0] == "/usr/bin/salt-call"
-    assert "--local" in argv
-    assert "--file-root" in argv
-    assert "state.apply" in argv
-    assert str(Path(calls["cwd"]) / "manifest" / "states") in argv
-
-
 def test_cli_diff_enforce_forwards_target(monkeypatch):
     import enroll.cli as cli
 
@@ -458,17 +331,38 @@ def test_cli_diff_enforce_forwards_target(monkeypatch):
             "--new",
             "/tmp/new",
             "--enforce",
-            "--target",
-            "puppet",
         ],
     )
 
     cli.main()
     assert calls["old"] == "/tmp/old"
-    assert calls["target"] == "puppet"
     assert calls["report"] is report
 
 
+def test_cli_diff_enforce_rejects_non_ansible_target(monkeypatch):
+    """Salt and Puppet targets have been removed from --enforce."""
+    import enroll.cli as cli
+
+    monkeypatch.setattr(
+        sys,
+        "argv",
+        [
+            "enroll",
+            "diff",
+            "--old",
+            "/tmp/old",
+            "--new",
+            "/tmp/new",
+            "--enforce",
+            "--target",
+            "puppet",
+        ],
+    )
+
+    with pytest.raises(SystemExit):
+        cli.main()
+
+
 def test_cli_diff_forwards_exclude_and_ignore_flags(monkeypatch, capsys):
     import enroll.cli as cli