Fix duplicate entries #1

Author: gjung56

client.go

@@ -20,7 +20,7 @@ type Client struct {
 
 // Ovh zone record implementation
 type OvhDomainZoneRecord struct {
-	ID 			int64  `json:"id,omitempty"`
+	ID			int64  `json:"id,omitempty"`
 	Zone 		string `json:"zone,omitempty"`
 	SubDomain 	string `json:"subDomain"`
 	FieldType 	string `json:"fieldType,omitempty"`
@@ -34,7 +34,7 @@ type OvhDomainZoneSOA struct {
 	Email 			string  `json:"email"`
 	Serial 			int64  `json:"serial"`
 	Refresh 		int64  `json:"refresh"`
-	NxDomainTTL 	int64  `json:"nxDomainTtl"`
+	NxDomainTTL		int64  `json:"nxDomainTtl"`
 	Expire 			int64  `json:"expire"`
 	TTL 			int64  `json:"ttl"`
 }
@@ -126,12 +126,57 @@ func (p *Provider) createRecord(ctx context.Context, zone string, record libdns.
 // createOrUpdateRecord creates or updates a record, either by updating existing record or creating new one.
 func (p *Provider) createOrUpdateRecord(ctx context.Context, zone string, record libdns.Record) (libdns.Record, error) {
 	if len(record.ID) == 0 {
+		// lookup for existing records
+		// if we find one, update it
+		// if we find multiple, delete them and recreate the final one
+		existingIDs, err := p.lookupRecordIDs(ctx, zone, record.Type, normalizeRecordName(record.Name, zone))
+		if err != nil {
+			return libdns.Record{}, err
+		}
+		if len(existingIDs) == 1 {
+			record.ID = strconv.FormatInt(existingIDs[0], 10)
+			return p.updateRecord(ctx, zone, record)
+		} else if len(existingIDs) > 1 {
+			for _, eid := range existingIDs {
+				if err := p.deleteRecordID(ctx, zone, strconv.FormatInt(eid, 10)); err != nil {
+					return libdns.Record{}, err
+				}
+			}
+		}
+
 		return p.createRecord(ctx, zone, record)
 	}
 
 	return p.updateRecord(ctx, zone, record)
 }
 
+func (p *Provider) lookupRecordIDs(ctx context.Context, zone string, recordType string, recordName string) ([]int64, error) {
+	p.client.mutex.Lock()
+	defer p.client.mutex.Unlock()
+
+	if err := p.setupClient(); err != nil {
+		return nil, err
+	}
+
+	var res []int64
+	if err := p.client.ovhClient.GetWithContext(ctx, fmt.Sprintf("/domain/zone/%s/record?fieldType=%s&subDomain=%s", zone, recordType, recordName), &res); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
+func (p *Provider) deleteRecordID(ctx context.Context, zone string, recordID string) error {
+	p.client.mutex.Lock()
+	defer p.client.mutex.Unlock()
+
+	if err := p.setupClient(); err != nil {
+		return err
+	}
+
+	return p.client.ovhClient.DeleteWithContext(ctx, fmt.Sprintf("/domain/zone/%s/record/%s", zone, recordID), nil);
+}
+
 // updateRecord updates a record
 func (p *Provider) updateRecord(ctx context.Context, zone string, record libdns.Record) (libdns.Record, error) {
 	p.client.mutex.Lock()

go.mod

@@ -1,8 +1,10 @@
 module github.com/libdns/ovh
 
-go 1.14
+go 1.18
 
 require (
 	github.com/libdns/libdns v0.2.1
-	github.com/ovh/go-ovh v1.1.0
+	github.com/ovh/go-ovh v1.3.0
 )
+
+require gopkg.in/ini.v1 v1.57.0 // indirect

go.sum

@@ -4,8 +4,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=
 github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
-github.com/ovh/go-ovh v1.1.0 h1:bHXZmw8nTgZin4Nv7JuaLs0KG5x54EQR7migYTd1zrk=
-github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
+github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ=
+github.com/ovh/go-ovh v1.3.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=

provider.go

@@ -9,8 +9,8 @@ import (
 // Provider facilitates DNS record manipulation with OVH.
 type Provider struct {
 	Endpoint 			string `json:"endpoint,omitempty"`
-	ApplicationKey 		string `json:"application_key,omitempty"`
-	ApplicationSecret 	string `json:"application_secret,omitempty"`
+	ApplicationKey		string `json:"application_key,omitempty"`
+	ApplicationSecret	string `json:"application_secret,omitempty"`
 	ConsumerKey 		string `json:"consumer_key,omitempty"`
 	client 				Client
 }

provider_test.go

@@ -13,12 +13,12 @@ import (
 )
 
 var (
-	endPoint 			= ""
-	applicationKey 		= ""
-	applicationSecret 	= ""
-	consumerKey 		= ""
-	zone 				= ""
-	ttl 				= time.Duration(120 * time.Second)
+	endPoint			= ""
+	applicationKey		= ""
+	applicationSecret	= ""
+	consumerKey			= ""
+	zone				= ""
+	ttl					= time.Duration(120 * time.Second)
 )
 
 func TestMain(m *testing.M) {
@@ -57,7 +57,7 @@ func setupTestRecords(t *testing.T, p *ovh.Provider) ([]libdns.Record, testRecor
 		},
 	}
 
-	records, err := p.AppendRecords(context.TODO(), zone, testRecords)
+	records, err := p.SetRecords(context.TODO(), zone, testRecords)
 	if err != nil {
 		t.Fatal(err)
 		return nil, func() {}
@@ -155,20 +155,20 @@ func Test_SetRecords(t *testing.T) {
 	newTestRecords := []libdns.Record{
 		{
 			Type:  "TXT",
-			Name:  "new_test1",
-			Value: "new_test1",
+			Name:  "newtest1",
+			Value: "newtest1",
 			TTL:   ttl,
 		},
 		{
 			Type:  "TXT",
-			Name:  "new_test2",
-			Value: "new_test2",
+			Name:  "newtest2",
+			Value: "newtest2",
 			TTL:   ttl,
 		},
 	}
 
 	allRecords := append(existingRecords, newTestRecords...)
-	allRecords[0].Value = "new_value"
+	allRecords[0].Value = "newvalue"
 
 	records, err := p.SetRecords(context.TODO(), zone, allRecords)
 	if err != nil {
@@ -180,8 +180,8 @@ func Test_SetRecords(t *testing.T) {
 		t.Fatalf("len(records) != len(allRecords) => %d != %d", len(records), len(allRecords))
 	}
 
-	if records[0].Value != "new_value" {
-		t.Fatalf(`records[0].Value != "new_value" => %s != "new_value"`, records[0].Value)
+	if records[0].Value != "newvalue" {
+		t.Fatalf(`records[0].Value != "newvalue" => %s != "newvalue"`, records[0].Value)
 	}
 }