record_store 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773a737dfea1f6ce9646d4b7f8df8358e85b1cf1438f2240ef5609665067dfa6
-  data.tar.gz: 8c0cd658784c649b77b6a19df3b7ec4661ad63aeaf5c17dddb5c8166a2c422a0
+  metadata.gz: 6e518dfc9c19dd1015387da818e7771977370cd0d4bf461eda200d378978b29e
+  data.tar.gz: f056671c6d1f39a9b0a12a0574be13fe4adb152a9dbcf90015a4642bb241e4ea
 SHA512:
-  metadata.gz: 62c5ac81796346237199606dbf041a3186ba20d59a3d6e0910548f1e0a5f2ac14fe4b1cdbe8be99c85422c533209b094d8eb14d2d156b661a19f40f5787f0098
-  data.tar.gz: 216ded77496c797639e54305d23136a867b2709919fbe38fe78c9d28ccf4557aeaf22b2ecb773ca135f0ea079c5caa8e63d1f613dbc564fa9453ff9427942656
+  metadata.gz: 95ac97176d1adc48e315db207c32aa1e1c394906e0b3026cac517ee43f130fcedd3d62003a08cbcfb387e36844aa5bdb580797588370278829002e0c3b952976
+  data.tar.gz: d6c9176b3a0a85e7a34076a04a226f9e4311b23ec6c32f569c69d6a460b0f75a3e5bc8f69b6a637781d5f6ca4950270ce0338adba73c742a5f0dda18f558113a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 8.0.2
+- Fix Changesets to be case-insensitive
+
+## 8.0.1
+- Fix Cloudflare provider to handle paginated returns from API
+
 ## 8.0.0
 - Remove api_fqdn from Cloudflare provider config
 

data/lib/record_store/changeset.rb

@@ -55,8 +55,8 @@ module RecordStore
     end
 
     def initialize(current_records: [], desired_records: [], provider:, zone:)
-      @current_records = Set.new(current_records)
-      @desired_records = Set.new(desired_records)
+      @current_records = Set.new(normalize_records(current_records))
+      @desired_records = Set.new(normalize_records(desired_records))
       @provider = provider
       @zone = zone
 
@@ -114,5 +114,18 @@ module RecordStore
         end
       end
     end
+
+    def normalize_records(records)
+      records.map do |record|
+        record.dup.tap do |r|
+          r.fqdn = r.fqdn.downcase
+          r.rdata.each do |key, value|
+            next if key == :txtdata
+
+            r.send("#{key}=", value.downcase) if value.is_a?(String)
+          end
+        end
+      end
+    end
   end
 end

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)
@@ -173,7 +203,8 @@ module RecordStore
 
       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 = '8.0.0'.freeze
+  VERSION = '8.0.2'.freeze
 end

metadata

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