StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-09-07 13:44:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

SOFTLAYER: Adopt diff2 in compatibility mode (#1901)

Browse source
This commit is contained in:
Tom Limoncelli 2023-01-01 13:18:37 -05:00 • committed by GitHub
parent 4cf4d34ca6
commit 5f2dd2fdf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
providers/softlayer/softlayerProvider.go
View file

@ -82,40 +82,38 @@ func (s *softlayerProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
} }
var corrections []*models.Correction var corrections []*models.Correction
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives var create, deletes, modify diff.Changeset
if !diff2.EnableDiff2 {
_, create, delete, modify, err := diff.New(dc).IncrementalDiff(actual) _, create, deletes, modify, err = diff.New(dc).IncrementalDiff(actual)
if err != nil { } else {
return nil, err _, create, deletes, modify, err = diff.NewCompat(dc).IncrementalDiff(actual)
} }
if err != nil {
for _, del := range delete { return nil, err
existing := del.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
corrections = append(corrections, &models.Correction{
Msg: del.String(),
F: s.deleteRecordFunc(*existing.Id),
})
}
for _, cre := range create {
corrections = append(corrections, &models.Correction{
Msg: cre.String(),
F: s.createRecordFunc(cre.Desired, domain),
})
}
for _, mod := range modify {
existing := mod.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
corrections = append(corrections, &models.Correction{
Msg: mod.String(),
F: s.updateRecordFunc(&existing, mod.Desired),
})
}
return corrections, nil
} }
// Insert Future diff2 version here. for _, del := range deletes {
existing := del.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
corrections = append(corrections, &models.Correction{
Msg: del.String(),
F: s.deleteRecordFunc(*existing.Id),
})
}
for _, cre := range create {
corrections = append(corrections, &models.Correction{
Msg: cre.String(),
F: s.createRecordFunc(cre.Desired, domain),
})
}
for _, mod := range modify {
existing := mod.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
corrections = append(corrections, &models.Correction{
Msg: mod.String(),
F: s.updateRecordFunc(&existing, mod.Desired),
})
}
return corrections, nil return corrections, nil
} }