diff --git a/pkg/diff2/compat.go b/pkg/diff2/compat.go deleted file mode 100644 index 9e67a76de..000000000 --- a/pkg/diff2/compat.go +++ /dev/null @@ -1,85 +0,0 @@ -package diff2 - -// import ( -// "github.com/StackExchange/dnscontrol/v3/models" -// "github.com/StackExchange/dnscontrol/v3/pkg/diff" -// ) - -// // Provide an interface that is backwards compatible with pkg/diff. - -// // // /diff/IncrementalDiffCompat(). It not as efficient as converting -// // to the diff2.By*() functions. However, using this is better than -// // staying with pkg/diff. -// func CompatIncrementalDiff(dc *models.DomainConfig, existing []*models.RecordConfig) (unchanged, create, toDelete, modify diff.Changeset, err error) { -// unchanged = diff.Changeset{} -// create = diff.Changeset{} -// toDelete = diff.Changeset{} -// modify = diff.Changeset{} - -// instructions, err := ByRecord(existing, dc, nil) -// if err != nil { -// return nil, nil, nil, nil, err -// } - -// d := diff.New(dc, nil) - -// for _, inst := range instructions { -// //cor := Correlation{d: d} -// cor := diff.Correlation{d: d} -// switch inst.Type { -// case CREATE: -// cor.Desired = inst.New[0] -// create = append(create, cor) -// case CHANGE: -// cor.Existing = inst.Old[0] -// cor.Desired = inst.New[0] -// modify = append(modify, cor) -// case DELETE: -// cor.Existing = inst.Old[0] -// toDelete = append(toDelete, cor) -// } -// } - -// return -// } - -// // func (d *Differ) ChangedGroups(existing []*models.RecordConfig) (map[models.RecordKey][]string, error) { -// // changedKeys := map[models.RecordKey][]string{} -// // _, create, toDelete, modify, err := d.IncrementalDiff(existing) -// // if err != nil { -// // return nil, err -// // } -// // for _, c := range create { -// // changedKeys[c.Desired.Key()] = append(changedKeys[c.Desired.Key()], c.String()) -// // } -// // for _, d := range toDelete { -// // changedKeys[d.Existing.Key()] = append(changedKeys[d.Existing.Key()], d.String()) -// // } -// // for _, m := range modify { -// // changedKeys[m.Desired.Key()] = append(changedKeys[m.Desired.Key()], m.String()) -// // } -// // return changedKeys, nil -// // } - -// // func (c Correlation) String() string { -// // if c.Existing == nil { -// // return fmt.Sprintf("CREATE %s %s %s", c.Desired.Type, c.Desired.GetLabelFQDN(), c.d.content(c.Desired)) -// // } -// // if c.Desired == nil { -// // return fmt.Sprintf("DELETE %s %s %s", c.Existing.Type, c.Existing.GetLabelFQDN(), c.d.content(c.Existing)) -// // } -// // return fmt.Sprintf("MODIFY %s %s: (%s) -> (%s)", c.Existing.Type, c.Existing.GetLabelFQDN(), c.d.content(c.Existing), c.d.content(c.Desired)) -// // } - -// // // get normalized content for record. target, ttl, mxprio, and specified metadata -// // func (d *Differ) content(r *models.RecordConfig) string { - -// // // get the extra values maps to add to the comparison. -// // var allMaps []map[string]string -// // for _, f := range d.extraValues { -// // valueMap := f(r) -// // allMaps = append(allMaps, valueMap) -// // } - -// // return r.ToDiffable(allMaps...) -// // } diff --git a/providers/namedotcom/records.go b/providers/namedotcom/records.go index e1e7a5024..da180141d 100644 --- a/providers/namedotcom/records.go +++ b/providers/namedotcom/records.go @@ -55,9 +55,7 @@ func (n *namedotcomProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*m models.PostProcessRecords(actual) var corrections []*models.Correction - var create, del, mod diff.Changeset - if !diff2.EnableDiff2 { differ := diff.New(dc) _, create, del, mod, err = differ.IncrementalDiff(actual)