fluent-plugin-out-http 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd85f5885dad181862a83638f8bb88f67f896abb63f705f6e7c9c128318feac
-  data.tar.gz: d10e356dd5f510b085385ac52034d43ba3a92fc457549fc719a0305da298096f
+  metadata.gz: dafd3484539763a106d90e6bb4acf4ca7877a3734a0a256bfa5b614e0de16a15
+  data.tar.gz: a1fc0b58b3d6adcb44c686715030710e2d96b188842eeb61e8f3eb0b9746b18a
 SHA512:
-  metadata.gz: f47578551ada94db75b72156cd0c1e96fbad70225e715eca3ed63ad1d34123b2e870fdfe47c11d6c5a7b0605a81c8e820ce78748fac6c6bb0a32f775ded3664e
-  data.tar.gz: 8ef5a6c31b36978efdef707c6064772c4d2151b87b576766698ae07e522ec645a7a683b455363658f2e36c43c2fce2ba4fd0bb624e236c389ec7e4d7fdc77a08
+  metadata.gz: 6f91c5e5737673625a691920e751e2e9e85e7b06aefbd2cddca85de54cdc19b01168ccbf746001b35a90cfeaa384cd7d5768f7e680bb4e0fa02c703131bb5374
+  data.tar.gz: 1943958c63b8e7feb8f2c43a78875bb672eb33e38677328c9d268014a250ef5bab9c1180edfec892d0e278d2fd8cef54055525f2f59b5d2212b335b0e167cfad

data/fluent-plugin-out-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http"
-  gem.version       = "1.0.0"
+  gem.version       = "1.0.1"
   gem.authors       = ["Marica Odagaki"]
   gem.email         = ["ento.entotto@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint}

data/lib/fluent/plugin/out_http.rb

@@ -21,10 +21,10 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   config_param :ssl_no_verify, :bool, :default => false
 
   # HTTP method
-  config_param :http_method, :string, :default => :post
+  config_param :http_method, :enum, list: [:get, :put, :post, :delete], :default => :post
 
   # form | json
-  config_param :serializer, :string, :default => :form
+  config_param :serializer, :enum, list: [:json, :form], :default => :form
 
   # Simple rate limiting: ignore any records within `rate_limit_msec`
   # since the last one.
@@ -33,8 +33,8 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   # Raise errors that were rescued during HTTP requests?
   config_param :raise_on_error, :bool, :default => true
 
-  # nil | 'none' | 'basic'
-  config_param :authentication, :string, :default => nil
+  # 'none' | 'basic'
+  config_param :authentication, :enum, list: [:none, :basic],  :default => :none
   config_param :username, :string, :default => ''
   config_param :password, :string, :default => '', :secret => true
   # Switch non-buffered/buffered plugin
@@ -55,26 +55,6 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
                          OpenSSL::SSL::VERIFY_PEER
                        end
 
-    serializers = [:json, :form]
-    @serializer = if serializers.include? @serializer.intern
-                    @serializer.intern
-                  else
-                    :form
-                  end
-
-    http_methods = [:get, :put, :post, :delete]
-    @http_method = if http_methods.include? @http_method.intern
-                    @http_method.intern
-                  else
-                    :post
-                  end
-
-    @auth = case @authentication
-            when 'basic' then :basic
-            else
-              :none
-            end
-
     @last_request_time = nil
     raise Fluent::ConfigError, "'tag' in chunk_keys is required." if !@chunk_key_tag && @buffered
   end
@@ -136,7 +116,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
     res = nil
 
     begin
-      if @auth and @auth == :basic
+      if @authentication == :basic
         req.basic_auth(@username, @password)
       end
       @last_request_time = Time.now.to_f
@@ -186,6 +166,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
 
   def write(chunk)
     tag = chunk.metadata.tag
+    @endpoint_url = extract_placeholders(@endpoint_url, chunk.metadata)
     chunk.msgpack_each do |time, record|
       handle_record(tag, time, record)
     end

data/test/plugin/test_out_http.rb

@@ -42,7 +42,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
       srv = WEBrick::HTTPServer.new(self.class.server_config)
       begin
         allowed_methods = %w(POST PUT)
-        srv.mount_proc('/api/') { |req,res|
+        srv.mount_proc('/api') { |req,res|
           @requests += 1
           unless allowed_methods.include? req.request_method
             res.status = 405
@@ -70,6 +70,10 @@ class HTTPOutputTestBase < Test::Unit::TestCase
 
           res.status = 200
         }
+        srv.mount_proc('/modified-api') { |req,res|
+          res.status = 303
+          res.body = 'See other'
+        }
         srv.mount_proc('/') { |req,res|
           res.status = 200
           res.body = 'running'
@@ -118,6 +122,8 @@ class HTTPOutputTestBase < Test::Unit::TestCase
     assert_equal 'gauge', @posts[0][:form]['mode']
     assert_nil @posts[0][:auth]
 
+    assert_equal '303', client.request_get('/modified-api').code
+
     @auth = true
 
     assert_equal '403', client.request_post('/api/service/metrics/pos', 'number=30&mode=gauge', post_header).code
@@ -256,6 +262,21 @@ class HTTPOutputTest < HTTPOutputTestBase
       assert_equal 2, @posts.size
     end
 
+    def test_emit_form_with_placeholders
+      d = create_driver(Fluent::Config::Element.new(
+                          'ROOT', '' ,
+                          {"endpoint_url" => "${endpoint}",
+                          "buffered" => true},
+                          [Fluent::Config::Element.new('buffer', 'tag, endpoint', {"@type" => "memory"} ,[])]))
+
+      d.run(default_tag: 'test.metrics', shutdown: false) do
+        d.feed({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1, 'binary' => "\xe3\x81\x82".force_encoding("ascii-8bit"), 'endpoint' => "http://127.0.0.1:#{self.class.port}/modified-api/" })
+      end
+
+      assert_equal 0, @posts.size # post into other URI
+      assert_equal "http://127.0.0.1:#{self.class.port}/modified-api/", d.instance.endpoint_url
+    end
+
     def test_emit_form_put
       d = create_driver CONFIG_PUT + %[buffered true]
       d.run(default_tag: 'test.metrics', shutdown: false) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marica Odagaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby