embulk-input-zendesk 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd6da90d8ce5a50d324d5d0d4e3016b151ebcdde
-  data.tar.gz: adff4881ad79e42236e68f6245cf0ab15dd16463
+  metadata.gz: bdd23bdf56e325f692e469316f07d92a9173727b
+  data.tar.gz: d70d14895b9e26f7f57b03c1b56cb5ac1382b755
 SHA512:
-  metadata.gz: fbf47f6f6f96ab00bf2642c313b3829a3a85356e339bd65cb32e26bfa847a5e57200dafc31fa1b47b76b8828bd34b94a8d9baafca0f40c285b3a31d0504d63cd
-  data.tar.gz: eb56a55ecf3d7ddb5dc2785a63e3daa7909267a0bac1c7ed52f2fce80e4103d8a74bac9d3dcc631c49f8436252e80f7dd82fed64fa4f9bb6049577594868ebe5
+  metadata.gz: 2b6fb9f91fa3d5f58b8c3ad270084dc81c1dd76c14578461932a1f0ad5453f7c05649d4cc62d74c8053c543e084fe6ae2e90871d490591cd6216f3f16aebac7a
+  data.tar.gz: 5ef68347436a5d175377cdf2c1c27ff8cefdce8ee73e2f97c4aae14bd08fa54d180569035aa714b83ee19f37f474147905d28fb7260fbbfd29908623b12d8c82

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.5 - 2016-04-14
+* [enhancement] Mitigate debug pain when many retry then error [#10](https://github.com/treasure-data/embulk-input-zendesk/pull/10)
+
 ## 0.1.4 - 2016-04-08
 
 * [enhancement] Correct preview data [#9](https://github.com/treasure-data/embulk-input-zendesk/pull/9)

data/embulk-input-zendesk.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-zendesk"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["uu59", "muga", "sakama"]
   spec.summary       = "Zendesk input plugin for Embulk"
   spec.description   = "Loads records from Zendesk."
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'perfect_retry', '~> 0.4'
+  spec.add_dependency 'perfect_retry', '~> 0.5'
   spec.add_dependency 'httpclient'
   spec.add_development_dependency 'embulk', ['~> 0.8.1']
   spec.add_development_dependency 'bundler', ['~> 1.0']

data/lib/embulk/input/zendesk/client.rb

@@ -150,6 +150,7 @@ module Embulk
             config.log_level = nil
             config.dont_rescues = [Embulk::DataError, Embulk::ConfigError]
             config.sleep = lambda{|n| @config[:retry_initial_wait_sec]* (2 ** (n-1)) }
+            config.raise_original_error = true
           end
         end
 
@@ -251,14 +252,15 @@ module Embulk
           case status_code
           when 200, 404
             # 404 would be returned e.g. ticket comments are empty (on fetch_subresource method)
-          when 400, 401
-            raise Embulk::ConfigError.new("[#{status_code}] #{body}")
           when 409
             raise "[#{status_code}] temporally failure."
           when 429
             # rate limit
             retry_after = headers["Retry-After"]
             wait_rate_limit(retry_after.to_i)
+          when 400..500
+            # Won't retry for 4xx range errors except above. Almost they should be ConfigError e.g. 403 Forbidden
+            raise Embulk::ConfigError.new("[#{status_code}] #{body}")
           when 500, 503
             # 503 is possible rate limit
             retry_after = headers["Retry-After"]
@@ -268,7 +270,7 @@ module Embulk
               raise "[#{status_code}] temporally failure."
             end
           else
-            raise "Server returns unknown status code (#{status_code})"
+            raise "Server returns unknown status code (#{status_code}) #{body}"
           end
         end
       end

data/test/embulk/input/zendesk/test_client.rb

@@ -316,13 +316,13 @@ module Embulk
             @client ||= Client.new(login_url: login_url, auth_method: "oauth", access_token: access_token, retry_limit: 2, retry_initial_wait_sec: 0)
           end
 
-          def stub_response(status, headers = [])
+          def stub_response(status, headers = [], body_json = nil)
+            headers << "Content-Type: application/json"
             @httpclient.test_loopback_http_response << [
               "HTTP/1.1 #{status}",
-              "Content-Type: application/json",
               headers.join("\r\n"),
               "",
-              {
+              body_json || {
                 tickets: []
               }.to_json
             ].join("\r\n")
@@ -351,6 +351,13 @@ module Embulk
             end
           end
 
+          test "403 forbidden" do
+            stub_response(403)
+            assert_raise(ConfigError) do
+              client.tickets(&proc{})
+            end
+          end
+
           test "409" do
             stub_response(409)
             assert_raise(StandardError) do
@@ -391,8 +398,9 @@ module Embulk
           end
 
           test "Unhandled response code (555)" do
-            stub_response(555)
-            assert_raise(RuntimeError.new("Server returns unknown status code (555)")) do
+            error_body = {error: "FATAL ERROR"}.to_json
+            stub_response(555, [], error_body)
+            assert_raise(RuntimeError.new("Server returns unknown status code (555) #{error_body}")) do
               client.tickets(&proc{})
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-zendesk
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - uu59
@@ -10,14 +10,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   name: perfect_retry
   prerelease: false
   type: :runtime
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: