From a498679c7214af800321916c21c138e40389cf17 Mon Sep 17 00:00:00 2001
From: Tom Limoncelli <tlimoncelli@stackoverflow.com>
Date: Tue, 3 Jan 2023 11:58:21 -0500
Subject: [PATCH] DNSIMPLE: Adopt diff2 in compatibility mode (#1878)

---
 providers/dnsimple/dnsimpleProvider.go | 71 ++++++++++++++------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/providers/dnsimple/dnsimpleProvider.go b/providers/dnsimple/dnsimpleProvider.go
index 5f576e263..d8110a099 100644
--- a/providers/dnsimple/dnsimpleProvider.go
+++ b/providers/dnsimple/dnsimpleProvider.go
@@ -165,43 +165,46 @@ func (c *dnsimpleProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
 	// Normalize
 	models.PostProcessRecords(actual)
 
-	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(actual)
-		if err != nil {
-			return nil, err
-		}
-
-		for _, del := range del {
-			rec := del.Existing.Original.(dnsimpleapi.ZoneRecord)
-			corrections = append(corrections, &models.Correction{
-				Msg: del.String(),
-				F:   c.deleteRecordFunc(rec.ID, dc.Name),
-			})
-		}
-
-		for _, cre := range create {
-			rec := cre.Desired
-			corrections = append(corrections, &models.Correction{
-				Msg: cre.String(),
-				F:   c.createRecordFunc(rec, dc.Name),
-			})
-		}
-
-		for _, mod := range modify {
-			old := mod.Existing.Original.(dnsimpleapi.ZoneRecord)
-			rec := mod.Desired
-			corrections = append(corrections, &models.Correction{
-				Msg: mod.String(),
-				F:   c.updateRecordFunc(&old, rec, dc.Name),
-			})
-		}
-
-		return corrections, nil
+		_, create, del, modify, err = differ.IncrementalDiff(actual)
+	} else {
+		differ := diff.NewCompat(dc)
+		_, create, del, modify, err = differ.IncrementalDiff(actual)
+	}
+	if err != nil {
+		return nil, err
 	}
 
-	// Insert Future diff2 version here.
+	if err != nil {
+		return nil, err
+	}
+
+	for _, del := range del {
+		rec := del.Existing.Original.(dnsimpleapi.ZoneRecord)
+		corrections = append(corrections, &models.Correction{
+			Msg: del.String(),
+			F:   c.deleteRecordFunc(rec.ID, dc.Name),
+		})
+	}
+
+	for _, cre := range create {
+		rec := cre.Desired
+		corrections = append(corrections, &models.Correction{
+			Msg: cre.String(),
+			F:   c.createRecordFunc(rec, dc.Name),
+		})
+	}
+
+	for _, mod := range modify {
+		old := mod.Existing.Original.(dnsimpleapi.ZoneRecord)
+		rec := mod.Desired
+		corrections = append(corrections, &models.Correction{
+			Msg: mod.String(),
+			F:   c.updateRecordFunc(&old, rec, dc.Name),
+		})
+	}
 
 	return corrections, nil
 }