mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2026-05-04 22:26:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unused field

Browse Source
This commit is contained in:
Andrew Hay 2025-02-01 19:24:29 +00:00
parent cf1bc0b14b
commit 2ff8fb4981
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
provider/cloudflare/cloudflare.go
View File

@ -331,16 +331,16 @@ func (p *CloudFlareProvider) submitChanges(ctx context.Context, changes []*cloud
log.Info("All records are already up to date")
return nil
}
log.Info("Applying changes to zone.")
zones, err := p.Zones(ctx)
if err != nil {
return err
}
// separate into per-zone change sets to be passed to the API.
changesByZone := p.changesByZone(zones, changes)
var failedZones []string
for zoneID, changes := range changesByZone {
log.Info("Processing zone: ", zoneID)
records, err := p.listDNSRecordsWithAutoPagination(ctx, zoneID)
if err != nil {
return fmt.Errorf("could not fetch records from zone, %v", err)
@ -355,6 +355,7 @@ func (p *CloudFlareProvider) submitChanges(ctx context.Context, changes []*cloud
"action": change.Action,
"zone": zoneID,
}
log.Info("Processing change: ", logFields)
log.WithFields(logFields).Info("Changing record.")
@ -365,18 +366,21 @@ func (p *CloudFlareProvider) submitChanges(ctx context.Context, changes []*cloud
resourceContainer := cloudflare.ZoneIdentifier(zoneID)
if change.Action == cloudFlareUpdate {
recordID := p.getRecordID(records, change.ResourceRecord)
log.Info("Updating record: ", recordID)
if recordID == "" {
log.WithFields(logFields).Errorf("failed to find previous record: %v", change.ResourceRecord)
continue
}
recordParam := updateDNSRecordParam(*change)
regionalHostnameParam := updateDataLocalizationRegionalHostnameParams(*change)
log.Info("recordParam: ", recordParam)
recordParam.ID = recordID
err := p.Client.UpdateDNSRecord(ctx, resourceContainer, recordParam)
if err != nil {
failedChange = true
log.WithFields(logFields).Errorf("failed to update record: %v", err)
}
regionalHostnameParam := updateDataLocalizationRegionalHostnameParams(*change)
log.Info("regionalHostnameParam: ", regionalHostnameParam)
regionalHostnameErr := p.Client.UpdateDataLocalizationRegionalHostname(ctx, resourceContainer, regionalHostnameParam)
if regionalHostnameErr != nil {
failedChange = true
@ -402,7 +406,7 @@ func (p *CloudFlareProvider) submitChanges(ctx context.Context, changes []*cloud
}
}
}
log.Info("Changes submitted.")
if failedChange {
failedZones = append(failedZones, zoneID)
}
@ -453,7 +457,14 @@ func (p *CloudFlareProvider) changesByZone(zones []cloudflare.Zone, changeSet []
}
func (p *CloudFlareProvider) getRecordID(records []cloudflare.DNSRecord, record cloudflare.DNSRecord) string {
log.Info("records to get ID from: ", records)
for _, zoneRecord := range records {
log.Info("zone Name: ", zoneRecord.Name)
log.Info("record Name: ", record.Name)
log.Info("zone Type: ", zoneRecord.Type)
log.Info("record Type: ", record.Type)
log.Info("zone Content: ", zoneRecord.Content)
log.Info("record Content: ", record.Content)
if zoneRecord.Name == record.Name && zoneRecord.Type == record.Type && zoneRecord.Content == record.Content {
return zoneRecord.ID
}
@ -506,7 +517,8 @@ func (p *CloudFlareProvider) listDNSRecordsWithAutoPagination(ctx context.Contex
}
return nil, err
}
// log page records
log.Debugf("Fetched %d records from page %d", len(pageRecords), resultInfo.Page)
records = append(records, pageRecords...)
params.ResultInfo = resultInfo.Next()
if params.ResultInfo.Done() {

1
provider/cloudflare/cloudflare_test.go
View File

@ -49,7 +49,6 @@ type mockCloudFlareClient struct {
listZonesError error
listZonesContextError error
dnsRecordsError error
dnsRegionError error
}
var ExampleDomain = []cloudflare.DNSRecord{