fluent-plugin-mongo 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eedc0d2a61f67e0ef0e8e4b36066e1e0491d263d
-  data.tar.gz: d4bec2e33837adc3dda2a54cfe270ac82f6ad805
+  metadata.gz: fb5c56a40c5a058bd8b710af7fe2b065b96b2e0d
+  data.tar.gz: 761f54a14e8dde03a9c669ff89a0dda9d07b84ce
 SHA512:
-  metadata.gz: f1b9d8b626bd916c3837465430535bb598487cf3742bb52da05b28ca13198d0b98591a1c399923426e59c15f35cb4b47c5a53e23630555c532854b827dbbb6e1
-  data.tar.gz: '085554829eaa6becd079dafa4bbc61ad6f9122f93aba4c39e9f2eb0d8f186e37e0a2ae775cb32c71af4351ac24166eb5b4eec4ed764202fa8858e1183176cd05'
+  metadata.gz: b9b5368add232fe67d644a95d28e5adbe8f4584f63e67c347effb36b50188b1321f1628d16c4494c1aac404db120edc91ff09558f85ad3a7439310909fc4e4d9
+  data.tar.gz: cd1d6a83f39438d464829baab15d6e9e490fa1b693947111b9ffc7176ff2c8c73673f5c109a562a9d17be447b99cbf59fbb9ebf98ebc04f6ba39cdaafcdb4684

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 1.3.0 - 2019/04/24
+
+	* out_mongo: Support auth_mech parameter to allow other authentication
+	* in_mongo_tail: Fix replicat set issue
+
 Release 1.2.2 - 2019/04/01
 
 	* out_mongo: Don't handle database placholders when specifying connection_string parameter

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -118,10 +118,10 @@ module Fluent::Plugin
     private
 
     def client
-      @client_options[:database] = @database
+      @client_options[:database] = @database if @database
       @client_options[:user] = @user if @user
       @client_options[:password] = @password if @password
-      Mongo::Client.new(["#{node_string}"], @client_options)
+      Mongo::Client.new(node_string, @client_options)
     end
 
     def get_collection
@@ -133,7 +133,7 @@ module Fluent::Plugin
     def node_string
       case
       when @database
-        "#{@host}:#{@port}"
+        ["#{@host}:#{@port}"]
       when @url
         @url
       end

data/lib/fluent/plugin/mongo_auth.rb

@@ -8,23 +8,25 @@ module Fluent
         config_param :password, :string, default: nil, secret: true
         desc "MongoDB authentication database"
         config_param :auth_source, :string, default: nil
+        desc "MongoDB authentication mechanism"
+        config_param :auth_mech, :string, default: nil
       }
     end
   end
 
   module MongoAuth
     def authenticate(client)
-      unless @user.nil? || @password.nil?
-        begin
-          if @auth_source.nil?
-            client = client.with(user: @user, password: @password)
-          else
-            client = client.with(user: @user, password: @password, auth_source: @auth_source)
-          end
-        rescue Mongo::Auth::Unauthorized => e
-          log.fatal e
-          exit!
+      begin
+        if [@user, @password, @auth_source].all?
+          client = client.with(user: @user, password: @password, auth_source: @auth_source)
+        elsif [@user, @password].all?
+          client = client.with(user: @user, password: @password)
+        elsif [@user, @auth_source, @auth_mech].all?
+          client = client.with(user: @user, auth_source: @auth_source, auth_mech: @auth_mech.to_sym)
         end
+      rescue Mongo::Auth::Unauthorized => e
+        log.fatal e
+        exit!
       end
       client
     end

data/lib/fluent/plugin/out_mongo.rb

@@ -108,6 +108,10 @@ module Fluent::Plugin
 
       super
 
+      if @auth_mech && !Mongo::Auth::SOURCES.has_key?(@auth_mech.to_sym)
+        raise Fluent::ConfigError, Mongo::Auth::InvalidMechanism.new(@auth_mech.to_sym)
+      end
+
       if @connection_string.nil? && @database.nil?
         raise Fluent::ConfigError,  "connection_string or database parameter is required"
       end

data/test/plugin/test_out_mongo.rb

@@ -92,6 +92,22 @@ class MongoOutputTest < ::Test::Unit::TestCase
     end
   end
 
+  def test_configure_auth_mechanism
+    Mongo::Auth::SOURCES.each do |key, value|
+      conf = default_config + %[
+        auth_mech #{key}
+      ]
+      d = create_driver(conf)
+      assert_equal(key.to_s, d.instance.auth_mech)
+    end
+    assert_raise Fluent::ConfigError do
+      conf = default_config + %[
+        auth_mech invalid
+      ]
+      d = create_driver(conf)
+    end
+  end
+
   def test_configure_with_ssl
     conf = default_config + %[
       ssl true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd