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

DNSIMPLE: Adopt diff2 in compatibility mode (#1878)

Browse Source
This commit is contained in:
Tom Limoncelli
2023-01-03 11:58:21 -05:00
committed by GitHub
parent 347808f030
commit a498679c72
1 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
providers/dnsimple/dnsimpleProvider.go
View File

@@ -165,43 +165,46 @@ func (c *dnsimpleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
// Normalize // Normalize
models.PostProcessRecords(actual) models.PostProcessRecords(actual)
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives var create, del, modify diff.Changeset
if !diff2.EnableDiff2 {
differ := diff.New(dc) differ := diff.New(dc)
_, create, del, modify, err := differ.IncrementalDiff(actual) _, create, del, modify, err = differ.IncrementalDiff(actual)
if err != nil { } else {
return nil, err differ := diff.NewCompat(dc)
} _, create, del, modify, err = differ.IncrementalDiff(actual)
}
for _, del := range del { if err != nil {
rec := del.Existing.Original.(dnsimpleapi.ZoneRecord) return nil, err
corrections = append(corrections, &models.Correction{
Msg: del.String(),
F: c.deleteRecordFunc(rec.ID, dc.Name),
})
}
for _, cre := range create {
rec := cre.Desired
corrections = append(corrections, &models.Correction{
Msg: cre.String(),
F: c.createRecordFunc(rec, dc.Name),
})
}
for _, mod := range modify {
old := mod.Existing.Original.(dnsimpleapi.ZoneRecord)
rec := mod.Desired
corrections = append(corrections, &models.Correction{
Msg: mod.String(),
F: c.updateRecordFunc(&old, rec, dc.Name),
})
}
return corrections, nil
} }
// Insert Future diff2 version here. if err != nil {
return nil, err
}
for _, del := range del {
rec := del.Existing.Original.(dnsimpleapi.ZoneRecord)
corrections = append(corrections, &models.Correction{
Msg: del.String(),
F: c.deleteRecordFunc(rec.ID, dc.Name),
})
}
for _, cre := range create {
rec := cre.Desired
corrections = append(corrections, &models.Correction{
Msg: cre.String(),
F: c.createRecordFunc(rec, dc.Name),
})
}
for _, mod := range modify {
old := mod.Existing.Original.(dnsimpleapi.ZoneRecord)
rec := mod.Desired
corrections = append(corrections, &models.Correction{
Msg: mod.String(),
F: c.updateRecordFunc(&old, rec, dc.Name),
})
}
return corrections, nil return corrections, nil
} }