From 799ec6d2c941b30e5f054dfd777efc66a6893b60 Mon Sep 17 00:00:00 2001 From: Mikhail Rozentsvayg Date: Tue, 18 Feb 2025 14:54:13 -0800 Subject: [PATCH] review suggestions --- provider/cloudflare/cloudflare.go | 9 ++++++++- source/source.go | 6 ++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/provider/cloudflare/cloudflare.go b/provider/cloudflare/cloudflare.go index feb1d623d..21ca5f719 100644 --- a/provider/cloudflare/cloudflare.go +++ b/provider/cloudflare/cloudflare.go @@ -707,6 +707,9 @@ func groupByNameAndTypeWithCh(records []cloudflare.DNSRecord, chs []cloudflare.C // create single endpoint with all the targets for each name/type for _, records := range groups { + if len(records) == 0 { + return endpoints + } targets := make([]string, len(records)) for i, record := range records { targets[i] = record.Content @@ -716,7 +719,11 @@ func groupByNameAndTypeWithCh(records []cloudflare.DNSRecord, chs []cloudflare.C records[0].Type, endpoint.TTL(records[0].TTL), targets...) - ep.WithProviderSpecific(source.CloudflareProxiedKey, strconv.FormatBool(*records[0].Proxied)) + proxied := false + if records[0].Proxied != nil { + proxied = *records[0].Proxied + } + ep.WithProviderSpecific(source.CloudflareProxiedKey, strconv.FormatBool(proxied)) if _, ok := customOriginServers[records[0].Name]; ok { ep.WithProviderSpecific(source.CloudflareCustomHostnameKey, customOriginServers[records[0].Name]) } diff --git a/source/source.go b/source/source.go index b30e4f09f..2f84dc81c 100644 --- a/source/source.go +++ b/source/source.go @@ -190,15 +190,13 @@ func getAliasFromAnnotations(annotations map[string]string) bool { func getProviderSpecificAnnotations(annotations map[string]string) (endpoint.ProviderSpecific, string) { providerSpecificAnnotations := endpoint.ProviderSpecific{} - v, exists := annotations[CloudflareProxiedKey] - if exists { + if v, exists := annotations[CloudflareProxiedKey]; exists { providerSpecificAnnotations = append(providerSpecificAnnotations, endpoint.ProviderSpecificProperty{ Name: CloudflareProxiedKey, Value: v, }) } - v, exists = annotations[CloudflareCustomHostnameKey] - if exists { + if v, exists := annotations[CloudflareCustomHostnameKey]; exists { providerSpecificAnnotations = append(providerSpecificAnnotations, endpoint.ProviderSpecificProperty{ Name: CloudflareCustomHostnameKey, Value: v,