mig5/enroll
1
0
Fork 0
Code Issues Pull requests Projects Releases 21 Packages Wiki Activity Actions

Don't enforce /etc/enroll if no firewall rules to set in subdir
All checks were successful
CI / test (push) Successful in 19m38s
Details
Lint / test (push) Successful in 43s
Details

Browse source
This commit is contained in:
Miguel Jacq 2026-06-19 20:29:12 +10:00
parent d6371ccccd
commit 7379587a28
Signed by: mig5
GPG key ID: 03906B4110AAD3B8
5 changed files with 15 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/test_manifest_puppet.py
View file

@ -800,7 +800,7 @@ def test_manifest_puppet_renders_firewall_runtime_resources(tmp_path: Path):
assert "$firewall_runtime['ipset_restore_cmd']" in fqdn_pp
def test_manifest_puppet_includes_enroll_runtime_for_firewall_notes_only(
def test_manifest_puppet_omits_firewall_runtime_when_no_rules_were_sampled(
tmp_path: Path,
):
bundle = tmp_path / "bundle"
@ -828,16 +828,7 @@ def test_manifest_puppet_includes_enroll_runtime_for_firewall_notes_only(
manifest.manifest(str(bundle), str(out), target="puppet")
site_pp = (out / "manifests" / "site.pp").read_text(encoding="utf-8")
assert "include enroll_runtime" in site_pp
assert "include firewall_runtime" in site_pp
assert site_pp.index("include enroll_runtime") < site_pp.index(
"include firewall_runtime"
)
runtime_pp = (
out / "modules" / "enroll_runtime" / "manifests" / "init.pp"
).read_text(encoding="utf-8")
firewall_pp = (
out / "modules" / "firewall_runtime" / "manifests" / "init.pp"
).read_text(encoding="utf-8")
assert "file { '/etc/enroll':" in runtime_pp
assert "require => File['/etc/enroll']," in firewall_pp
assert "include enroll_runtime" not in site_pp
assert "include firewall_runtime" not in site_pp
assert not (out / "modules" / "enroll_runtime").exists()
assert not (out / "modules" / "firewall_runtime").exists()