Update go modules and dnscontrol to v4.29.0

Author: nemunaire

go.mod

@@ -61,20 +61,20 @@ func DNSControlCorrectionKindFromMessage(msg string) (kind happydns.CorrectionKi
 	return
 }
 
-func DNSControlDiffByRecord(oldrrs []happydns.Record, newrrs []happydns.Record, origin string) ([]*happydns.Correction, error) {
+func DNSControlDiffByRecord(oldrrs []happydns.Record, newrrs []happydns.Record, origin string) ([]*happydns.Correction, int, error) {
 	oldrecords, err := DNSControlRRtoRC(oldrrs, origin)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	newdc, err := NewDNSControlDomainConfig(origin, newrrs)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
-	corrections, err := diff2.ByRecord(oldrecords, newdc, nil)
+	corrections, nbCorrections, err := diff2.ByRecord(oldrecords, newdc, nil)
 	if err != nil {
-		return nil, err
+		return nil, nbCorrections, err
 	}
 
 	ret := make([]*happydns.Correction, len(corrections))
@@ -85,7 +85,7 @@ func DNSControlDiffByRecord(oldrrs []happydns.Record, newrrs []happydns.Record,
 		}
 	}
 
-	return ret, nil
+	return ret, nbCorrections, nil
 }
 
 func DNSControlRRtoRC(rrs []happydns.Record, origin string) (dnscontrol.Records, error) {

go.sum

@@ -28,7 +28,7 @@ import (
 	"strings"
 
 	"github.com/StackExchange/dnscontrol/v4/models"
-	dnscontrol "github.com/StackExchange/dnscontrol/v4/providers"
+	dnscontrol "github.com/StackExchange/dnscontrol/v4/pkg/providers"
 	"github.com/miekg/dns"
 
 	"git.happydns.org/happyDomain/model"
@@ -147,7 +147,7 @@ func (p *DNSControlAdapterNSProvider) GetZoneRecords(domain string) (ret []happy
 	return
 }
 
-func (p *DNSControlAdapterNSProvider) GetZoneCorrections(domain string, rrs []happydns.Record) (ret []*happydns.Correction, err error) {
+func (p *DNSControlAdapterNSProvider) GetZoneCorrections(domain string, rrs []happydns.Record) (ret []*happydns.Correction, nbCorrections int, err error) {
 	var dc *models.DomainConfig
 	dc, err = NewDNSControlDomainConfig(strings.TrimSuffix(domain, "."), rrs)
 	if err != nil {
@@ -170,14 +170,14 @@ func (p *DNSControlAdapterNSProvider) GetZoneCorrections(domain string, rrs []ha
 	var records models.Records
 	records, err = p.DNSServiceProvider.GetZoneRecords(strings.TrimSuffix(domain, "."), nil)
 	if err != nil {
-		return nil, err
+		return nil, nbCorrections, err
 	}
 
 	// Compute needed corrections
 	var corrections []*models.Correction
-	corrections, err = p.DNSServiceProvider.GetZoneRecordsCorrections(dc, records)
+	corrections, nbCorrections, err = p.DNSServiceProvider.GetZoneRecordsCorrections(dc, records)
 	if err != nil {
-		return nil, err
+		return nil, nbCorrections, err
 	}
 
 	ret = make([]*happydns.Correction, len(corrections))
@@ -192,7 +192,7 @@ func (p *DNSControlAdapterNSProvider) GetZoneCorrections(domain string, rrs []ha
 		}
 	}
 
-	return ret, nil
+	return ret, nbCorrections, nil
 }
 
 func (p *DNSControlAdapterNSProvider) CreateDomain(fqdn string) error {
@@ -201,7 +201,7 @@ func (p *DNSControlAdapterNSProvider) CreateDomain(fqdn string) error {
 		return fmt.Errorf("Provider doesn't support domain creation.")
 	}
 
-	return zc.EnsureZoneExists(strings.TrimSuffix(fqdn, "."))
+	return zc.EnsureZoneExists(strings.TrimSuffix(fqdn, "."), nil)
 }
 
 func (p *DNSControlAdapterNSProvider) ListZones() ([]string, error) {

internal/adapters/dnscontrol-correction.go

@@ -104,7 +104,7 @@ func (zc *ZoneController) DiffZones(c *gin.Context) {
 	var corrections []*happydns.Correction
 	if c.Param("oldzoneid") == "@" {
 		var err error
-		corrections, err = zc.zoneCorrectionService.List(user, domain, newzone)
+		corrections, _, err = zc.zoneCorrectionService.List(user, domain, newzone)
 		if err != nil {
 			middleware.ErrorResponse(c, http.StatusInternalServerError, err)
 			return

internal/adapters/dnscontrol-providers.go

@@ -44,7 +44,7 @@ type ZoneRetriever interface {
 
 // ZoneCorrector is an interface for getting zone corrections.
 type ZoneCorrector interface {
-	ListZoneCorrections(provider *happydns.Provider, domain *happydns.Domain, records []happydns.Record) ([]*happydns.Correction, error)
+	ListZoneCorrections(provider *happydns.Provider, domain *happydns.Domain, records []happydns.Record) ([]*happydns.Correction, int, error)
 }
 
 type Orchestrator struct {

internal/api/controller/zone.go

@@ -76,7 +76,7 @@ func (uc *ZoneCorrectionApplierUsecase) Apply(user *happydns.User, domain *happy
 	}
 
 	nbcorrections := len(form.WantedCorrections)
-	corrections, err := uc.zoneCorrector.ListZoneCorrections(provider, domain, records)
+	corrections, _, err := uc.zoneCorrector.ListZoneCorrections(provider, domain, records)
 	if err != nil {
 		return nil, happydns.InternalError{
 			Err: fmt.Errorf("unable to compute domain corrections: %w", err),
@@ -158,15 +158,15 @@ corrections:
 	return newZone, nil
 }
 
-func (uc *ZoneCorrectionApplierUsecase) List(user *happydns.User, domain *happydns.Domain, zone *happydns.Zone) ([]*happydns.Correction, error) {
+func (uc *ZoneCorrectionApplierUsecase) List(user *happydns.User, domain *happydns.Domain, zone *happydns.Zone) ([]*happydns.Correction, int, error) {
 	provider, err := uc.providerService.GetUserProvider(user, domain.ProviderId)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	records, err := uc.listRecords.List(domain, zone)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	return uc.zoneCorrector.ListZoneCorrections(provider, domain, records)

internal/usecase/orchestrator/factory.go

@@ -38,10 +38,10 @@ func (s *Service) RetrieveZone(provider *happydns.Provider, name string) ([]happ
 }
 
 // ListZoneCorrections lists the corrections needed to synchronize the zone with the given records.
-func (s *Service) ListZoneCorrections(provider *happydns.Provider, domain *happydns.Domain, records []happydns.Record) ([]*happydns.Correction, error) {
+func (s *Service) ListZoneCorrections(provider *happydns.Provider, domain *happydns.Domain, records []happydns.Record) ([]*happydns.Correction, int, error) {
 	instance, err := provider.InstantiateProvider()
 	if err != nil {
-		return nil, fmt.Errorf("unable to instantiate provider: %w", err)
+		return nil, 0, fmt.Errorf("unable to instantiate provider: %w", err)
 	}
 
 	return instance.GetZoneCorrections(domain.DomainName, records)

internal/usecase/orchestrator/zone_correction_applier.go

@@ -58,7 +58,7 @@ func (uc *ZoneDifferUsecase) Diff(domain *happydns.Domain, newzone *happydns.Zon
 		return nil, err
 	}
 
-	corrections, err := adapter.DNSControlDiffByRecord(oldrecords, newrecords, domain.DomainName)
+	corrections, _, err := adapter.DNSControlDiffByRecord(oldrecords, newrecords, domain.DomainName)
 	if err != nil {
 		return nil, err
 	}

internal/usecase/provider/zone_operations.go

@@ -29,7 +29,7 @@ type RemoteZoneImporterUsecase interface {
 
 type ZoneCorrectionApplierUsecase interface {
 	Apply(*User, *Domain, *Zone, *ApplyZoneForm) (*Zone, error)
-	List(*User, *Domain, *Zone) ([]*Correction, error)
+	List(*User, *Domain, *Zone) ([]*Correction, int, error)
 }
 
 type ZoneImporterUsecase interface {