[Tests] Update unit tests to account for ECS (#94)

* [Tests] Update unit tests to account for ECS and fix .ci integration This fixes tests to account for the different data shape presented when ECS is on by default in Logstash 8.x This also fixes .ci integration - .ci is no longer introduced via submodules - the submodule is out of date and breaking the build.

Author: robbavey

.ci

@@ -1,3 +1,7 @@
+## unreleased
+ - Fixed unit tests to account for ECS by default [#94](https://github.com/logstash-plugins/logstash-output-file/pull/94)
+ - Fixed .ci integration [#94](https://github.com/logstash-plugins/logstash-output-file/pull/94)
+ 
 ## 4.3.0
  - Made `stale_cleanup_interval` configurable [#84](https://github.com/logstash-plugins/logstash-output-file/pull/84)
  - CI: upgrade testing [#83](https://github.com/logstash-plugins/logstash-output-file/pull/83)

.gitmodules

@@ -12,6 +12,10 @@
 require "fileutils"
 require "flores/random"
 
+def get_sequence_number(event)
+ event.get('sequence') || event.get('event')['sequence']
+end
+
 describe LogStash::Outputs::File do
  describe "ship lots of events to a file" do
  tmp_file = Tempfile.new('logstash-spec-output-file')
@@ -37,10 +41,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.get('sequence')}
+ sorted = events.sort_by {|e| get_sequence_number(e)}
  sorted.each do |event|
  insist {event.get("message")} == "hello world"
- insist {event.get("sequence")} == line_num
+ insist {get_sequence_number(event)} == line_num
  line_num += 1
  end
 
@@ -72,10 +76,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.get("sequence")}
+ sorted = events.sort_by {|e| get_sequence_number(e)}
  sorted.each do |event|
  insist {event.get("message")} == "hello world"
- insist {event.get("sequence")} == line_num
+ insist {get_sequence_number(event)} == line_num
  line_num += 1
  end
  insist {line_num} == event_count