logstash-mixin-rabbitmq_connection 2.3.1-java → 2.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 235a0083a64451c877c34cf5be6ec6a8c57b3b7c
-  data.tar.gz: 82177140035d5d5852a69b8ac49340fbd115e495
+  metadata.gz: aa859308506de4169949b7208483cbd08b4732c2
+  data.tar.gz: cbc12c2819c8ae228a202c3576c39ff42e4ce278
 SHA512:
-  metadata.gz: d452214386f4b570bc1c275688e92377700ff1e1ea023c61ae23d5d4d5e54dfc1b67bf4b7161f0c1b7d4a4037dd8c3b5e2be60a88bb5752dd2dd875cbabc3fec
-  data.tar.gz: 4ab9eab0c56b32ea7bc84aff624bfea0361c411c3ea0c96cd907b371f30e1ae6571410175f7e1906a2d42c3216acc33e44ae409fbdce8e4ee173dbc40ef5518c
+  metadata.gz: 63a90f139dc4fa0233aafb10df394c868a7e1b67592a40e0e6447dc81dcd6dbb33174fa6999227ae18088f016f8e8006e7fab8aaf3d9c15d9131f48794775722
+  data.tar.gz: e36ba70d5c725dc13e14a62a481cbfb83db0ba74e34772057fd827870c2f1acb48da9f98d35d195167d67c64df93b714316fdab6614f2ebcb17423641f984e51

data/.travis.yml

@@ -0,0 +1,7 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - jruby-1.7.23
+script: 
+  - bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 2.4.0
+  - Add SSL/TLS Support
+  - Add support for "x-consistent-hash" and "x-modulus-hash" exchanges
 * 2.3.1
   - use logstash-core-plugin-api as dependency instead of logstash-core directly
 * 2.3.0

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -8,7 +8,7 @@ require "java"
 module LogStash
   module PluginMixins
     module RabbitMQConnection
-      EXCHANGE_TYPES = ["fanout", "direct", "topic"]
+      EXCHANGE_TYPES = ["fanout", "direct", "topic", "x-consistent-hash", "x-modulus-hash"]
 
       HareInfo = Struct.new(:connection, :channel, :exchange, :queue)
 
@@ -37,7 +37,8 @@ module LogStash
         config :vhost, :validate => :string, :default => "/"
 
         # Enable or disable SSL
-        config :ssl, :validate => :boolean, :default => false
+        # Specify TLS version if using TLS e.g "TLSv1.2"
+        config :ssl, :validate => :string
 
         # Validate SSL certificate
         config :verify_ssl, :validate => :boolean, :default => false
@@ -60,6 +61,12 @@ module LogStash
         # Passive queue creation? Useful for checking queue existance without modifying server state
         config :passive, :validate => :boolean, :default => false
 
+        # TLS certifcate path
+        config :tls_certificate_path, :validate => :path
+
+        # TLS certificate password
+        config :tls_certificate_password, :validate => :string
+
         # Extra queue arguments as an array.
         # To make a RabbitMQ queue mirrored, use: `{"x-ha-policy" => "all"}`
         config :arguments, :validate => :array, :default => {}
@@ -90,6 +97,8 @@ module LogStash
         s[:timeout] = @connection_timeout || 0
         s[:heartbeat] = @heartbeat || 0
         s[:tls] = @ssl if @ssl
+        s[:tls_certificate_path] = @tls_certificate_path || ""
+        s[:tls_certificate_password] = @tls_certificate_password || ""
         @rabbitmq_settings = s
       end
 

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '2.3.1'
+  s.version         = '2.4.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This is used to provide configuration options and connection settings for logstash plugins working with RabbitMQ"

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -2,6 +2,7 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/pipeline"
 require "logstash/plugin_mixins/rabbitmq_connection"
+require "stud/temporary"
 
 class TestPlugin < LogStash::Outputs::Base
   include LogStash::PluginMixins::RabbitMQConnection
@@ -27,7 +28,15 @@ describe LogStash::PluginMixins::RabbitMQConnection do
   let(:hare_info) { instance.instance_variable_get(:@hare_info) }
 
   describe "rabbitmq_settings" do
-    let(:rabbitmq_settings) { super.merge({"connection_timeout" => 123, "heartbeat" => 456}) }
+    let(:file) { Stud::Temporary.file }
+    let(:path) { file.path }
+    after { File.unlink(path)}
+
+    let(:rabbitmq_settings) { super.merge({"connection_timeout" => 123,
+                                           "heartbeat" => 456,
+                                           "ssl" => "TLS1.2",
+                                           "tls_certificate_path" => path,
+                                           "tls_certificate_password" => "123"}) }
 
     it "should set the timeout to the expected value" do
       expect(instance.rabbitmq_settings[:timeout]).to eql(rabbitmq_settings["connection_timeout"])
@@ -36,6 +45,18 @@ describe LogStash::PluginMixins::RabbitMQConnection do
     it "should set heartbeat to the expected value" do
       expect(instance.rabbitmq_settings[:heartbeat]).to eql(rabbitmq_settings["heartbeat"])
     end
+
+    it "should set tls to the expected value" do
+      expect(instance.rabbitmq_settings[:tls]).to eql(rabbitmq_settings["ssl"])
+    end
+
+    it "should set tls_certificate_path to the expected value" do
+      expect(instance.rabbitmq_settings[:tls_certificate_path]).to eql(rabbitmq_settings["tls_certificate_path"])
+    end
+
+    it "should set tls_certificate_password to the expected value" do
+      expect(instance.rabbitmq_settings[:tls_certificate_password]).to eql(rabbitmq_settings["tls_certificate_password"])
+    end
   end
 
   context "when connected" do
@@ -112,4 +133,4 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       expect(subject).to have_received(:sleep_for_retry).once
     end
   end
-end
+end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: march_hare
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: 2.15.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.15.0
-  name: march_hare
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.15.0
-- !ruby/object:Gem::Dependency
+        version: 0.0.22
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.22
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is used to provide configuration options and connection settings for logstash plugins working with RabbitMQ
 email: info@elastic.co
 executables: []
@@ -101,6 +101,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - README.md
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Common functionality for RabbitMQ plugins