Merge pull request #12 from alexpovel/main

Add support for libdns 1.0.0

Author: brockwood

client-delete.go

@@ -33,7 +33,7 @@ func (p *Provider) deleteCloudDNSRecord(ctx context.Context, zone, name, recordT
 	rrs := dns.ResourceRecordSet{
 		Name:    fullName,
 		Rrdatas: make([]string, 0),
-		Ttl:     int64(updatedRecordList[0].TTL / time.Second),
+		Ttl:     int64(updatedRecordList[0].RR().TTL / time.Second),
 		Type:    recordType,
 	}
 	rrs.Rrdatas = updatedRecordList.prepValuesForCloudDNS()

client-get.go

@@ -2,6 +2,7 @@ package googleclouddns
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/libdns/libdns"
 	"google.golang.org/api/dns/v1"
@@ -22,7 +23,11 @@ func (p *Provider) getCloudDNSRecords(ctx context.Context, zone string) ([]libdn
 	records := make([]libdns.Record, 0)
 	if err := rrsReq.Pages(ctx, func(page *dns.ResourceRecordSetsListResponse) error {
 		for _, googleRecord := range page.Rrsets {
-			records = append(records, convertToLibDNS(googleRecord, zone)...)
+			convertedRecords, err := convertToLibDNS(googleRecord, zone)
+			if err != nil {
+				return fmt.Errorf("error converting to libdns records: %w", err)
+			}
+			records = append(records, convertedRecords...)
 		}
 		return nil
 	}); err != nil {
@@ -46,5 +51,5 @@ func (p *Provider) getCloudDNSRecord(ctx context.Context, zone, name, recordType
 	if err != nil {
 		return nil, err
 	}
-	return convertToLibDNS(rrs, zone), nil
+	return convertToLibDNS(rrs, zone)
 }

client-post.go

@@ -22,13 +22,14 @@ func (p *Provider) postCloudDNSRecord(ctx context.Context, zone string, recordsT
 	if len(recordsToSend) == 0 {
 		return nil, fmt.Errorf("no records available to add to zone %s", zone)
 	}
-	name := recordsToSend[0].Name
+	recordToSend := recordsToSend[0].RR()
+	name := recordToSend.Name
 	fullName := libdns.AbsoluteName(name, zone)
 	rrs := dns.ResourceRecordSet{
 		Name:    fullName,
 		Rrdatas: make([]string, 0),
-		Ttl:     int64(recordsToSend[0].TTL / time.Second),
-		Type:    recordsToSend[0].Type,
+		Ttl:     int64(recordToSend.TTL / time.Second),
+		Type:    recordToSend.Type,
 	}
 	rrs.Rrdatas = recordsToSend.prepValuesForCloudDNS()
 	googleRecord, err := p.service.ResourceRecordSets.Create(p.Project, gcdZone, &rrs).Context(ctx).Do()
@@ -42,5 +43,5 @@ func (p *Provider) postCloudDNSRecord(ctx context.Context, zone string, recordsT
 			return nil, err
 		}
 	}
-	return convertToLibDNS(googleRecord, zone), nil
+	return convertToLibDNS(googleRecord, zone)
 }

go.mod

@@ -1,16 +1,41 @@
 module github.com/libdns/googleclouddns
 
-go 1.15
+go 1.23.0
+
+toolchain go1.23.3
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/libdns/libdns v0.2.1
-	golang.org/x/oauth2 v0.1.0
-	google.golang.org/api v0.100.0
+	cloud.google.com/go v0.121.0
+	github.com/libdns/libdns v1.0.0
+	golang.org/x/oauth2 v0.30.0
+	google.golang.org/api v0.233.0
 )
 
 require (
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/martian/v3 v3.3.2 // indirect
-	google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
+	cloud.google.com/go/auth v0.16.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.6.0 // indirect
+	cloud.google.com/go/iam v1.5.2 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/google/martian/v3 v3.3.3 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/genproto v0.0.0-20250512202823-5a2f75b736a9 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	google.golang.org/grpc v1.72.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )

go.sum

@@ -117,8 +117,8 @@ func (p *Provider) DeleteRecords(ctx context.Context, zone string, records []lib
 
 // Interface guards
 var (
-	_ libdns.RecordGetter   = (*Provider)(nil)
-	_ libdns.RecordAppender = (*Provider)(nil)
-	_ libdns.RecordSetter   = (*Provider)(nil)
-	_ libdns.RecordDeleter  = (*Provider)(nil)
+	_ libdns.RecordGetter   = new(Provider)
+	_ libdns.RecordAppender = new(Provider)
+	_ libdns.RecordSetter   = new(Provider)
+	_ libdns.RecordDeleter  = new(Provider)
 )