fluent-plugin-typetalk 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjc1OTkyYWY4NmZjZGU4MjRlYmUyNmUyMWVmYThlMjJiMGY4MGU3Ng==
+    NWQzZGQzYjc3MTdlYzNkMDdjZDk5Yjg0OWI4OTU5N2IxZDM0ZDFiMA==
   data.tar.gz: !binary |-
-    OGQ4YmQ5MmVjMzJkMjc0YmVmM2UwNmYyNmQ3YTdhZTgxNDdjYzk5OA==
+    MWFjMDJhOWVjMjY1NjcwMGYyYmM5YjdiOGUzZmZmN2E3NDAyNzBiYg==
 SHA512:
   metadata.gz: !binary |-
-    OWU3ZDdjNzI0ZGRkOGQ3YjRiMDNkNDJjMTQ3YmRjYTQzODlkY2U1NjlhZTJl
-    MzgxMTExYzAyZTcyMWY5ZTg5YWI1MzVjMDFmNTMxMjUwZDFiYjU0MGVhZGQy
-    ZGVmMGYwNmYxOWE2YmI5MGNlMjJlMTI4ZDAyNzEzNzg5Yjg0ZWY=
+    MGJlMTlmOWQ1YjVjNjQ5YTA3OGIxMDk4MDNjYjIyYTlkNzU4OGZmZGUwZjE2
+    ZTcyMmQ2OTBjMGY2Yzk1MjEyZDFjZWExYjYzYzBlNGRhMzUwNDVhNmVkZDE5
+    ZDgwMzVjNTZiNTkyOTM5MjA2YWFkNjUzNmJkM2EzZWExOTRmZTE=
   data.tar.gz: !binary |-
-    ZGNkNGUzY2IxNzY3ODZjYmRlNzhjMWZlMWQ0ODBlODUyMDk2OTlmMDc3ZDk4
-    MDUzNTE2ZmRkYmFkNjcwYWU4NTdlZDgwZjY4YWM4ODg2NDNiZGE5ZTBkYzkz
-    NGU4MTc2ZTcwNDRkZGYwNmZlOGQyMjdmYTgyNDE2M2NmNmIwYWM=
+    ZmNjODJhNTY2ZjhlZGFmNWEyYmFhZjA5Nzk4Y2Y4OWM0YzEyMmQ5MTNlYTJi
+    NTMxMDgyYTM2ZDZmZTRmOWE5OGU5MmIzODRjNTdjNWM1YzI0OGM2YjEwMzY4
+    NTUwNGU2ZWQzNmU4OTUyNWM1Y2YwZjA5OTg5NzJkN2M3NjY2YzE=

data/fluent-plugin-typetalk.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-typetalk"
-  spec.version       = "0.0.6"
+  spec.version       = "0.0.7"
   spec.authors       = ["tksmd","umakoz"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send message to typetalk}

data/lib/fluent/plugin/out_typetalk.rb

@@ -120,10 +120,13 @@ module Fluent
           # https://developer.nulab-inc.com/docs/typetalk/auth#client
           if body.has_key?('error')
             msg = body['error']
-          else
+          elsif body.has_key?('errors')
             msg = body['errors'].map{|f|
               f['field'] + ' : ' + f['message']
             }.join(',')
+          elsif !res['headers'].nil?
+            headers = JSON.parse(res['headers']) rescue {}
+            msg = headers['www-authenticate']
           end
 
         end

data/test/plugin/test_out_typetalk.rb

@@ -143,6 +143,20 @@ class TypetalkOutputTest < Test::Unit::TestCase
     d.run()
   end
 
+  def test_oauth2_error
+    d = create_driver()
+    stub(d.instance.typetalk).post_message(1, 'notice : test1') {
+      raise Typetalk::InvalidRequest, {status:400, headers:'{"www-authenticate": "Bearer error=\"invalid_scope\""}', body:""}.to_json
+    }
+    stub(d.instance.log).error {|name, params|
+      assert_equal "out_typetalk:", name
+      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal "failed to post, msg: Bearer error=\"invalid_scope\", code: 400", params[:error]
+    }
+    d.emit({'message' => 'test1'})
+    d.run()
+  end
+
   def test_throttle
     d = create_driver(CONFIG_THROTTLE)
     mock(d.instance.typetalk).post_message(1, 'notice : test1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-typetalk
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - tksmd