Refactor architecture: extract reconciler, add interfaces, reduce complexity, improve test coverage
Architecture: - Extract reconcileNetworking into internal/reconcile package with 7 consumer-side interfaces - Add locked modifyState helper to fix state.yaml read-modify-write race condition - Extract CrowdSec and VPN handler groups with interfaces documenting dependency surface - Replace raw map[string]any YAML manipulation with typed AddDHCPStaticLease/RemoveDHCPStaticLease - Extract Cloudflare API functions into cfClient struct, eliminating repeated auth boilerplate Complexity reduction: - haproxy.GenerateWithOpts: 50 → 6 (extracted 8 focused helpers) - reconcile.Reconcile: 42 → 11 (extracted buildRoutes, buildDNSEntries, writeHAProxyConfig) - AutheliaUpdateConfig: 25 → 10 (extracted enableAuthelia/disableAuthelia) Test coverage improvements: - reconcile: 4.5% → 56.8% (stub-based tests for route building, DNS entries, orchestration) - dnsfilter: 10.7% → 45.6% (Manager.Compile, AddList, ToggleList, custom entries) - config: 67.3% → 89.8% (DHCP static lease mutation tests)
This commit is contained in:
@@ -266,3 +266,53 @@ func TestState_RoundTrip(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddDHCPStaticLease_New(t *testing.T) {
|
||||
s := &State{}
|
||||
s.AddDHCPStaticLease(DHCPStaticLease{MAC: "aa:bb:cc:dd:ee:ff", IP: "192.168.1.100", Hostname: "host1"})
|
||||
|
||||
if len(s.Cloud.Dnsmasq.DHCP.StaticLeases) != 1 {
|
||||
t.Fatalf("expected 1 lease, got %d", len(s.Cloud.Dnsmasq.DHCP.StaticLeases))
|
||||
}
|
||||
l := s.Cloud.Dnsmasq.DHCP.StaticLeases[0]
|
||||
if l.MAC != "aa:bb:cc:dd:ee:ff" || l.IP != "192.168.1.100" || l.Hostname != "host1" {
|
||||
t.Errorf("lease mismatch: %+v", l)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddDHCPStaticLease_ReplaceByMAC(t *testing.T) {
|
||||
s := &State{}
|
||||
s.AddDHCPStaticLease(DHCPStaticLease{MAC: "aa:bb:cc:dd:ee:ff", IP: "192.168.1.100"})
|
||||
s.AddDHCPStaticLease(DHCPStaticLease{MAC: "aa:bb:cc:dd:ee:ff", IP: "192.168.1.200"})
|
||||
|
||||
if len(s.Cloud.Dnsmasq.DHCP.StaticLeases) != 1 {
|
||||
t.Fatalf("expected 1 lease after replace, got %d", len(s.Cloud.Dnsmasq.DHCP.StaticLeases))
|
||||
}
|
||||
if s.Cloud.Dnsmasq.DHCP.StaticLeases[0].IP != "192.168.1.200" {
|
||||
t.Errorf("expected IP to be updated to 192.168.1.200, got %s", s.Cloud.Dnsmasq.DHCP.StaticLeases[0].IP)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemoveDHCPStaticLease_Exists(t *testing.T) {
|
||||
s := &State{}
|
||||
s.AddDHCPStaticLease(DHCPStaticLease{MAC: "aa:bb:cc:dd:ee:ff", IP: "192.168.1.100"})
|
||||
s.AddDHCPStaticLease(DHCPStaticLease{MAC: "11:22:33:44:55:66", IP: "192.168.1.101"})
|
||||
|
||||
found := s.RemoveDHCPStaticLease("aa:bb:cc:dd:ee:ff")
|
||||
if !found {
|
||||
t.Error("expected RemoveDHCPStaticLease to return true")
|
||||
}
|
||||
if len(s.Cloud.Dnsmasq.DHCP.StaticLeases) != 1 {
|
||||
t.Fatalf("expected 1 lease remaining, got %d", len(s.Cloud.Dnsmasq.DHCP.StaticLeases))
|
||||
}
|
||||
if s.Cloud.Dnsmasq.DHCP.StaticLeases[0].MAC != "11:22:33:44:55:66" {
|
||||
t.Error("wrong lease was removed")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRemoveDHCPStaticLease_NotFound(t *testing.T) {
|
||||
s := &State{}
|
||||
found := s.RemoveDHCPStaticLease("nonexistent")
|
||||
if found {
|
||||
t.Error("expected RemoveDHCPStaticLease to return false for missing MAC")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user