record_store 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6476b30f3ef1df05642b1645783e2186e8ca6a3f489d99c4724fb252d6b26b97
-  data.tar.gz: 84ddb2d0e34076198bc1df633ab51714253c8c4ced05ef8b5b60eb777714eacb
+  metadata.gz: f6875c27f0cf86510b733a58f668d44560eeb40e7c8b6c9438183fee175bc514
+  data.tar.gz: 3599cc9903a5afe46d544f8aeef349961fdc2d95011973325bbdcc75972c56c5
 SHA512:
-  metadata.gz: '01136420252835b0ce65abf03d0466f88f879cf52c55f1db5e3db0753121bd55610c78fec31ee552b0d95c02b1922e8aefd4d91679872b1f16af16188fff0cde'
-  data.tar.gz: 512eb4f464314c298c07367e52dc9a3e6cec126da174f19c52cd4d32c12be7ab1d1a565c653b6f853a346582db9076e078ee530914272c1fbf6317306c911176
+  metadata.gz: 9a6def9342919457cc71fdda4691c92310450dfc28a476eee6d353b73798b8d1b612b4775982704b0c44b2e657149a02f0e96330796b03d591619ad5930509ae
+  data.tar.gz: 42183ae0ecd31e27a2d40977ecdda6cb51c0368ff24ac3a2de4411ab016809c5551ee3faeb50eb53503be059ece4bc41889e6c73d3e1f0ab53e7ab9290563628

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.3.1
+- Improve resiliency in the face of temporary provider outages [BUGFIX]
+
 ## 6.3.0
 - Support for configurable number of threads via environment variable [FEATURE]
 

data/lib/record_store/provider.rb

@@ -2,6 +2,9 @@ require 'resolv'
 
 module RecordStore
   class Provider
+    class Error < StandardError; end
+    class UnparseableBodyError < Error; end
+
     class << self
       def provider_for(object)
         ns_server =
@@ -136,12 +139,13 @@ module RecordStore
       def retry_on_connection_errors(
         max_timeouts: 5,
         max_conn_resets: 5,
+        max_retries: 5,
         delay: 1,
         backoff_multiplier: 2,
         max_backoff: 10
       )
         waiter = BackoffWaiter.new(
-          "Waiting to retry after a connection reset",
+          'Waiting to retry after a connection reset',
           initial_delay: delay,
           multiplier: backoff_multiplier,
           max_delay: max_backoff,
@@ -150,11 +154,16 @@ module RecordStore
         loop do
           begin
             return yield
+          rescue UnparseableBodyError
+            raise if max_retries <= 0
+            max_retries -= 1
+
+            waiter.wait(message: 'Waiting to retry after receiving an unparseable response')
           rescue Net::OpenTimeout, Errno::ETIMEDOUT
             raise if max_timeouts <= 0
             max_timeouts -= 1
 
-            $stderr.puts("Retrying after a connection timeout")
+            $stderr.puts('Retrying after a connection timeout')
           rescue Errno::ECONNRESET
             raise if max_conn_resets <= 0
             max_conn_resets -= 1

data/lib/record_store/provider/ns1.rb

@@ -3,8 +3,6 @@ require_relative 'ns1/patch_api_header'
 
 module RecordStore
   class Provider::NS1 < Provider
-    class Error < StandardError; end
-
     class ApiAnswer
       class << self
         def from_full_api_answer(type:, record_id:, answer:)
@@ -180,7 +178,7 @@ module RecordStore
         unless updated
           error = +'while trying to update a record, could not find answer with fqdn: '
           error << "#{record.fqdn}, type; #{record.type}, id: #{id}"
-          raise Error, error
+          raise RecordStore::Provider::Error, error
         end
 
         client.modify_record(

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

@@ -1,46 +1,59 @@
+require 'net/http'
 require 'ns1'
 
 module RecordStore
   class Provider::NS1 < Provider
-    class Error < StandardError; end
-
     class Client < ::NS1::Client
       def initialize(api_key:)
         super(api_key)
       end
 
       def zones
-        super
+        zones = super
+        raise_if_error!(zones)
+        zones
       end
 
       def zone(name)
-        super(name)
+        zone = super(name)
+        raise_if_error!(zone)
+        zone
       end
 
       def record(zone:, fqdn:, type:, must_exist: false)
         result = super(zone, fqdn, type)
-        raise(Error, result.to_s) if must_exist && result.is_a?(NS1::Response::Error)
+        raise_if_error!(result) if must_exist
         return nil if result.is_a?(NS1::Response::Error)
         result
       end
 
       def create_record(zone:, fqdn:, type:, params:)
         result = super(zone, fqdn, type, params)
-        raise(Error, result.to_s) if result.is_a?(NS1::Response::Error)
+        raise_if_error!(result)
         nil
       end
 
       def modify_record(zone:, fqdn:, type:, params:)
         result = super(zone, fqdn, type, params)
-        raise(Error, result.to_s) if result.is_a?(NS1::Response::Error)
+        raise_if_error!(result)
         nil
       end
 
       def delete_record(zone:, fqdn:, type:)
         result = super(zone, fqdn, type)
-        raise(Error, result.to_s) if result.is_a?(NS1::Response::Error)
+        raise_if_error!(result)
         nil
       end
+
+      private
+
+      def raise_if_error!(result)
+        return unless result.is_a?(NS1::Response::Error)
+        if result.is_a?(NS1::Response::UnparsableBodyError)
+          raise RecordStore::Provider::UnparseableBodyError, result.to_s
+        end
+        raise RecordStore::Provider::Error, result.to_s
+      end
     end
   end
 end

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

@@ -1,6 +1,13 @@
 require 'net/http'
 require_relative '../provider_utils/waiter'
 
+class NS1::Response::UnparsableBodyError < NS1::Response::Error
+  def initialize(status)
+    @status = status
+    super({}, status)
+  end
+end
+
 # Patch the method which retrieves headers for API rate limit dynamically
 module NS1::Transport
   class NetHttp
@@ -18,15 +25,17 @@ module NS1::Transport
         rate_limit.wait(sleep_time)
       end
 
-      body = JSON.parse(response.body)
-      case response
-      when Net::HTTPOK
-        NS1::Response::Success.new(body, response.code.to_i)
-      else
-        NS1::Response::Error.new(body, response.code.to_i)
+      begin
+        body = JSON.parse(response.body)
+        case response
+        when Net::HTTPOK
+          NS1::Response::Success.new(body, response.code.to_i)
+        else
+          NS1::Response::Error.new(body, response.code.to_i)
+        end
+      rescue JSON::ParserError
+        NS1::Response::UnparsableBodyError.new(response.code.to_i)
       end
-    rescue JSON::ParserError
-      raise NS1::Transport::ResponseParseError
     end
   end
 end

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

@@ -5,7 +5,7 @@ class Waiter
 
   attr_accessor :message
 
-  def wait(sleep_time)
+  def wait(sleep_time, message: @message)
     while sleep_time > 0
       wait_time = [10, sleep_time].min
       puts "#{message} (#{sleep_time}s left)" if wait_time > 1
@@ -34,8 +34,8 @@ class BackoffWaiter < Waiter
     @current_delay = @initial_delay
   end
 
-  def wait
-    super(@current_delay)
+  def wait(message: @message)
+    super(@current_delay, message: message)
     @current_delay = [@current_delay * @multiplier, @max_delay].compact.min
   end
 end

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '6.3.0'.freeze
+  VERSION = '6.3.1'.freeze
 end

data/record_store.gemspec

@@ -48,6 +48,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '0.89.1'
   spec.add_development_dependency 'minitest-focus'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -301,16 +301,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.89.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.89.1
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement