StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-02-24 15:43:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

OVH: Adopt diff2 (#1861)

Browse source
This commit is contained in:
Brice Figureau 2022-12-19 16:21:54 +01:00 committed by GitHub
parent 7ad98a67f9
commit 6947388dc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 84 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
providers/ovh/ovhProvider.go
View file

@ -118,8 +118,12 @@ func (c *ovhProvider) GetZoneRecords(domain string) (models.Records, error) {
}
func (c *ovhProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
dc.Punycode()
//dc.CombineMXs()
var err error
err = dc.Punycode()
if err != nil {
return nil, err
}
actual, err := c.GetZoneRecords(dc.Name)
if err != nil {
@ -130,7 +134,30 @@ func (c *ovhProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.C
models.PostProcessRecords(actual)
var corrections []*models.Correction
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives
if !diff2.EnableDiff2 {
corrections, err = c.getDiff1DomainCorrections(dc, actual)
} else {
corrections, err = c.getDiff2DomainCorrections(dc, actual)
}
if err != nil {
return nil, err
}
if len(corrections) > 0 {
corrections = append(corrections, &models.Correction{
Msg: "REFRESH zone " + dc.Name,
F: func() error {
return c.refreshZone(dc.Name)
},
})
}
return corrections, nil
}
func (c *ovhProvider) getDiff1DomainCorrections(dc *models.DomainConfig, actual models.Records) ([]*models.Correction, error) {
var corrections []*models.Correction
differ := diff.New(dc)
_, create, delete, modify, err := differ.IncrementalDiff(actual)
@ -162,21 +189,36 @@ func (c *ovhProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.C
F: c.updateRecordFunc(oldR, newR, dc.Name),
})
}
if len(corrections) > 0 {
corrections = append(corrections, &models.Correction{
Msg: "REFRESH zone " + dc.Name,
F: func() error {
return c.refreshZone(dc.Name)
},
})
}
return corrections, nil
}
// Insert Future diff2 version here.
func (c *ovhProvider) getDiff2DomainCorrections(dc *models.DomainConfig, actual models.Records) ([]*models.Correction, error) {
var corrections []*models.Correction
instructions, err := diff2.ByRecord(actual, dc, nil)
if err != nil {
return nil, err
}
for _, inst := range instructions {
switch inst.Type {
case diff2.CHANGE:
corrections = append(corrections, &models.Correction{
Msg: inst.Msgs[0],
F: c.updateRecordFunc(inst.Old[0].Original.(*Record), inst.New[0], dc.Name),
})
case diff2.CREATE:
corrections = append(corrections, &models.Correction{
Msg: inst.Msgs[0],
F: c.createRecordFunc(inst.New[0], dc.Name),
})
case diff2.DELETE:
rec := inst.Old[0].Original.(*Record)
corrections = append(corrections, &models.Correction{
Msg: inst.Msgs[0],
F: c.deleteRecordFunc(rec.ID, dc.Name),
})
}
}
return corrections, nil
}