logstash-output-elasticsearch 1.1.0-java → 2.0.0.beta4-java

data/spec/unit/outputs/elasticsearch_ssl_spec.rb

@@ -2,81 +2,56 @@ require_relative "../../../spec/es_spec_helper"
 require 'stud/temporary'
 
 describe "SSL option" do
-  ["node", "transport"].each do |protocol|
-    context "with protocol => #{protocol}" do
-      subject do
-        require "logstash/outputs/elasticsearch"
-        settings = {
-          "protocol" => protocol,
-          "node_name" => "logstash",
-          "cluster" => "elasticsearch",
-          "host" => "node01",
-          "ssl" => true
-        }
-        next LogStash::Outputs::ElasticSearch.new(settings)
-      end
-
-      it "should fail in register" do
-        expect {subject.register}.to raise_error
-      end
+  context "when using ssl without cert verification" do
+    subject do
+      require "logstash/outputs/elasticsearch"
+      settings = {
+        "hosts" => "node01",
+        "ssl" => true,
+        "ssl_certificate_verification" => false
+      }
+      next LogStash::Outputs::ElasticSearch.new(settings)
     end
-  end
 
-  context "when using http protocol" do
-    protocol = "http"
-    context "when using ssl without cert verification" do
-      subject do
-        require "logstash/outputs/elasticsearch"
-        settings = {
-          "protocol" => protocol,
-          "host" => "node01",
-          "ssl" => true,
-          "ssl_certificate_verification" => false
-        }
-        next LogStash::Outputs::ElasticSearch.new(settings)
-      end
-
-      it "should pass the flag to the ES client" do
-        expect(::Elasticsearch::Client).to receive(:new) do |args|
-          expect(args[:ssl]).to eq(:verify => false)
-        end
-        subject.register
+    it "should pass the flag to the ES client" do
+      expect(::Elasticsearch::Client).to receive(:new) do |args|
+        expect(args[:ssl]).to eq(:verify => false)
       end
+      subject.register
+    end
 
-      it "print a warning" do
-        expect(subject.logger).to receive(:warn)
-        subject.register
-      end
+    it "print a warning" do
+      expect(subject.logger).to receive(:warn)
+      subject.register
     end
+  end
 
-    context "when using ssl with client certificates" do
+  context "when using ssl with client certificates" do
 
-      let(:keystore_path) { Stud::Temporary.file.path }
+    let(:keystore_path) { Stud::Temporary.file.path }
 
-      after :each do
-        File.delete(keystore_path)
-      end
+    after :each do
+      File.delete(keystore_path)
+    end
 
-      subject do
-        require "logstash/outputs/elasticsearch"
-        settings = {
-          "protocol" => protocol,
-          "host" => "node01",
-          "ssl" => true,
-          "keystore" => keystore_path,
-          "keystore_password" => "test"
-        }
-        next LogStash::Outputs::ElasticSearch.new(settings)
-      end
+    subject do
+      require "logstash/outputs/elasticsearch"
+      settings = {
+        "hosts" => "node01",
+        "ssl" => true,
+        "keystore" => keystore_path,
+        "keystore_password" => "test"
+      }
+      next LogStash::Outputs::ElasticSearch.new(settings)
+    end
 
 
-      it "should pass the keystore parameters to the ES client" do
-        expect(::Elasticsearch::Client).to receive(:new) do |args|
-          expect(args[:ssl]).to include(:keystore => keystore_path, :keystore_password => "test")
-        end
-        subject.register
+    it "should pass the keystore parameters to the ES client" do
+      expect(::Elasticsearch::Client).to receive(:new) do |args|
+        expect(args[:ssl]).to include(:keystore => keystore_path, :keystore_password => "test")
       end
-
+      subject.register
     end
+
   end
 end

metadata

@@ -1,194 +1,180 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.beta4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: concurrent-ruby
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.10
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: elasticsearch
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
-    - - ~>
+        version: 1.0.10
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.17
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+  name: stud
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: cabin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.0.17
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+  name: cabin
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.6'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ftw
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.42
+        version: 1.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.42
+  name: ftw
   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'
+        version: 0.0.42
+- !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: manticore
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
+  name: manticore
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: longshoreman
   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: longshoreman
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: flores
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 description: Output events to elasticsearch
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
@@ -196,41 +182,22 @@ files:
 - NOTICE.TXT
 - README.md
 - Rakefile
-- lib/logstash-output-elasticsearch_jars.rb
 - lib/logstash/outputs/elasticsearch.rb
 - lib/logstash/outputs/elasticsearch/elasticsearch-template.json
-- lib/logstash/outputs/elasticsearch/protocol.rb
+- lib/logstash/outputs/elasticsearch/http_client.rb
 - logstash-output-elasticsearch.gemspec
 - spec/es_spec_helper.rb
-- spec/integration/outputs/elasticsearch/node_spec.rb
+- spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/index_spec.rb
 - spec/integration/outputs/retry_spec.rb
 - spec/integration/outputs/routing_spec.rb
 - spec/integration/outputs/secure_spec.rb
 - spec/integration/outputs/templates_spec.rb
-- spec/integration/outputs/transport_create_spec.rb
 - spec/integration/outputs/update_spec.rb
 - spec/unit/outputs/elasticsearch/protocol_spec.rb
 - spec/unit/outputs/elasticsearch_proxy_spec.rb
 - spec/unit/outputs/elasticsearch_spec.rb
 - spec/unit/outputs/elasticsearch_ssl_spec.rb
-- vendor/jar-dependencies/runtime-jars/antlr-runtime-3.5.jar
-- vendor/jar-dependencies/runtime-jars/asm-4.1.jar
-- vendor/jar-dependencies/runtime-jars/asm-commons-4.1.jar
-- vendor/jar-dependencies/runtime-jars/elasticsearch-1.7.0.jar
-- vendor/jar-dependencies/runtime-jars/lucene-analyzers-common-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-core-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-grouping-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-highlighter-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-join-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-memory-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-misc-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-queries-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-queryparser-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-sandbox-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-spatial-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/lucene-suggest-4.10.4.jar
-- vendor/jar-dependencies/runtime-jars/spatial4j-0.4.1.jar
 homepage: http://logstash.net/
 licenses:
 - apache-2.0
@@ -243,14 +210,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8
@@ -259,13 +226,12 @@ specification_version: 4
 summary: Logstash Output to Elasticsearch
 test_files:
 - spec/es_spec_helper.rb
-- spec/integration/outputs/elasticsearch/node_spec.rb
+- spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/index_spec.rb
 - spec/integration/outputs/retry_spec.rb
 - spec/integration/outputs/routing_spec.rb
 - spec/integration/outputs/secure_spec.rb
 - spec/integration/outputs/templates_spec.rb
-- spec/integration/outputs/transport_create_spec.rb
 - spec/integration/outputs/update_spec.rb
 - spec/unit/outputs/elasticsearch/protocol_spec.rb
 - spec/unit/outputs/elasticsearch_proxy_spec.rb