record_store 6.1.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d05ecb06f048975b797baa10df042222f03ee4f0b1b5e268afa87e97b16ede6
-  data.tar.gz: 4ca96a597c88f5d17df9f85ea50e8743b0cab6fa4d57196447d3808cc22711a6
+  metadata.gz: 7c401c0dafc01955edd90912d793cdd0f27bd698df86f18ed4132e3ae0a8d1bc
+  data.tar.gz: 261f5a6a0c768d417e247746fe95955393075c643322fb7a5c701d39edef218d
 SHA512:
-  metadata.gz: 98581b53f61499cb2f83d92ae2de4cf132ce2784cf56f8dc81531228f4090995f8e7a5a2c70f0a8fcac0cc5a3bdea29dd5c1d7b6996eef61e416c0c65c6a252d
-  data.tar.gz: 8e753593bc358e83f82a0191f07528e14aa793305570afae5fcc865e1bdd97fffb48319fec43642e662c7b62e1070dd3b384464b9ca55a39e2a590fcf0f6738b
+  metadata.gz: 7160e11eec16c8ecea7fa7cf02ae7437a5093ec58f6f932a7e9e63feb85413ff5d9c28e0a90f8960ff76a94dd0bc7992e0712a0a6f40a2158062755079a16bac
+  data.tar.gz: 7d81f1268810c177bd785b8ab5610175d2e9b7f20db743d12996df2ab6f145c522a354a1f7e94e86e91b90c7a44b1b63bcbe1a92a1e93e0f1f5eefb13d76a659

data/lib/record_store/provider.rb

@@ -52,6 +52,10 @@ module RecordStore
         false
       end
 
+      def empty_non_terminal_over_wildcard?
+        true
+      end
+
       def build_zone(zone_name:, config:)
         zone = Zone.new(name: zone_name)
         zone.records = retrieve_current_records(zone: zone_name)
@@ -136,6 +140,13 @@ module RecordStore
         backoff_multiplier: 2,
         max_backoff: 10
       )
+        waiter = BackoffWaiter.new(
+          "Waiting to retry after a connection reset",
+          initial_delay: delay,
+          multiplier: backoff_multiplier,
+          max_delay: max_backoff,
+        )
+
         loop do
           begin
             return yield
@@ -148,16 +159,10 @@ module RecordStore
             raise if max_conn_resets <= 0
             max_conn_resets -= 1
 
-            $stderr.puts("Retrying in #{delay}s after a connection reset")
-            backoff_sleep(delay)
-            delay = [delay * backoff_multiplier, max_backoff].min
+            waiter.wait
           end
         end
       end
-
-      def backoff_sleep(delay)
-        sleep(delay)
-      end
     end
   end
 end

data/lib/record_store/provider/dnsimple.rb

@@ -12,6 +12,10 @@ module RecordStore
         true
       end
 
+      def empty_non_terminal_over_wildcard?
+        false
+      end
+
       # returns an array of Record objects that match the records which exist in the provider
       def retrieve_current_records(zone:, stdout: $stdout)
         retry_on_connection_errors do

data/lib/record_store/provider/dnsimple/patch_api_header.rb

@@ -1,4 +1,4 @@
-require_relative '../provider_utils/rate_limit'
+require_relative '../provider_utils/waiter'
 
 # Patch Dnsimple client method which retrieves headers for API rate limit dynamically
 module Dnsimple
@@ -26,8 +26,8 @@ module Dnsimple
       rate_limit_periods = rate_limit_remaining + 1
       sleep_time = rate_limit_reset_in / rate_limit_periods.to_f
 
-      rate_limit = RateLimit.new('DNSimple')
-      rate_limit.sleep_for(sleep_time)
+      rate_limit = RateLimitWaiter.new('DNSimple')
+      rate_limit.wait(sleep_time)
     end
   end
 end

data/lib/record_store/provider/ns1/patch_api_header.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require_relative '../provider_utils/rate_limit'
+require_relative '../provider_utils/waiter'
 
 # Patch the method which retrieves headers for API rate limit dynamically
 module NS1::Transport
@@ -14,8 +14,8 @@ module NS1::Transport
         sleep_time = response_hash[X_RATELIMIT_PERIOD].first.to_i /
                      [1, response_hash[X_RATELIMIT_REMAINING].first.to_i].max.to_f
 
-        rate_limit = RateLimit.new('NS1')
-        rate_limit.sleep_for(sleep_time)
+        rate_limit = RateLimitWaiter.new('NS1')
+        rate_limit.wait(sleep_time)
       end
 
       body = JSON.parse(response.body)

data/lib/record_store/provider/provider_utils/waiter.rb

@@ -0,0 +1,41 @@
+class Waiter
+  def initialize(message = nil)
+    @message = message || 'Waiting'
+  end
+
+  attr_accessor :message
+
+  def wait(sleep_time)
+    while sleep_time > 0
+      wait_time = [10, sleep_time].min
+      puts "#{message} (#{sleep_time}s left)" if wait_time > 1
+      sleep(wait_time)
+      sleep_time -= wait_time
+    end
+  end
+end
+
+class RateLimitWaiter < Waiter
+  def initialize(provider)
+    super("Waiting on #{provider} rate-limit")
+  end
+end
+
+class BackoffWaiter < Waiter
+  def initialize(message, initial_delay:, multiplier:, max_delay: nil)
+    super(message)
+
+    @initial_delay = @current_delay = initial_delay
+    @multiplier = multiplier
+    @max_delay = max_delay
+  end
+
+  def reset
+    @current_delay = @initial_delay
+  end
+
+  def wait
+    super(@current_delay)
+    @current_delay = [@current_delay * @multiplier, @max_delay].compact.min
+  end
+end

data/lib/record_store/record.rb

@@ -112,6 +112,10 @@ module RecordStore
       "[#{type}Record] #{fqdn} #{ttl} IN #{type} #{rdata_txt}"
     end
 
+    def wildcard?
+      fqdn.match?(/^\*\./)
+    end
+
     protected
 
     def validate_label_length

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '6.1.2'.freeze
+  VERSION = '6.2.0'.freeze
 end

data/lib/record_store/zone.rb

@@ -18,6 +18,7 @@ module RecordStore
     validate :validate_cname_records_dont_point_to_root
     validate :validate_same_ttl_for_records_sharing_fqdn_and_type
     validate :validate_provider_can_handle_zone_records
+    validate :validate_no_empty_non_terminal
     validate :validate_can_handle_alias_records
 
     class << self
@@ -258,6 +259,28 @@ module RecordStore
       end
     end
 
+    def validate_no_empty_non_terminal
+      return unless config.empty_non_terminal_over_wildcard?
+
+      wildcards = records.select(&:wildcard?).map(&:fqdn).uniq
+      wildcards.each do |wildcard|
+        suffix = wildcard[1..-1]
+
+        terminal_records = records.map(&:fqdn)
+          .select { |record| record.match?(/^([a-zA-Z0-9-_]+\.[a-zA-Z0-9-_])#{Regexp.escape(suffix)}$/) }
+        next unless terminal_records.any?
+
+        intermediate_records = records.map(&:fqdn)
+          .select { |record| record.match?(/^([a-zA-Z0-9-_]+)#{Regexp.escape(suffix)}$/) }
+        terminal_records.each do |terminal_record|
+          non_terminal = terminal_record.partition('.').last
+          errors.add(:records, "found empty non-terminal #{non_terminal} "\
+                     "(caused by existing records #{wildcard} and #{terminal_record})")\
+            unless intermediate_records.include?(non_terminal)
+        end
+      end
+    end
+
     def validate_can_handle_alias_records
       return unless records.any? { |record| record.is_a?(Record::ALIAS) }
       return if config.supports_alias?

data/lib/record_store/zone/config.rb

@@ -24,6 +24,10 @@ module RecordStore
         end
       end
 
+      def empty_non_terminal_over_wildcard?
+        valid_providers? && providers.any? { |provider| Provider.const_get(provider).empty_non_terminal_over_wildcard? }
+      end
+
       def to_hash
         config_hash = {
           providers: providers,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -362,7 +362,7 @@ files:
 - lib/record_store/provider/ns1/client.rb
 - lib/record_store/provider/ns1/patch_api_header.rb
 - lib/record_store/provider/oracle_cloud_dns.rb
-- lib/record_store/provider/provider_utils/rate_limit.rb
+- lib/record_store/provider/provider_utils/waiter.rb
 - lib/record_store/record.rb
 - lib/record_store/record/a.rb
 - lib/record_store/record/aaaa.rb

data/lib/record_store/provider/provider_utils/rate_limit.rb

@@ -1,14 +0,0 @@
-class RateLimit
-  def initialize(provider)
-    @provider = provider
-  end
-
-  def sleep_for(sleep_time)
-    while sleep_time > 0
-      wait = [10, sleep_time].min
-      puts "Waiting on #{@provider} rate-limit" if wait > 1
-      sleep(wait)
-      sleep_time -= wait
-    end
-  end
-end