From 2ff8fb4981d1d82aba9a214333d8d6d6c7fbc4e2 Mon Sep 17 00:00:00 2001 From: Andrew Hay <39sumer3939@gmail.com> Date: Sat, 1 Feb 2025 19:24:29 +0000 Subject: [PATCH] fix: remove unused field --- provider/cloudflare/cloudflare.go | 22 +++++++++++++++++----- provider/cloudflare/cloudflare_test.go | 1 - 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/provider/cloudflare/cloudflare.go b/provider/cloudflare/cloudflare.go index e665833e6..489ee818d 100644 --- a/provider/cloudflare/cloudflare.go +++ b/provider/cloudflare/cloudflare.go @@ -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() { diff --git a/provider/cloudflare/cloudflare_test.go b/provider/cloudflare/cloudflare_test.go index 4f3378ee6..c49a77a46 100644 --- a/provider/cloudflare/cloudflare_test.go +++ b/provider/cloudflare/cloudflare_test.go @@ -49,7 +49,6 @@ type mockCloudFlareClient struct { listZonesError error listZonesContextError error dnsRecordsError error - dnsRegionError error } var ExampleDomain = []cloudflare.DNSRecord{