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

CHORE: Fix broken merge (#1957)

Browse Source
This commit is contained in:
Tom Limoncelli
2023-01-19 16:41:17 -05:00
committed by GitHub
parent 8c8d08b72f
commit f4388dd6ad
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
providers/hostingde/hostingdeProvider.go
View File

@@ -130,11 +130,10 @@ func (hp *hostingdeProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*m
var create, del, mod diff.Changeset var create, del, mod diff.Changeset
if !diff2.EnableDiff2 { if !diff2.EnableDiff2 {
differ = diff.New(dc) _, create, del, mod, err = diff.New(dc).IncrementalDiff(records)
} else { } else {
differ = diff.NewCompat(dc) _, create, del, mod, err = diff.NewCompat(dc).IncrementalDiff(records)
} }
_, create, del, mod, err = differ.IncrementalDiff(records)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -153,7 +152,7 @@ func (hp *hostingdeProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*m
return nil, nil return nil, nil
} }
corrections = []*models.Correction{ corrections := []*models.Correction{
{ {
Msg: fmt.Sprintf("\n%s", strings.Join(msg, "\n")), Msg: fmt.Sprintf("\n%s", strings.Join(msg, "\n")),
F: func() error { F: func() error {
@@ -176,24 +175,6 @@ func (hp *hostingdeProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*m
}, },
} }
msg := []string{}
for _, c := range append(del, append(create, mod...)...) {
msg = append(msg, c.String())
}
if len(create) == 0 && len(del) == 0 && len(mod) == 0 {
return nil, nil
}
corrections := []*models.Correction{
{
Msg: fmt.Sprintf("\n%s", strings.Join(msg, "\n")),
F: func() error {
return hp.updateRecords(dc.Name, create, del, mod)
},
},
}
return corrections, nil return corrections, nil
} }