fluent-plugin-sentry-http 0.1.0 → 0.1.1

data/README.md

@@ -29,11 +29,11 @@ Plugin to accept exception input from [Sentry Clients](https://github.com/getsen
   type sentry_http
   port 8888
   bind 0.0.0.0
-  <application 999>
+  <project 999>
     tag sentry.egg
-    user aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    pass bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-  </application>
+    key aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    secret bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+  </project>
 </source>
 ```
 

data/lib/fluent/plugin/in_sentry_http.rb

@@ -16,27 +16,27 @@ module Fluent
     def configure(conf)
       super
       conf.elements.select {|element|
-        element.name == 'application'
+        element.name == 'project'
       }.each do |element|
         @mapping[element.arg] = {
           'tag' => element['tag'],
-          'user' => element['user'],
-          'pass' => element['pass'],
+          'key' => element['key'],
+          'secret' => element['secret'],
         }
       end
     end
 
     def on_request(path_info, params)
       begin
-        application = @mapping[path_info.split('/')[2]]  # /api/999/store/
-        raise 'not found' unless application
+        project = @mapping[path_info.split('/')[2]]  # /api/999/store/
+        raise 'not found' unless project
       rescue
         return ['404 Not Found', {'Content-type' => 'text/plain'}, '']
       end
 
       begin
-        user, pass = get_auth_info(params)
-        raise 'unauthorized' unless application['user'] == user and application['pass'] == pass
+        key, secret = get_auth_info(params)
+        raise 'unauthorized' unless project['key'] == key and project['secret'] == secret
       rescue
         return ['401 Unauthorized', {'Content-type' => 'text/plain'}, '']
       end
@@ -45,7 +45,7 @@ module Fluent
         time, record = parse_params(params)
         raise 'Record not found' if record.nil?
 
-        record['tag'] = application['tag']
+        record['tag'] = project['tag']
         record['time'] = time
 
         if @add_http_headers
@@ -64,7 +64,7 @@ module Fluent
       end
 
       begin
-        router.emit(application['tag'], time, record)
+        router.emit(project['tag'], time, record)
       rescue
         return ['500 Internal Server Error', {'Content-type' => 'text/plain'}, "500 Internal Server Error\n#{$!}\n"]
       end
@@ -86,18 +86,18 @@ module Fluent
     end
 
     def get_auth_info(params)
-      user = nil
-      pass = nil
+      sentry_key = nil
+      sentry_secret = nil
       params['HTTP_X_SENTRY_AUTH'].split(', ').each do |element|
         key, value = element.split('=')
         case key
         when 'sentry_key'
-          user = value
+          sentry_key = value
         when 'sentry_secret'
-          pass = value
+          sentry_secret = value
         end
       end
-      return user, pass
+      return sentry_key, sentry_secret
     end
   end
 end

data/lib/fluent/plugin/sentry_http/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module SentryHttp
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/test/plugin/test_in_sentry_http.rb

@@ -11,20 +11,20 @@ class SentryHttpInputTest < Test::Unit::TestCase
 
   PORT = unused_port
   HOST = '127.0.0.1'
-  APPLICATION = 999
+  PROJECT = 999
   TAG = 'from.raven'
-  USER = 'test_user'
-  PASS = 'test_pass'
+  KEY = 'test_key'
+  SECRET = 'test_secret'
 
   CONFIG = %[
     port #{PORT}
     bind #{HOST}
 
-    <application #{APPLICATION}>
+    <project #{PROJECT}>
       tag #{TAG}
-      user #{USER}
-      pass #{PASS}
-    </application>
+      key #{KEY}
+      secret #{SECRET}
+    </project>
   ]
 
   def create_driver(conf=CONFIG)
@@ -36,10 +36,10 @@ class SentryHttpInputTest < Test::Unit::TestCase
     assert_equal PORT, d.instance.port
     assert_equal '127.0.0.1', d.instance.bind
 
-    application = d.instance.mapping[APPLICATION.to_s]
-    assert_equal TAG, application['tag']
-    assert_equal USER, application['user']
-    assert_equal PASS, application['pass']
+    project = d.instance.mapping[PROJECT.to_s]
+    assert_equal TAG, project['tag']
+    assert_equal KEY, project['key']
+    assert_equal SECRET, project['secret']
   end
 
   def test_success_request
@@ -48,8 +48,8 @@ class SentryHttpInputTest < Test::Unit::TestCase
     d.expect_emit TAG, time, expect_record
     d.run do
       res = post_record(
-        APPLICATION,
-        create_headers(time, USER, PASS),
+        PROJECT,
+        create_headers(time, KEY, SECRET),
         record_to_payload(record))
       assert_equal '200', res.code
     end
@@ -61,7 +61,7 @@ class SentryHttpInputTest < Test::Unit::TestCase
     d.run do
       res = post_record(
         998,
-        create_headers(time, USER, PASS),
+        create_headers(time, KEY, SECRET),
         record_to_payload(record))
       assert_equal '404', res.code
     end
@@ -72,14 +72,14 @@ class SentryHttpInputTest < Test::Unit::TestCase
     d = create_driver
     d.run do
       res = post_record(
-        APPLICATION,
-        create_headers(time, 'ham', PASS),
+        PROJECT,
+        create_headers(time, 'ham', SECRET),
         record_to_payload(record))
       assert_equal '401', res.code
 
       res = post_record(
-        APPLICATION,
-        create_headers(time, USER, 'egg'),
+        PROJECT,
+        create_headers(time, KEY, 'egg'),
         record_to_payload(record))
       assert_equal '401', res.code
     end
@@ -90,8 +90,8 @@ class SentryHttpInputTest < Test::Unit::TestCase
     d = create_driver
     d.run do
       res = post_record(
-        APPLICATION,
-        create_headers(time, USER, PASS),
+        PROJECT,
+        create_headers(time, KEY, SECRET),
         'spam')
       assert_equal '400', res.code
     end
@@ -107,9 +107,9 @@ class SentryHttpInputTest < Test::Unit::TestCase
     return time, record, expect_record
   end
 
-  def create_headers(time, user, pass)
+  def create_headers(time, key, secret)
     {
-      'X-Sentry-Auth' => "Sentry sentry_timestamp=#{time}, sentry_client=raven-python/5.2.0, sentry_version=6, sentry_key=#{user}, sentry_secret=#{pass}",
+      'X-Sentry-Auth' => "Sentry sentry_timestamp=#{time}, sentry_client=raven-python/5.2.0, sentry_version=6, sentry_key=#{key}, sentry_secret=#{secret}",
       'Content-Type' => 'application/octet-stream',
       'User-Agent' => 'raven-python/5.2.0',
     }
@@ -128,9 +128,9 @@ class SentryHttpInputTest < Test::Unit::TestCase
     Base64.encode64(compressed_text)
   end
 
-  def post_record(application, headers, payload)
+  def post_record(project, headers, payload)
     http = Net::HTTP.new(HOST, PORT)
-    req = Net::HTTP::Post.new("/api/#{application}/store/", headers)
+    req = Net::HTTP::Post.new("/api/#{project}/store/", headers)
     req.body = payload
     http.request(req)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - IKUTA Masahito
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-07-26 00:00:00 +09:00
+date: 2015-08-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency