mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2025-09-11 07:34:32 +08:00
EXOSCALE: Adopt diff2 in compatibility mode (#1881)
This commit is contained in:
parent
46d5666df7
commit
43af16aad2
1 changed files with 33 additions and 34 deletions
|
@ -191,43 +191,42 @@ func (c *exoscaleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
|
|||
models.PostProcessRecords(existingRecords)
|
||||
|
||||
var corrections []*models.Correction
|
||||
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives
|
||||
|
||||
var create, delete, modify diff.Changeset
|
||||
if !diff2.EnableDiff2 {
|
||||
differ := diff.New(dc)
|
||||
_, create, delete, modify, err := differ.IncrementalDiff(existingRecords)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, del := range delete {
|
||||
record := del.Existing.Original.(*egoscale.DNSDomainRecord)
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: del.String(),
|
||||
F: c.deleteRecordFunc(*record.ID, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
for _, cre := range create {
|
||||
rc := cre.Desired
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: cre.String(),
|
||||
F: c.createRecordFunc(rc, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
for _, mod := range modify {
|
||||
old := mod.Existing.Original.(*egoscale.DNSDomainRecord)
|
||||
new := mod.Desired
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: mod.String(),
|
||||
F: c.updateRecordFunc(old, new, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
return corrections, nil
|
||||
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
|
||||
} else {
|
||||
differ := diff.NewCompat(dc)
|
||||
_, create, delete, modify, err = differ.IncrementalDiff(existingRecords)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Insert Future diff2 version here.
|
||||
for _, del := range delete {
|
||||
record := del.Existing.Original.(*egoscale.DNSDomainRecord)
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: del.String(),
|
||||
F: c.deleteRecordFunc(*record.ID, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
for _, cre := range create {
|
||||
rc := cre.Desired
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: cre.String(),
|
||||
F: c.createRecordFunc(rc, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
for _, mod := range modify {
|
||||
old := mod.Existing.Original.(*egoscale.DNSDomainRecord)
|
||||
new := mod.Desired
|
||||
corrections = append(corrections, &models.Correction{
|
||||
Msg: mod.String(),
|
||||
F: c.updateRecordFunc(old, new, domainID),
|
||||
})
|
||||
}
|
||||
|
||||
return corrections, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue