core/go-dns
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use typed DNS health payload

Browse source
This commit is contained in:
Virgil 2026-04-03 21:35:02 +00:00
parent 423abe4f6b
commit 02dec99c4b
2 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
service.go
View file

@ -42,6 +42,15 @@ type ReverseLookupResult struct {
Names []string `json:"names"`
}
// HealthResult is the typed payload returned by Health and dns.health.
//
// health := service.Health()
type HealthResult struct {
Status string `json:"status"`
NamesCached int `json:"names_cached"`
TreeRoot string `json:"tree_root"`
}
type Service struct {
mu sync.RWMutex
records map[string]NameRecords
@ -627,7 +636,7 @@ func (service *Service) ResolveAll(name string) (ResolveAllResult, bool) {
// Health reports the live cache size and tree root.
//
// health := service.Health()
func (service *Service) Health() map[string]any {
func (service *Service) Health() HealthResult {
service.mu.RLock()
defer service.mu.RUnlock()
@ -636,10 +645,10 @@ func (service *Service) Health() map[string]any {
treeRoot = service.chainTreeRoot
}
return map[string]any{
"status": "ready",
"names_cached": len(service.records),
"tree_root": treeRoot,
return HealthResult{
Status: "ready",
NamesCached: len(service.records),
TreeRoot: treeRoot,
}
}

36
service_test.go
View file

@ -237,9 +237,9 @@ func TestServiceHealthUsesDeterministicTreeRootAndUpdatesOnMutations(t *testing.
})
health := service.Health()
root, ok := health["tree_root"].(string)
if !ok || root == "" || root == "stubbed" {
t.Fatalf("expected computed tree root, got %#v", health["tree_root"])
root := health.TreeRoot
if root == "" || root == "stubbed" {
t.Fatalf("expected computed tree root, got %#v", health.TreeRoot)
}
healthRepeating := NewService(ServiceOptions{
@ -249,7 +249,7 @@ func TestServiceHealthUsesDeterministicTreeRootAndUpdatesOnMutations(t *testing.
A: []string{"10.0.0.1", "10.10.10.10"},
},
},
}).Health()["tree_root"].(string)
}).Health().TreeRoot
if healthRepeating != root {
t.Fatalf("expected deterministic tree root, got %s and %s", healthRepeating, root)
@ -258,14 +258,14 @@ func TestServiceHealthUsesDeterministicTreeRootAndUpdatesOnMutations(t *testing.
service.SetRecord("gateway.charon.lthn", NameRecords{
A: []string{"10.10.10.11"},
})
updatedRoot, ok := service.Health()["tree_root"].(string)
if !ok || updatedRoot == root {
updatedRoot := service.Health().TreeRoot
if updatedRoot == root {
t.Fatalf("expected updated tree root after SetRecord, got %s", updatedRoot)
}
service.RemoveRecord("gateway.charon.lthn")
removedRoot, ok := service.Health()["tree_root"].(string)
if !ok || removedRoot == updatedRoot {
removedRoot := service.Health().TreeRoot
if removedRoot == updatedRoot {
t.Fatalf("expected updated tree root after RemoveRecord, got %s", removedRoot)
}
}
@ -313,9 +313,9 @@ func TestServiceHealthUsesChainTreeRootAfterDiscovery(t *testing.T) {
}
health := service.Health()
root, ok := health["tree_root"].(string)
if !ok || root != "chain-root-1" {
t.Fatalf("expected health to expose chain tree_root, got %#v", health["tree_root"])
root := health.TreeRoot
if root != "chain-root-1" {
t.Fatalf("expected health to expose chain tree_root, got %#v", health.TreeRoot)
}
}
@ -1803,11 +1803,11 @@ func TestServiceHandleActionReverseHealthServeAndDiscover(t *testing.T) {
if !ok {
t.Fatal("expected health action payload")
}
health, ok := healthPayload.(map[string]any)
health, ok := healthPayload.(HealthResult)
if !ok {
t.Fatalf("expected health map payload, got %T", healthPayload)
t.Fatalf("expected HealthResult payload, got %T", healthPayload)
}
if health["status"] != "ready" {
if health.Status != "ready" {
t.Fatalf("unexpected health payload: %#v", health)
}
@ -1840,12 +1840,12 @@ func TestServiceHandleActionReverseHealthServeAndDiscover(t *testing.T) {
if !ok {
t.Fatal("expected discover action to succeed")
}
discoverHealth, ok := discoverPayload.(map[string]any)
discoverHealth, ok := discoverPayload.(HealthResult)
if !ok {
t.Fatalf("expected discover action payload map, got %T", discoverPayload)
t.Fatalf("expected discover action payload HealthResult, got %T", discoverPayload)
}
if discoverHealth["tree_root"] != "discover-root" {
t.Fatalf("expected discover to refresh tree root, got %#v", discoverHealth["tree_root"])
if discoverHealth.TreeRoot != "discover-root" {
t.Fatalf("expected discover to refresh tree root, got %#v", discoverHealth.TreeRoot)
}
}