fluent-plugin-amqp 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56dd14125b5d5e11d718509bf5d5369724abfede
-  data.tar.gz: f365b23bfe48ba0532fcec25ae385b077d93dd97
+  metadata.gz: e93fe77ace14180d097374471e736a137036749d
+  data.tar.gz: 6cb705baeaa7630379a9796a0ebb72e8f4c3cba7
 SHA512:
-  metadata.gz: 564dbdc68bfcbb594311e0db6f7ca8e46eb6304e1db46e3d4f78137577f2b03c0ba705dfdacba941ae603e6b928a233540df21c17783ae9d9d48e52cc6999cb8
-  data.tar.gz: 13e5add0d8226ab8fbdfb23ca1e2a729fab1465c015321a88f1851b85290704ccfd6d093402ada8a09fa5e46fd35612987fc931999dd4f0944253a9e54398397
+  metadata.gz: 2e426235e9caaa1b2f33ee7684820e48b2e73fcdb1c82bebe5e018e343924f6e61fcfb8064f4ff99b4e77bcc148e88f557290007e0d0bddb6c36108728f8bba9
+  data.tar.gz: 6bf70391454be18dc1ef97e157bc2dcd87ec8da28e95103e5a04c42d01feed1dcb22fc899ef922e3c1f5ee52af1a5161973634f4c4106bf08441722713f14cc5

data/lib/fluent/plugin/in_amqp.rb

@@ -60,7 +60,6 @@ module Fluent::Plugin
       unless (@host || @hosts) && @queue
         raise Fluent::ConfigError, "'host(s)' and 'queue' must be all specified."
       end
-      check_tls_configuration
     end
 
     def start
@@ -136,14 +135,6 @@ module Fluent::Plugin
       end
     end
 
-    def check_tls_configuration()
-      if @tls
-        unless @tls_key && @tls_cert
-            raise Fluent::ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
-        end
-      end
-    end
-
     def get_connection_options()
       hosts = @hosts ||= Array.new(1, @host)
       opts = {
@@ -151,10 +142,11 @@ module Fluent::Plugin
         pass: @pass, user: @user, ssl: @ssl,
         verify_ssl: @verify_ssl, heartbeat: @heartbeat,
         tls: @tls,
-        tls_cert: @tls_cert,
-        tls_key: @tls_key,
         verify_peer: @tls_verify_peer
       }
+      # Include additional optional TLS configurations
+      opts[:tls_key] = @tls_key if @tls_key
+      opts[:tls_cert] = @tls_cert if @tls_cert
       opts[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       return opts
     end

data/lib/fluent/plugin/out_amqp.rb

@@ -46,6 +46,7 @@ module Fluent::Plugin
     config_param :tls_verify_peer, :bool, default: true
     config_param :content_type, :string, default: "application/octet"
     config_param :content_encoding, :string, default: nil
+    config_param :auth_mechanism, :string, default: nil
 
     config_section :header do
       config_set_default :@type, DEFAULT_BUFFER_TYPE
@@ -110,7 +111,6 @@ module Fluent::Plugin
       unless @key || @tag_key
         raise Fluent::ConfigError, "Either 'key' or 'tag_key' must be set."
       end
-      check_tls_configuration
     end
 
     def start
@@ -218,15 +218,6 @@ module Fluent::Plugin
       h
     end
 
-
-    def check_tls_configuration()
-      if @tls
-        unless @tls_key && @tls_cert
-            raise Fluent::ConfigError, "'tls_key' and 'tls_cert' must be all specified if tls is enabled."
-        end
-      end
-    end
-
     def get_connection_options()
       hosts = @hosts ||= Array.new(1, @host)
       opts = {
@@ -236,7 +227,8 @@ module Fluent::Plugin
         tls: @tls || nil,
         tls_cert: @tls_cert,
         tls_key: @tls_key,
-        verify_peer: @tls_verify_peer
+        verify_peer: @tls_verify_peer,
+        auth_mechanism: @auth_mechanism
       }
       opts[:tls_ca_certificates] = @tls_ca_certificates if @tls_ca_certificates
       return opts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-amqp
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Hiromi Ishii
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AMQP input/output plugin or fluentd