record_store 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6686f890657b7a250384d189c2c377519616711a8295f510bbb140abaefde22
-  data.tar.gz: 00066a49bd826aded557ba3c0a6cb60216ce53feb0c33efd89de9ae7792a5d7c
+  metadata.gz: f7a5da9483eaf8ce4eb82e8d974fefe82f7f481cde945a45ec6ae204b02524dc
+  data.tar.gz: 51e681688b6cc80c851f801ad00bb07ccf473ea2fb0b1c8a8e722d3cbc2ec196
 SHA512:
-  metadata.gz: 642f48f0c639da2f9c3f5cb16bc3265504c647797586bbc6d7aa06f3667dbfaefe8977a4744f8a390ffd7bb45b2567e0964e8e719793182bbca05ccb9143d1e2
-  data.tar.gz: 34e8d630d6b53dc22370f1472cd292b218e79136772151c403b46cc4eb027aa9377beebd17524dac6b37d47645ed7597a756f40f78511ebf0f5678ea9a61c74d
+  metadata.gz: 502acb53fcef150d5cb5442414c47552fc199efe66012e85d30745ae25c8af326064283c855ba12f4cead5b6f7b09f5a97c0b3bd6a4de1a010bba15664954335
+  data.tar.gz: 491ee9ff80ccb35ceb7ffbe70776948cd459467df8c213917c08ac6830e249585dbd993849a44e413bd6fc8e38589601eab27601cf3061c9b51abd09a94898a0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.1.1
+- Emit messages when waiting for rate-limit to elapse for DNSimple and NS1 providers, so deployment does not timeout [BUGFIX]
+
 ## 6.1.0
 - sort zone files [FEATURE]
 - CLI support for specifying zones for validate_authority [FEATURE]

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

@@ -1,15 +1,17 @@
+require_relative '../provider_utils/rate_limit'
+
 # Patch Dnsimple client method which retrieves headers for API rate limit dynamically
 module Dnsimple
   class Client
     def execute(method, path, data = nil, options = {})
       response = request(method, path, data, options)
-      rate_limit_sleep(response.headers["x-ratelimit-reset"].to_i, response.headers["x-ratelimit-remaining"].to_i)
+      rate_limit_sleep(response.headers['x-ratelimit-reset'].to_i, response.headers['x-ratelimit-remaining'].to_i)
 
       case response.code
       when 200..299
         response
       when 401
-        raise AuthenticationFailed, response["message"]
+        raise AuthenticationFailed, response['message']
       when 404
         raise NotFoundError, response
       else
@@ -22,9 +24,10 @@ module Dnsimple
     def rate_limit_sleep(rate_limit_reset, rate_limit_remaining)
       rate_limit_reset_in = [0, rate_limit_reset - Time.now.to_i].max
       rate_limit_periods = rate_limit_remaining + 1
-      wait_time = rate_limit_reset_in / rate_limit_periods.to_f
+      sleep_time = rate_limit_reset_in / rate_limit_periods.to_f
 
-      sleep(wait_time) if wait_time > 0
+      rate_limit = RateLimit.new('DNSimple')
+      rate_limit.sleep_for(sleep_time)
     end
   end
 end

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

@@ -1,11 +1,15 @@
 require 'net/http'
+require_relative '../provider_utils/rate_limit'
 
 # Patch the method which retrieves headers for API rate limit dynamically
 module NS1::Transport
   class NetHttp
     def process_response(response)
-      sleep(response.to_hash["x-ratelimit-period"].first.to_i /
-        [1, response.to_hash["x-ratelimit-remaining"].first.to_i].max.to_f)
+      sleep_time = response.to_hash['x-ratelimit-period'].first.to_i /
+                   [1, response.to_hash['x-ratelimit-remaining'].first.to_i].max.to_f
+
+      rate_limit = RateLimit.new('NS1')
+      rate_limit.sleep_for(sleep_time)
 
       body = JSON.parse(response.body)
       case response

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

@@ -0,0 +1,14 @@
+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

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '6.1.0'.freeze
+  VERSION = '6.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -362,6 +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/record.rb
 - lib/record_store/record/a.rb
 - lib/record_store/record/aaaa.rb