Merge pull request #14 from n-rodriguez/fix/libdns1.0

Bump to libdns 1.0

Author: obynio

client.go

@@ -11,11 +11,11 @@ import (
 	"github.com/libdns/libdns"
 )
 
-func (p *Provider) setRecord(ctx context.Context, zone string, record libdns.Record, domain gandiDomain) error {
+func (p *Provider) setRecord(ctx context.Context, zone string, rr libdns.RR, domain gandiDomain) error {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, record.Name, record.Type), nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, rr.Name, rr.Type), nil)
 	if err != nil {
 		return err
 	}
@@ -31,22 +31,22 @@ func (p *Provider) setRecord(ctx context.Context, zone string, record libdns.Rec
 	// we check if the new value does not already exists and append it if not
 	var exists bool
 	for _, val := range oldGandiRecord.RRSetValues {
-		if val == record.Value {
+		if val == rr.Data {
 			exists = true
 			break
 		}
 	}
 
 	recValues := oldGandiRecord.RRSetValues
 	if !exists {
-		recValues = append(recValues, record.Value)
+		recValues = append(recValues, rr.Data)
 	}
 
 	// we just create a new record, if an existing record was found, we just append the new value to the existing ones
 	newGandiRecord := gandiRecord{
-		RRSetTTL:    int(record.TTL.Seconds()),
-		RRSetType:   record.Type,
-		RRSetName:   record.Name,
+		RRSetTTL:    int(rr.TTL.Seconds()),
+		RRSetType:   rr.Type,
+		RRSetName:   rr.Name,
 		RRSetValues: recValues,
 	}
 
@@ -56,7 +56,7 @@ func (p *Provider) setRecord(ctx context.Context, zone string, record libdns.Rec
 	}
 
 	// we update existing record or create a new record if it does not exist yet
-	req, err = http.NewRequestWithContext(ctx, "PUT", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, record.Name, record.Type), bytes.NewReader(raw))
+	req, err = http.NewRequestWithContext(ctx, "PUT", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, rr.Name, rr.Type), bytes.NewReader(raw))
 	if err != nil {
 		return err
 	}
@@ -68,11 +68,11 @@ func (p *Provider) setRecord(ctx context.Context, zone string, record libdns.Rec
 	return err
 }
 
-func (p *Provider) deleteRecord(ctx context.Context, zone string, record libdns.Record, domain gandiDomain) error {
+func (p *Provider) deleteRecord(ctx context.Context, zone string, rr libdns.RR, domain gandiDomain) error {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
-	req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, record.Name, record.Type), nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, rr.Name, rr.Type), nil)
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func (p *Provider) deleteRecord(ctx context.Context, zone string, record libdns.
 		// if it contains multiple values, the best is to update the record instead of deleting all the values
 		newRRSetValues := []string{}
 		for _, val := range rec.RRSetValues {
-			if val != record.Value {
+			if val != rr.Data {
 				newRRSetValues = append(newRRSetValues, val)
 			}
 		}
@@ -102,15 +102,15 @@ func (p *Provider) deleteRecord(ctx context.Context, zone string, record libdns.
 			return err
 		}
 
-		req, requestErr = http.NewRequestWithContext(ctx, "PUT", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, record.Name, record.Type), bytes.NewReader(raw))
+		req, requestErr = http.NewRequestWithContext(ctx, "PUT", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, rr.Name, rr.Type), bytes.NewReader(raw))
 	} else {
 		// if there is only one entry, we make sure that the value to delete is matching the one we found
 		// otherwise we may delete the wrong record
-		if strings.Trim(rec.RRSetValues[0], "\"") != record.Value {
+		if strings.Trim(rec.RRSetValues[0], "\"") != rr.Data {
 			return fmt.Errorf("LiveDNS returned a %v (%v)", http.StatusNotFound, "Can't find such a DNS value")
 		}
 
-		req, requestErr = http.NewRequestWithContext(ctx, "DELETE", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, record.Name, record.Type), nil)
+		req, requestErr = http.NewRequestWithContext(ctx, "DELETE", fmt.Sprintf("%s/%s/%s", domain.DomainRecordsHref, rr.Name, rr.Type), nil)
 	}
 
 	// we check if NewRequestWithContext threw an error

go.mod

@@ -2,4 +2,4 @@ module github.com/libdns/gandi
 
 go 1.24
 
-require github.com/libdns/libdns v0.2.3
+require github.com/libdns/libdns v1.1.0

go.sum

@@ -1,2 +1,2 @@
-github.com/libdns/libdns v0.2.3 h1:ba30K4ObwMGB/QTmqUxf3H4/GmUrCAIkMWejeGl12v8=
-github.com/libdns/libdns v0.2.3/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
+github.com/libdns/libdns v1.1.0 h1:9ze/tWvt7Df6sbhOJRB8jT33GHEHpEQXdtkE3hPthbU=
+github.com/libdns/libdns v1.1.0/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=

provider.go

@@ -38,11 +38,11 @@ func (p *Provider) GetRecords(ctx context.Context, zone string) ([]libdns.Record
 	var libRecords []libdns.Record
 	for _, rec := range gandiRecords {
 		for _, val := range rec.RRSetValues {
-			rec := libdns.Record{
-				Type:  rec.RRSetType,
-				Name:  rec.RRSetName,
-				TTL:   time.Duration(rec.RRSetTTL) * time.Second,
-				Value: val,
+			rec := libdns.RR{
+				Type: rec.RRSetType,
+				Name: rec.RRSetName,
+				TTL:  time.Duration(rec.RRSetTTL) * time.Second,
+				Data: val,
 			}
 
 			libRecords = append(libRecords, rec)
@@ -61,7 +61,7 @@ func (p *Provider) AppendRecords(ctx context.Context, zone string, records []lib
 	}
 
 	for _, rec := range records {
-		err := p.setRecord(ctx, zone, rec, domain)
+		err := p.setRecord(ctx, zone, rec.RR(), domain)
 		if err != nil {
 			return nil, err
 		}
@@ -78,7 +78,7 @@ func (p *Provider) DeleteRecords(ctx context.Context, zone string, records []lib
 	}
 
 	for _, rec := range records {
-		err := p.deleteRecord(ctx, zone, rec, domain)
+		err := p.deleteRecord(ctx, zone, rec.RR(), domain)
 		if err != nil {
 			return nil, err
 		}
@@ -96,7 +96,7 @@ func (p *Provider) SetRecords(ctx context.Context, zone string, records []libdns
 	}
 
 	for _, rec := range records {
-		err := p.setRecord(ctx, zone, rec, domain)
+		err := p.setRecord(ctx, zone, rec.RR(), domain)
 		if err != nil {
 			return nil, err
 		}