Merge remote-tracking branch 'origin/feature/plugin-api-2_0'

Author: ph

.travis.yml

@@ -1,7 +1,11 @@
+---
 sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - jruby-1.7.23
-script: 
-  - bundle exec rspec spec
+- jruby-1.7.25
+script:
+- bundle exec rspec spec
+jdk: oraclejdk8
+before_install:
+- git clone -b feature/event_interface https://github.com/elastic/logstash

Gemfile

@@ -1,2 +1,10 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+gem "logstash-core", :path => "./logstash/logstash-core"
+gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
+gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
+gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"
+gem "logstash-codec-json_lines", :github => "logstash-plugins/logstash-codec-json_lines", :branch => "feature/plugin-api-2_0"
+gem "logstash-codec-line", :github => "logstash-plugins/logstash-codec-line", :branch => "feature/plugin-api-2_0"
+gem "logstash-input-generator", :github => "logstash-plugins/logstash-input-generator", :branch => "feature/plugin-api-2_0"
+gem "logstash-codec-plain", :github => "logstash-plugins/logstash-codec-plain", :branch => "feature/plugin-api-2_0"

logstash-output-file.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'logstash-codec-json_lines'
   s.add_runtime_dependency 'logstash-codec-line'
 

spec/outputs/file_spec.rb

@@ -34,10 +34,10 @@
 
       # Now check all events for order and correctness.
       events = tmp_file.map {|line| LogStash::Event.new(LogStash::Json.load(line))}
-      sorted = events.sort_by {|e| e['sequence']}
+      sorted = events.sort_by {|e| e.get('sequence')}
       sorted.each do |event|
-        insist {event["message"]} == "hello world"
-        insist {event["sequence"]} == line_num
+        insist {event.get("message")} == "hello world"
+        insist {event.get("sequence")} == line_num
         line_num += 1
       end
 
@@ -69,10 +69,10 @@
         line_num = 0
         # Now check all events for order and correctness.
         events = Zlib::GzipReader.open(tmp_file.path).map {|line| LogStash::Event.new(LogStash::Json.load(line)) }
-        sorted = events.sort_by {|e| e["sequence"]}
+        sorted = events.sort_by {|e| e.get("sequence")}
         sorted.each do |event|
-          insist {event["message"]} == "hello world"
-          insist {event["sequence"]} == line_num
+          insist {event.get("message")} == "hello world"
+          insist {event.get("sequence")} == line_num
           line_num += 1
         end
         insist {line_num} == event_count
@@ -166,7 +166,7 @@
       context "when trying to write outside the files root directory" do
         let(:bad_event) do
           event = LogStash::Event.new
-          event['error'] = '../uncool/directory'
+          event.set('error', '../uncool/directory')
           event
         end
 
@@ -179,7 +179,7 @@
 
             # Trying to write outside the file root
             outside_path = "#{'../' * path.split(File::SEPARATOR).size}notcool"
-            bad_event["error"] = outside_path
+            bad_event.set("error", outside_path)
 
 
             output = LogStash::Outputs::File.new(config)
@@ -201,10 +201,10 @@
             output = LogStash::Outputs::File.new({ "path" =>  "/#{path}/%{error}"})
             output.register
 
-            bad_event['error'] = encoded_once
+            bad_event.set('error', encoded_once)
             output.receive(bad_event)
 
-            bad_event['error'] = encoded_twice
+            bad_event.set('error', encoded_twice)
             output.receive(bad_event)
 
             expect(Dir.glob(File.join(path, "*")).size).to eq(2)
@@ -217,7 +217,7 @@
             output = LogStash::Outputs::File.new({ "path" =>  "/#{path}/%{error}"})
             output.register
 
-            bad_event['error'] = '../..//test'
+            bad_event.set('error', '../..//test')
             output.receive(bad_event)
 
             expect(Dir.glob(File.join(path, "*")).size).to eq(1)
@@ -229,15 +229,15 @@
       context 'when trying to write inside the file root directory' do
         it 'write the event to the generated filename' do
           good_event = LogStash::Event.new
-          good_event['error'] = '42.txt'
+          good_event.set('error', '42.txt')
 
           Stud::Temporary.directory do |path|
             config = { "path" => "#{path}/%{error}" }
             output = LogStash::Outputs::File.new(config)
             output.register
             output.receive(good_event)
 
-            good_file = File.join(path, good_event['error'])
+            good_file = File.join(path, good_event.get('error'))
             expect(File.exist?(good_file)).to eq(true)
             output.close
           end
@@ -285,15 +285,15 @@
 
         it 'write the event to the generated filename with multiple deep' do
           good_event = LogStash::Event.new
-          good_event['error'] = '/inside/errors/42.txt'
+          good_event.set('error', '/inside/errors/42.txt')
 
           Stud::Temporary.directory do |path|
             config = { "path" => "#{path}/%{error}" }
             output = LogStash::Outputs::File.new(config)
             output.register
             output.receive(good_event)
 
-            good_file = File.join(path, good_event['error'])
+            good_file = File.join(path, good_event.get('error'))
             expect(File.exist?(good_file)).to eq(true)
             output.close
           end
@@ -304,7 +304,7 @@
       context "when using default configuration" do
         it 'write the event as a json line' do
           good_event = LogStash::Event.new
-          good_event['message'] = 'hello world'
+          good_event.set('message', 'hello world')
 
           Stud::Temporary.directory do |path|
             config = { "path" => "#{path}/output.txt" }
@@ -316,15 +316,15 @@
             output.close #teardown first to allow reading the file
             File.open(good_file) {|f|
               event = LogStash::Event.new(LogStash::Json.load(f.readline))
-              expect(event["message"]).to eq("hello world")
+              expect(event.get("message")).to eq("hello world")
             }
           end
         end
       end
       context "when using line codec" do
         it 'writes event using specified format' do
           good_event = LogStash::Event.new
-          good_event['message'] = "hello world"
+          good_event.set('message', "hello world")
 
           Stud::Temporary.directory do |path|
             config = { "path" => "#{path}/output.txt" }
@@ -345,7 +345,7 @@
       context "when using deprecated message_format config" do
         it 'falls back to line codec' do
           good_event = LogStash::Event.new
-          good_event['message'] = 'hello world'
+          good_event.set('message', 'hello world')
 
           Stud::Temporary.directory do |path|
             config = { "path" => "#{path}/output.txt", "message_format" => "Custom format: %{message}" }
@@ -365,7 +365,7 @@
       context "when using file and dir modes" do
         it 'dirs and files are created with correct atypical permissions' do
           good_event = LogStash::Event.new
-          good_event['message'] = "hello world"
+          good_event.set('message', "hello world")
 
           Stud::Temporary.directory do |path|
             config = {
@@ -386,7 +386,7 @@
             output.close #teardown first to allow reading the file
             File.open(good_file) {|f|
               event = LogStash::Event.new(LogStash::Json.load(f.readline))
-              expect(event["message"]).to eq("hello world")
+              expect(event.get("message")).to eq("hello world")
             }
           end
         end