Skip to content

fix: no-op delegated domains without state #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
intel352 merged 1 commit into from
May 21, 2026
Merged

fix: no-op delegated domains without state #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions internal/drivers/delegation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,17 @@ func (d *DelegationDriver) Delete(ctx context.Context, ref interfaces.ResourceRe
// Diff compares desired vs current. Multiset semantics on nameservers
// (order-independent — Hover accepts any order on PUT). Domain rename
// (desired vs current.ProviderID) forces Replace.
func (d *DelegationDriver) Diff(_ context.Context, desired interfaces.ResourceSpec, current *interfaces.ResourceOutput) (*interfaces.DiffResult, error) {
func (d *DelegationDriver) Diff(ctx context.Context, desired interfaces.ResourceSpec, current *interfaces.ResourceOutput) (*interfaces.DiffResult, error) {
s, err := parseDelegationSpec(desired)
if err != nil {
return nil, err
}
if current == nil {
if d.nsResolver != nil {
if ns, err := d.nsResolver(ctx, s.domain); err == nil && sameNameserverSet(ns, s.nameservers) {
return &interfaces.DiffResult{NeedsUpdate: false}, nil
}
}
return &interfaces.DiffResult{NeedsUpdate: true}, nil
}
if current.ProviderID != "" && !strings.EqualFold(s.domain, current.ProviderID) {
Expand Down Expand Up @@ -316,10 +321,10 @@ func sameNameserverSet(a, b []string) bool {
sa := make([]string, len(a))
sb := make([]string, len(b))
for i, s := range a {
sa[i] = strings.ToLower(s)
sa[i] = strings.ToLower(normalizeNameserverHost(s))
}
for i, s := range b {
sb[i] = strings.ToLower(s)
sb[i] = strings.ToLower(normalizeNameserverHost(s))
}
sort.Strings(sa)
sort.Strings(sb)
Expand Down
27 changes: 27 additions & 0 deletions internal/drivers/delegation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,33 @@ func TestDelegationDriver_Diff_NilCurrent(t *testing.T) {
}
}

func TestDelegationDriver_Diff_NilCurrent_UsesPublicNSNoop(t *testing.T) {
fc := &fakeDelegationClient{getErr: errors.New("Hover login should not be needed")}
d := NewDelegationDriverWithClientAndResolver(fc, func(_ context.Context, domain string) ([]string, error) {
if domain != "example.com" {
t.Fatalf("resolver domain = %q, want example.com", domain)
}
return []string{"ns2.digitalocean.com.", "ns1.digitalocean.com.", "ns3.digitalocean.com."}, nil
})
spec := interfaces.ResourceSpec{
Name: "example.com", Type: "infra.dns_delegation",
Config: map[string]any{
"domain": "example.com",
"nameservers": []any{"ns1.digitalocean.com", "ns2.digitalocean.com", "ns3.digitalocean.com"},
},
}
res, err := d.Diff(context.Background(), spec, nil)
if err != nil {
t.Fatalf("Diff: %v", err)
}
if res.NeedsUpdate {
t.Fatalf("expected NeedsUpdate=false when public NS already matches desired, got %+v", res)
}
if fc.getCalls != 0 {
t.Fatalf("GetDomainDelegation called %d times; public NS should avoid Hover login", fc.getCalls)
}
}

func TestDelegationDriver_Diff_UpToDate_OrderIndependent(t *testing.T) {
d := NewDelegationDriverWithClient(&fakeDelegationClient{})
spec := interfaces.ResourceSpec{
Expand Down