Merge pull request #4071 from exoscale/predrag/sc-82055/external-dns-…

…reduce-the-api-calls-rate Exoscale provider optimization
kubernetes-sigs · Jan 5, 2024 · 8a1bf65 · 8a1bf65
2 parents 7bb79a3 + a5cd0d6
commit 8a1bf65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/provider/exoscale/exoscale.go b/provider/exoscale/exoscale.go
@@ -33,7 +33,6 @@ import (
 type EgoscaleClientI interface {
 	ListDNSDomainRecords(context.Context, string, string) ([]egoscale.DNSDomainRecord, error)
 	ListDNSDomains(context.Context, string) ([]egoscale.DNSDomain, error)
-	GetDNSDomainRecord(context.Context, string, string, string) (*egoscale.DNSDomainRecord, error)
 	CreateDNSDomainRecord(context.Context, string, string, *egoscale.DNSDomainRecord) (*egoscale.DNSDomainRecord, error)
 	DeleteDNSDomainRecord(context.Context, string, string, *egoscale.DNSDomainRecord) error
 	UpdateDNSDomainRecord(context.Context, string, string, *egoscale.DNSDomainRecord) error
@@ -160,24 +159,19 @@ func (ep *ExoscaleProvider) ApplyChanges(ctx context.Context, changes *plan.Chan
 			return err
 		}
 
-		for _, r := range records {
-			if *r.Name != name {
+		for _, record := range records {
+			if *record.Name != name {
 				continue
 			}
 
-			record, err := ep.client.GetDNSDomainRecord(ctx, ep.apiZone, zoneID, *r.ID)
-			if err != nil {
-				return err
-			}
-
 			record.Type = &epoint.RecordType
 			record.Content = &epoint.Targets[0]
 			if epoint.RecordTTL != 0 {
 				ttl := int64(epoint.RecordTTL)
 				record.TTL = &ttl
 			}
 
-			err = ep.client.UpdateDNSDomainRecord(ctx, ep.apiZone, zoneID, record)
+			err = ep.client.UpdateDNSDomainRecord(ctx, ep.apiZone, zoneID, &record)
 			if err != nil {
 				return err
 			}
@@ -240,19 +234,15 @@ func (ep *ExoscaleProvider) Records(ctx context.Context) ([]*endpoint.Endpoint,
 			return nil, err
 		}
 
-		for _, r := range records {
-			record, err := ep.client.GetDNSDomainRecord(ctx, ep.apiZone, *domain.ID, *r.ID)
-			if err != nil {
-				return nil, err
-			}
+		for _, record := range records {
 			switch *record.Type {
 			case "A", "CNAME", "TXT":
 				break
 			default:
 				continue
 			}
 
-			e := endpoint.NewEndpointWithTTL((*record.Name)+"."+(*domain.UnicodeName), *record.Type, endpoint.TTL(*r.TTL), *record.Content)
+			e := endpoint.NewEndpointWithTTL((*record.Name)+"."+(*domain.UnicodeName), *record.Type, endpoint.TTL(*record.TTL), *record.Content)
 			endpoints = append(endpoints, e)
 		}
 	}

diff --git a/provider/exoscale/exoscale_test.go b/provider/exoscale/exoscale_test.go
@@ -18,7 +18,6 @@ package exoscale
 
 import (
 	"context"
-	"errors"
 	"testing"
 
 	egoscale "github.com/exoscale/egoscale/v2"
@@ -93,17 +92,6 @@ func (ep *ExoscaleClientStub) ListDNSDomainRecords(ctx context.Context, _, domai
 	return groups[domainID], nil
 }
 
-func (ep *ExoscaleClientStub) GetDNSDomainRecord(ctx context.Context, _, domainID, recordID string) (*egoscale.DNSDomainRecord, error) {
-	group := groups[domainID]
-	for _, record := range group {
-		if *record.ID == recordID {
-			return &record, nil
-		}
-	}
-
-	return nil, errors.New("not found")
-}
-
 func (ep *ExoscaleClientStub) CreateDNSDomainRecord(ctx context.Context, _, domainID string, record *egoscale.DNSDomainRecord) (*egoscale.DNSDomainRecord, error) {
 	createExoscale = append(createExoscale, createRecordExoscale{domainID: domainID, record: record})
 	return record, nil