1
0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00

DNSMADEEASY: Adopt diff2 in compatibility mode (#1879)

This commit is contained in:
Tom Limoncelli
2023-02-27 19:53:01 -05:00
committed by GitHub
parent f995f21d0e
commit bdeeb2cf1b

View File

@@ -102,77 +102,76 @@ func (api *dnsMadeEasyProvider) GetDomainCorrections(dc *models.DomainConfig) ([
txtutil.SplitSingleLongTxt(dc.Records) // Autosplit long TXT records
var corrections []*models.Correction
if !diff2.EnableDiff2 || true { // Remove "|| true" when diff2 version arrives
var create, del, modify diff.Changeset
if !diff2.EnableDiff2 {
differ := diff.New(dc)
_, create, del, modify, err := differ.IncrementalDiff(existingRecords)
if err != nil {
return nil, err
}
var deleteRecordIds []int
deleteDescription := []string{"Batch deletion of records:"}
for _, m := range del {
originalRecordID := m.Existing.Original.(*recordResponseDataEntry).ID
deleteRecordIds = append(deleteRecordIds, originalRecordID)
deleteDescription = append(deleteDescription, m.String())
}
if len(deleteRecordIds) > 0 {
corr := &models.Correction{
Msg: strings.Join(deleteDescription, "\n\t"),
F: func() error {
return api.deleteRecords(domain.ID, deleteRecordIds)
},
}
corrections = append(corrections, corr)
}
var createRecords []recordRequestData
createDescription := []string{"Batch creation of records:"}
for _, m := range create {
record := fromRecordConfig(m.Desired)
createRecords = append(createRecords, *record)
createDescription = append(createDescription, m.String())
}
if len(createRecords) > 0 {
corr := &models.Correction{
Msg: strings.Join(createDescription, "\n\t"),
F: func() error {
return api.createRecords(domain.ID, createRecords)
},
}
corrections = append(corrections, corr)
}
var modifyRecords []recordRequestData
modifyDescription := []string{"Batch modification of records:"}
for _, m := range modify {
originalRecord := m.Existing.Original.(*recordResponseDataEntry)
record := fromRecordConfig(m.Desired)
record.ID = originalRecord.ID
record.GtdLocation = originalRecord.GtdLocation
modifyRecords = append(modifyRecords, *record)
modifyDescription = append(modifyDescription, m.String())
}
if len(modifyRecords) > 0 {
corr := &models.Correction{
Msg: strings.Join(modifyDescription, "\n\t"),
F: func() error {
return api.updateRecords(domain.ID, modifyRecords)
},
}
corrections = append(corrections, corr)
}
return corrections, nil
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
} else {
differ := diff.NewCompat(dc)
_, create, del, modify, err = differ.IncrementalDiff(existingRecords)
}
if err != nil {
return nil, err
}
// Insert Future diff2 version here.
var deleteRecordIds []int
deleteDescription := []string{"Batch deletion of records:"}
for _, m := range del {
originalRecordID := m.Existing.Original.(*recordResponseDataEntry).ID
deleteRecordIds = append(deleteRecordIds, originalRecordID)
deleteDescription = append(deleteDescription, m.String())
}
if len(deleteRecordIds) > 0 {
corr := &models.Correction{
Msg: strings.Join(deleteDescription, "\n\t"),
F: func() error {
return api.deleteRecords(domain.ID, deleteRecordIds)
},
}
corrections = append(corrections, corr)
}
var createRecords []recordRequestData
createDescription := []string{"Batch creation of records:"}
for _, m := range create {
record := fromRecordConfig(m.Desired)
createRecords = append(createRecords, *record)
createDescription = append(createDescription, m.String())
}
if len(createRecords) > 0 {
corr := &models.Correction{
Msg: strings.Join(createDescription, "\n\t"),
F: func() error {
return api.createRecords(domain.ID, createRecords)
},
}
corrections = append(corrections, corr)
}
var modifyRecords []recordRequestData
modifyDescription := []string{"Batch modification of records:"}
for _, m := range modify {
originalRecord := m.Existing.Original.(*recordResponseDataEntry)
record := fromRecordConfig(m.Desired)
record.ID = originalRecord.ID
record.GtdLocation = originalRecord.GtdLocation
modifyRecords = append(modifyRecords, *record)
modifyDescription = append(modifyDescription, m.String())
}
if len(modifyRecords) > 0 {
corr := &models.Correction{
Msg: strings.Join(modifyDescription, "\n\t"),
F: func() error {
return api.updateRecords(domain.ID, modifyRecords)
},
}
corrections = append(corrections, corr)
}
return corrections, nil
}