record_store 7.1.1 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f48a40d3262e148fff5aecff8c61e5f4f676bdc7f7bcb64e2964dc221ba078
-  data.tar.gz: 48a44aa9fc8a431653d09c1c524bcfee73ea09e6148ae9ff0552110b7db51173
+  metadata.gz: 7680653d3944e3a5c8de1a31055e38266a379d4caed36f7eb30bb5ae27217d71
+  data.tar.gz: 5487a8cbcd8079815fbe3e0276e99360a16d954b02b6ed819639bd73e016bc5e
 SHA512:
-  metadata.gz: cb623045bb1b2db82232eb037adaf05a13c234d9d82e760603075ec590b5528f2daeb6dfe1df28bd6cc1987ba379f8ee070547af3336bb11213651012d527f5b
-  data.tar.gz: 73618a9cbae3b16028bcaa7dba64dda74e4324427fda3e364c7df0087ed72828f36965dae239bc0a2c37c1c7aece20950e0a0556a325e4cd10082e74c2da3429
+  metadata.gz: 0ba282fe4046bf7169648d3eecb0137fefd8882dc4c7dbf3c5af0f17cf0ef56ba948d0235668057656c53c709f9372ee155e6aa3aab211c265fdc322e1d9c4ba
+  data.tar.gz: f4e9646af425cdbe7a6827f0fd88e8c24717c6ea21921228ab72164a7e1b019071533f2576ba25b77bf02e3477a22e2d00d0a4df0d1cbfb985e6137c562dd1f1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 8.0.1
+- Fix Cloudflare provider to handle paginated returns from API
+
+## 8.0.0
+- Remove api_fqdn from Cloudflare provider config
+
 ## 7.1.1
 - Bugfix: Cloudflare provider now handles empty record sets properly
 

data/lib/record_store/provider/cloudflare/client.rb

@@ -3,8 +3,9 @@ require_relative 'response'
 
 module Cloudflare
   class Client
-    def initialize(api_fqdn, api_token)
-      @api_fqdn = api_fqdn
+    API_FQDN = 'api.cloudflare.com'.freeze
+
+    def initialize(api_token)
       @api_token = api_token
     end
 
@@ -88,7 +89,7 @@ module Cloudflare
 
     def build_uri(endpoint, params = {})
       URI::HTTPS.build(
-        host: @api_fqdn,
+        host: API_FQDN,
         path: endpoint.chomp('/'),
         query: URI.encode_www_form(params),
       )

data/lib/record_store/provider/cloudflare/response.rb

@@ -27,6 +27,14 @@ module Cloudflare
       result
     end
 
+    def result_info_raw
+      result_info_raw = json['result_info']
+
+      return if result_info_raw.nil? || result_info_raw.empty? || !success
+
+      result_info_raw
+    end
+
     def success
       json['success']
     end

data/lib/record_store/provider/cloudflare.rb

@@ -20,20 +20,50 @@ module RecordStore
       def retrieve_current_records(zone:, stdout: $stdout)
         zone_id = zone_name_to_id(zone)
 
-        retry_on_connection_errors do
-          records = client.get("/client/v4/zones/#{zone_id}/dns_records").result_raw || []
-          records.map { |api_body| build_from_api(api_body) }
+        all_records = []
+        page = 1
+        per_page = 1000
+
+        loop do
+          response = nil
+          retry_on_connection_errors do
+            response = client.get("/client/v4/zones/#{zone_id}/dns_records", page: page, per_page: per_page)
+          end
+
+          records = response.result_raw || []
+          all_records.concat(records)
+
+          break if page * per_page >= response.result_info_raw['total_count']
+
+          page += 1
         end
+
+        all_records.map { |api_body| build_from_api(api_body) }
       end
 
       # Returns an array of the zones managed by provider as strings
       # Cloudflare returns zones across all accounts accessible by the API token
       # Can implement filtering in request if needed
       def zones
-        retry_on_connection_errors do
-          zones = client.get('/client/v4/zones').result_raw || []
-          zones.map { |zone| zone['name'] }
+        all_zones = []
+        page = 1
+        per_page = 50
+
+        loop do
+          response = nil
+          retry_on_connection_errors do
+            response = client.get('/client/v4/zones', page: page, per_page: per_page)
+          end
+
+          zones = response.result_raw || []
+          all_zones.concat(zones)
+
+          break if page * per_page >= response.result_info_raw['total_count']
+
+          page += 1
         end
+
+        all_zones.map { |zone| zone['name'] }
       end
 
       def apply_changeset(changeset, stdout = $stdout)
@@ -167,14 +197,14 @@ module RecordStore
 
       def client
         Cloudflare::Client.new(
-          secrets['api_fqdn'],
           secrets['api_token'],
         )
       end
 
       def zone_name_to_id(zone_name)
         retry_on_connection_errors do
-          matching_zones = client.get('/client/v4/zones').result_raw.select { |zone| zone['name'] == zone_name }
+          params = { name: zone_name }
+          matching_zones = client.get("/client/v4/zones", params).result_raw
 
           case matching_zones.size
           when 0

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '7.1.1'.freeze
+  VERSION = '8.0.1'.freeze
 end

data/template/secrets.json

@@ -25,7 +25,6 @@
     "client_x509_cert_url": "client_x509_cert_url"
   },
   "cloudflare": {
-    "api_fqdn": "api.cloudflare.com",
     "api_token": "local-dev-key"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 8.0.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel