From 81068bc1ce423ab7ffc7db4f3b088bd9bb113bff Mon Sep 17 00:00:00 2001 From: Artur Rodrigues Date: Thu, 5 Jan 2023 15:27:37 +0000 Subject: [PATCH] Remove unused cloudflare pagination options Signed-off-by: Artur Rodrigues --- main.go | 2 +- pkg/apis/externaldns/types.go | 3 --- pkg/apis/externaldns/types_test.go | 4 ---- provider/cloudflare/cloudflare.go | 16 +++++----------- provider/cloudflare/cloudflare_test.go | 3 --- 5 files changed, 6 insertions(+), 22 deletions(-) diff --git a/main.go b/main.go index df8eabb13..815afa0b0 100644 --- a/main.go +++ b/main.go @@ -233,7 +233,7 @@ func main() { case "civo": p, err = civo.NewCivoProvider(domainFilter, cfg.DryRun) case "cloudflare": - p, err = cloudflare.NewCloudFlareProvider(domainFilter, zoneIDFilter, cfg.CloudflareZonesPerPage, cfg.CloudflareProxied, cfg.DryRun) + p, err = cloudflare.NewCloudFlareProvider(domainFilter, zoneIDFilter, cfg.CloudflareProxied, cfg.DryRun) case "rcodezero": p, err = rcode0.NewRcodeZeroProvider(domainFilter, cfg.DryRun, cfg.RcodezeroTXTEncrypt) case "google": diff --git a/pkg/apis/externaldns/types.go b/pkg/apis/externaldns/types.go index 8224c80ee..3bd9a61d7 100644 --- a/pkg/apis/externaldns/types.go +++ b/pkg/apis/externaldns/types.go @@ -105,7 +105,6 @@ type Config struct { BluecatDNSDeployType string BluecatSkipTLSVerify bool CloudflareProxied bool - CloudflareZonesPerPage int CoreDNSPrefix string RcodezeroTXTEncrypt bool AkamaiServiceConsumerDomain string @@ -253,7 +252,6 @@ var defaultConfig = &Config{ BluecatConfigFile: "/etc/kubernetes/bluecat.json", BluecatDNSDeployType: "no-deploy", CloudflareProxied: false, - CloudflareZonesPerPage: 50, CoreDNSPrefix: "/skydns/", RcodezeroTXTEncrypt: false, AkamaiServiceConsumerDomain: "", @@ -472,7 +470,6 @@ func (cfg *Config) ParseFlags(args []string) error { app.Flag("bluecat-dns-deploy-type", "When using the Bluecat provider, specify the type of DNS deployment to initiate after records are updated. Valid options are 'full-deploy' and 'no-deploy'. Deploy will only execute if --bluecat-dns-server-name is set (optional when --provider=bluecat)").Default(defaultConfig.BluecatDNSDeployType).StringVar(&cfg.BluecatDNSDeployType) app.Flag("cloudflare-proxied", "When using the Cloudflare provider, specify if the proxy mode must be enabled (default: disabled)").BoolVar(&cfg.CloudflareProxied) - app.Flag("cloudflare-zones-per-page", "When using the Cloudflare provider, specify how many zones per page listed, max. possible 50 (default: 50)").Default(strconv.Itoa(defaultConfig.CloudflareZonesPerPage)).IntVar(&cfg.CloudflareZonesPerPage) app.Flag("coredns-prefix", "When using the CoreDNS provider, specify the prefix name").Default(defaultConfig.CoreDNSPrefix).StringVar(&cfg.CoreDNSPrefix) app.Flag("akamai-serviceconsumerdomain", "When using the Akamai provider, specify the base URL (required when --provider=akamai and edgerc-path not specified)").Default(defaultConfig.AkamaiServiceConsumerDomain).StringVar(&cfg.AkamaiServiceConsumerDomain) app.Flag("akamai-client-token", "When using the Akamai provider, specify the client token (required when --provider=akamai and edgerc-path not specified)").Default(defaultConfig.AkamaiClientToken).StringVar(&cfg.AkamaiClientToken) diff --git a/pkg/apis/externaldns/types_test.go b/pkg/apis/externaldns/types_test.go index 6cd42b5b4..24a699b38 100644 --- a/pkg/apis/externaldns/types_test.go +++ b/pkg/apis/externaldns/types_test.go @@ -77,7 +77,6 @@ var ( BluecatDNSDeployType: defaultConfig.BluecatDNSDeployType, BluecatSkipTLSVerify: false, CloudflareProxied: false, - CloudflareZonesPerPage: 50, CoreDNSPrefix: "/skydns/", AkamaiServiceConsumerDomain: "", AkamaiClientToken: "", @@ -182,7 +181,6 @@ var ( BluecatDNSDeployType: "full-deploy", BluecatSkipTLSVerify: true, CloudflareProxied: true, - CloudflareZonesPerPage: 20, CoreDNSPrefix: "/coredns/", AkamaiServiceConsumerDomain: "oooo-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net", AkamaiClientToken: "o184671d5307a388180fbf7f11dbdf46", @@ -294,7 +292,6 @@ func TestParseFlags(t *testing.T) { "--bluecat-dns-deploy-type=full-deploy", "--bluecat-skip-tls-verify", "--cloudflare-proxied", - "--cloudflare-zones-per-page=20", "--coredns-prefix=/coredns/", "--akamai-serviceconsumerdomain=oooo-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net", "--akamai-client-token=o184671d5307a388180fbf7f11dbdf46", @@ -417,7 +414,6 @@ func TestParseFlags(t *testing.T) { "EXTERNAL_DNS_BLUECAT_ROOT_ZONE": "arg", "EXTERNAL_DNS_BLUECAT_SKIP_TLS_VERIFY": "1", "EXTERNAL_DNS_CLOUDFLARE_PROXIED": "1", - "EXTERNAL_DNS_CLOUDFLARE_ZONES_PER_PAGE": "20", "EXTERNAL_DNS_COREDNS_PREFIX": "/coredns/", "EXTERNAL_DNS_AKAMAI_SERVICECONSUMERDOMAIN": "oooo-xxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx.luna.akamaiapis.net", "EXTERNAL_DNS_AKAMAI_CLIENT_TOKEN": "o184671d5307a388180fbf7f11dbdf46", diff --git a/provider/cloudflare/cloudflare.go b/provider/cloudflare/cloudflare.go index 6948be49b..313b50017 100644 --- a/provider/cloudflare/cloudflare.go +++ b/provider/cloudflare/cloudflare.go @@ -118,11 +118,10 @@ type CloudFlareProvider struct { provider.BaseProvider Client cloudFlareDNS // only consider hosted zones managing domains ending in this suffix - domainFilter endpoint.DomainFilter - zoneIDFilter provider.ZoneIDFilter - proxiedByDefault bool - DryRun bool - PaginationOptions cloudflare.PaginationOptions + domainFilter endpoint.DomainFilter + zoneIDFilter provider.ZoneIDFilter + proxiedByDefault bool + DryRun bool } // cloudFlareChange differentiates between ChangActions @@ -148,7 +147,7 @@ func getRecordParam[T RecordParamsTypes](cfc cloudFlareChange) T { } // NewCloudFlareProvider initializes a new CloudFlare DNS based Provider. -func NewCloudFlareProvider(domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zonesPerPage int, proxiedByDefault bool, dryRun bool) (*CloudFlareProvider, error) { +func NewCloudFlareProvider(domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, proxiedByDefault bool, dryRun bool) (*CloudFlareProvider, error) { // initialize via chosen auth method and returns new API object var ( config *cloudflare.API @@ -169,10 +168,6 @@ func NewCloudFlareProvider(domainFilter endpoint.DomainFilter, zoneIDFilter prov zoneIDFilter: zoneIDFilter, proxiedByDefault: proxiedByDefault, DryRun: dryRun, - PaginationOptions: cloudflare.PaginationOptions{ - PerPage: zonesPerPage, - Page: 1, - }, } return provider, nil } @@ -180,7 +175,6 @@ func NewCloudFlareProvider(domainFilter endpoint.DomainFilter, zoneIDFilter prov // Zones returns the list of hosted zones. func (p *CloudFlareProvider) Zones(ctx context.Context) ([]cloudflare.Zone, error) { result := []cloudflare.Zone{} - p.PaginationOptions.Page = 1 // if there is a zoneIDfilter configured // && if the filter isn't just a blank string (used in tests) diff --git a/provider/cloudflare/cloudflare_test.go b/provider/cloudflare/cloudflare_test.go index b2136bff0..7ac0f47f9 100644 --- a/provider/cloudflare/cloudflare_test.go +++ b/provider/cloudflare/cloudflare_test.go @@ -640,7 +640,6 @@ func TestCloudflareProvider(t *testing.T) { _, err := NewCloudFlareProvider( endpoint.NewDomainFilter([]string{"bar.com"}), provider.NewZoneIDFilter([]string{""}), - 25, false, true) if err != nil { @@ -652,7 +651,6 @@ func TestCloudflareProvider(t *testing.T) { _, err = NewCloudFlareProvider( endpoint.NewDomainFilter([]string{"bar.com"}), provider.NewZoneIDFilter([]string{""}), - 1, false, true) if err != nil { @@ -663,7 +661,6 @@ func TestCloudflareProvider(t *testing.T) { _, err = NewCloudFlareProvider( endpoint.NewDomainFilter([]string{"bar.com"}), provider.NewZoneIDFilter([]string{""}), - 50, false, true) if err == nil {