mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

BUG: Fix all err scopes (#2160)

Browse Source
This commit is contained in:
Tom Limoncelli
2023-03-13 14:19:19 -04:00
committed by GitHub
parent f19225f8d4
commit 0491aadd36
19 changed files with 62 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
providers/axfrddns/axfrddnsProvider.go
View File

@@ -352,13 +352,13 @@ func (c *axfrddnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
var corrections []*models.Correction
var create, del, mod diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
differ = diff.NewCompat(dc)
}
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
if err != nil {
return nil, err
}

6
providers/desec/desecProvider.go
View File

@@ -169,11 +169,9 @@ func (c *desecProvider) GenerateDomainCorrections(dc *models.DomainConfig, exist
var keysToUpdate map[models.RecordKey][]string
if !diff2.EnableDiff2 {
// diff existing vs. current.
differ := diff.New(dc)
keysToUpdate, err = differ.ChangedGroups(existing)
keysToUpdate, err = (diff.New(dc)).ChangedGroups(existing)
} else {
differ := diff.NewCompat(dc)
keysToUpdate, err = differ.ChangedGroups(existing)
keysToUpdate, err = (diff.NewCompat(dc)).ChangedGroups(existing)
}
if err != nil {
return nil, err

8
providers/dnsimple/dnsimpleProvider.go
View File

@@ -166,13 +166,13 @@ func (c *dnsimpleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
models.PostProcessRecords(actual)
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(actual)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(actual)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(actual)
if err != nil {
return nil, err
}

8
providers/dnsmadeeasy/dnsMadeEasyProvider.go
View File

@@ -103,13 +103,13 @@ func (api *dnsMadeEasyProvider) GetDomainCorrections(dc *models.DomainConfig) ([
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/domainnameshop/dns.go
View File

@@ -49,13 +49,13 @@ func (api *domainNameShopProvider) GetDomainCorrections(dc *models.DomainConfig)
var corrections []*models.Correction
var create, delete, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/exoscale/exoscaleProvider.go
View File

@@ -192,13 +192,13 @@ func (c *exoscaleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
var corrections []*models.Correction
var create, delete, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/hetzner/hetznerProvider.go
View File

@@ -104,13 +104,13 @@ func (api *hetznerProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/hexonet/records.go
View File

@@ -76,13 +76,13 @@ func (n *HXClient) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Corr
var corrections []*models.Correction
var create, del, mod diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, mod, err = differ.IncrementalDiff(actual)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, mod, err = differ.IncrementalDiff(actual)
differ = diff.NewCompat(dc)
}
_, create, del, mod, err = differ.IncrementalDiff(actual)
if err != nil {
return nil, err
}

8
providers/inwx/inwxProvider.go
View File

@@ -244,13 +244,13 @@ func (api *inwxAPI) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Cor
var corrections []*models.Correction
var create, del, mod diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
differ = diff.NewCompat(dc)
}
_, create, del, mod, err = differ.IncrementalDiff(foundRecords)
if err != nil {
return nil, err
}

8
providers/linode/linodeProvider.go
View File

@@ -158,13 +158,13 @@ func (api *linodeProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

2
providers/luadns/luadnsProvider.go
View File

@@ -7,9 +7,7 @@ import (
"github.com/StackExchange/dnscontrol/v3/models"
"github.com/StackExchange/dnscontrol/v3/pkg/diff"
"github.com/StackExchange/dnscontrol/v3/pkg/diff2"
// "github.com/StackExchange/dnscontrol/v3/pkg/transform"
"github.com/StackExchange/dnscontrol/v3/providers"
// "github.com/miekg/dns/dnsutil"
)
/*

8
providers/namecheap/namecheapProvider.go
View File

@@ -192,13 +192,13 @@ func (n *namecheapProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
models.PostProcessRecords(actual)
var create, delete, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, delete, modify, err = differ.IncrementalDiff(actual)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, delete, modify, err = differ.IncrementalDiff(actual)
differ = diff.NewCompat(dc)
}
_, create, delete, modify, err = differ.IncrementalDiff(actual)
if err != nil {
return nil, err
}

8
providers/netcup/netcupProvider.go
View File

@@ -103,13 +103,13 @@ func (api *netcupProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/netlify/netlifyProvider.go
View File

@@ -193,13 +193,13 @@ func (n *netlifyProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mode
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(records)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(records)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(records)
if err != nil {
return nil, err
}

8
providers/oracle/oracleProvider.go
View File

@@ -241,13 +241,13 @@ func (o *oracleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*model
}
var create, dels, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/packetframe/packetframeProvider.go
View File

@@ -126,13 +126,13 @@ func (api *packetframeProvider) GetDomainCorrections(dc *models.DomainConfig) ([
var corrections []*models.Correction
var create, dels, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, dels, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}

8
providers/rwth/dns.go
View File

@@ -54,13 +54,13 @@ func (api *rwthProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*model
var corrections []*models.Correction
var create, del, modify diff.Changeset
var differ diff.Differ
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.New(dc)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
differ = diff.NewCompat(dc)
}
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}