embulk-input-jira 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908532d5b539ee1ca384c6eb1e95e3a9b4457d59
-  data.tar.gz: 85ff33b3ffec8721a19ea7c7c9664629d80529c6
+  metadata.gz: 5b94f8c8f0d052b86637546f5c195418d82b488a
+  data.tar.gz: 0bc976612e0c0ad6a607b2c31e811cb01fc7a9f4
 SHA512:
-  metadata.gz: 2d5f22354f2809e1f759cf1e4a4bcdedbcc807722d43a906232d8eed2e861ba57b92b1bde59d97ddab56ca677c1aa6ddbb15532103e6a95fcde06e43bcb0a5a6
-  data.tar.gz: 040700492e0710e4e25ed0b6c54557df1b29c34513ba5f41fed08680be8a1362a81416a134c04887203cb30b4f855201759e71f72610a2062221b3b2af2ea1ac
+  metadata.gz: 488a061561dd21d3929ce1cf8780a45f624f3b17101c0fd2f59d3f25a13097f7b3ebb5f5fc3576c9c0951bfbc3cf8faaf23731dee889480a919b7fc7a1c04ebb
+  data.tar.gz: 8a4a4ec2503b3f5d61e593339aafe575877b25f7b6aee7e546c2de51328c24b477afea400d44beee7f3e808018209d4030a1c765a4704f6da364703e64e9c351

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3 - 2017-11-14
+
+* [fixed] Add a logic to check credentials before searching issues [#49](https://github.com/treasure-data/embulk-input-jira/pull/49)
+
 ## 0.2.2 - 2017-08-29
 
 * [fixed] Added retry block to fix jiralicious authentication session [#48](https://github.com/treasure-data/embulk-input-jira/pull/48)

data/embulk-input-jira.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-jira"
-  spec.version       = "0.2.2"
+  spec.version       = "0.2.3"
   spec.authors       = ["uu59", "yoshihara"]
   spec.summary       = "Jira input plugin for Embulk"
   spec.description   = "Loads records from Jira."

data/lib/embulk/input/jira.rb

@@ -62,6 +62,9 @@ module Embulk
         retry_initial_wait_sec = config.param(:retry_initial_wait_sec, :integer, default: 1)
         retryer = retryer(retry_limit, retry_initial_wait_sec)
 
+        # Get credential before going to search issue
+        jira.check_user_credential(username)
+
         # TODO: we use 0..10 issues to guess config?
         records = retryer.with_retry do
           jira.search_issues(jql, max_results: GUESS_RECORDS_COUNT).map do |issue|
@@ -93,6 +96,8 @@ module Embulk
 
       def run
         return preview if preview?
+
+        @jira.check_user_credential(task[:username])
         options = {}
         total_count = @jira.total_count(@jql)
         last_page = (total_count.to_f / PER_PAGE).ceil
@@ -136,6 +141,8 @@ module Embulk
       private
 
       def preview
+        @jira.check_user_credential(task[:username])
+
         logger.debug "For preview mode, JIRA input plugin fetches records at most #{PREVIEW_RECORDS_COUNT}"
         @jira.search_issues(@jql, max_results: PREVIEW_RECORDS_COUNT).each do |issue|
           values = @attributes.map do |(attribute_name, type)|

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

@@ -40,6 +40,19 @@ module Embulk
           search(jql, max_results: 1).num_results
         end
 
+        def check_user_credential(username)
+          Jiralicious::Issue.find(username)
+        rescue Jiralicious::JqlError, Jiralicious::AuthenticationError, Jiralicious::NotLoggedIn, Jiralicious::InvalidLogin => e
+          raise Embulk::ConfigError.new(e.message)
+        rescue ::SocketError => e
+          # wrong `uri` option given
+          raise Embulk::ConfigError.new(e.message)
+        rescue MultiJson::ParseError => e
+          html = e.message
+          title = html[%r|<title>(.*?)</title>|, 1] #=> e.g. "Unauthorized (401)"
+          raise ConfigError.new("Can not authorize with your credential.") if title == 'Unauthorized (401)'
+        end
+
         private
 
         def timeout_and_retry(wait, retry_times = DEFAULT_SEARCH_RETRY_TIMES, &block)
@@ -61,13 +74,12 @@ module Embulk
             title = html[%r|<title>(.*?)</title>|, 1] #=> e.g. "Unauthorized (401)"
             if title
               # (a)
-              Embulk.logger.warn "JIRA returns HTML: #{html}"
               case title
               when "Atlassian Cloud Notifications - Page Unavailable"
                 # a.k.a. HTTP 503
                 raise title
               when "Unauthorized (401)"
-                Embulk.logger.warn "JIRA returns error: #{title}"
+                Embulk.logger.warn "JIRA returns error: #{title}. Will go to retry"
                 count += 1
                 retry
               end

data/spec/embulk/input/jira_spec.rb

@@ -131,6 +131,7 @@ describe Embulk::Input::Jira do
     end
 
     before do
+      allow(jira_api).to receive(:check_user_credential).with(username).and_return(username)
       allow(jira_api).to receive(:search_issues).with(jql, max_results: described_class::GUESS_RECORDS_COUNT).and_return(jira_issues)
 
       allow(config).to receive(:param).with(:username, :string).and_return(username)
@@ -211,12 +212,14 @@ describe Embulk::Input::Jira do
     end
 
     let(:commit_report) { {} }
+    let(:username) { "jira-user" }
 
     before do
       allow(jira_api).to receive(:preview?).and_return(false)
 
       # TODO: create stubs without each `it` expected
       allow(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
+      allow(jira_api).to receive(:check_user_credential).and_return(username)
 
       0.step(total_count, max_result) do |start_at|
         issues = jira_issues[start_at..(start_at + max_result - 1)]
@@ -256,6 +259,7 @@ describe Embulk::Input::Jira do
     let(:page_builder) { double("page_builder") }
     let(:jira_api) { Embulk::Input::JiraApi::Client.new }
     let(:jira_issues) { [Embulk::Input::JiraApi::Issue.new(attributes)] }
+    let(:username) { "jira-user" }
     let(:attributes) do
       {
         "id" => "100",
@@ -281,6 +285,7 @@ describe Embulk::Input::Jira do
       allow(Embulk::Input::JiraApi::Client).to receive(:setup).and_return(jira_api)
       allow(plugin).to receive(:logger).and_return(::Logger.new(File::NULL))
       allow(plugin).to receive(:preview?).and_return(true)
+      allow(jira_api).to receive(:check_user_credential).and_return(username)
       allow(jira_api).to receive(:search_issues).and_return(jira_issues)
       allow(page_builder).to receive(:add)
       allow(page_builder).to receive(:finish)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - uu59
@@ -9,162 +9,162 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: jiralicious
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-  name: jiralicious
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
-  name: parallel
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: perfect_retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-  name: perfect_retry
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: '11.0'
-  name: rake
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
         version: '11.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
-  name: rspec
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: embulk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: embulk
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: codeclimate-test-reporter
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  name: everyleaf-embulk_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: everyleaf-embulk_helper
-  prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: Loads records from Jira.
 email:
 - k@uu59.org