mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2025-09-08 14:15:30 +08:00
SOFTLAYER: Adopt diff2 in compatibility mode (#1901)
This commit is contained in:
parent
4cf4d34ca6
commit
5f2dd2fdf2
1 changed files with 30 additions and 32 deletions
|
@ -82,14 +82,17 @@ 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)
|
||||||
|
} else {
|
||||||
|
_, create, deletes, modify, err = diff.NewCompat(dc).IncrementalDiff(actual)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, del := range delete {
|
for _, del := range deletes {
|
||||||
existing := del.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
|
existing := del.Existing.Original.(datatypes.Dns_Domain_ResourceRecord)
|
||||||
corrections = append(corrections, &models.Correction{
|
corrections = append(corrections, &models.Correction{
|
||||||
Msg: del.String(),
|
Msg: del.String(),
|
||||||
|
@ -112,11 +115,6 @@ func (s *softlayerProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mo
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return corrections, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert Future diff2 version here.
|
|
||||||
|
|
||||||
return corrections, nil
|
return corrections, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue