logstash-output-cassandra 1.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccda8e1d446951b213876866064ec3f2ff49342
-  data.tar.gz: 16046aa9de45847c9a22713a390d3fe17b4cd3a0
+  metadata.gz: d59e968998f2c6a341ac05c52c2d6b2c249e9e0e
+  data.tar.gz: 45a7bd93395ad23786d0b7b7377dbbae7cddbe10
 SHA512:
-  metadata.gz: 867dd5881b618c57caaa3c90c54e2cbafb2bb9baa4b82718e051641227dfdd52e0ad094834ea7ec59d4e18511804d1ba9d73a12a336888cf9b1f60def432e095
-  data.tar.gz: 7536a4709aadb39a8deb2d7632d211eb73049c710bf1c99ba29b6e0307a0dc2e0b6bbb4d6452fb34aa322972a7f5420dd199e2331d4017a42281b0e0edb4e896
+  metadata.gz: f8b7b126e8f2533ec9bb8ba915f75e63b268a66b00f662f057e004f34b9d5676e7d9320f6b61770599a3c603813028d43f1ba0f33918680a790ac2c380111a10
+  data.tar.gz: d07ae28d48b0ba218546c25918cc510b969c562362ae3eaf2fa69f675ad82a40e3aefb0dea84a4d419dc94922ad31e91a84a15dcbaf31b1bc85269dd75cd5f09

data/lib/logstash/outputs/cassandra/event_parser.rb

@@ -40,7 +40,7 @@ module LogStash; module Outputs; module Cassandra
     def get_filter_transform(event)
       filter_transform = nil
       if @filter_transform_event_key
-        filter_transform = event[@filter_transform_event_key]
+        filter_transform = event.get(@filter_transform_event_key)
         assert_filter_transform_structure(filter_transform)
       elsif @filter_transform.length > 0
         filter_transform = @filter_transform
@@ -59,7 +59,7 @@ module LogStash; module Outputs; module Cassandra
     def add_event_value_from_filter_to_action(event, filter, action)
       event_data = event.sprintf(filter['event_key'])
       unless filter.fetch('expansion_only', false)
-        event_data = event[event_data]
+        event_data = event.get(event_data)
       end
       if filter.has_key?('cassandra_type')
         cassandra_type = event.sprintf(filter['cassandra_type'])

data/logstash-output-cassandra.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cassandra'
-  s.version         = '1.0.0'
+  s.version         = '5.0.0'
   s.licenses        = [ 'Apache License (2.0)' ]
   s.summary         = 'Store events into Cassandra'
   s.description     = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'
@@ -20,16 +20,13 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency 'concurrent-ruby'
-  s.add_runtime_dependency 'logstash-core', '>= 2.0.0', '< 3.0.0'
+  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
   s.add_runtime_dependency 'cassandra-driver', '>= 3.0.0'
-  s.add_development_dependency 'cabin', ['~> 0.6']
+  s.add_development_dependency 'cabin'
   s.add_development_dependency 'longshoreman'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-plain'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov'
-  s.add_development_dependency 'unparser', '0.2.4'
-  s.add_development_dependency 'metric_fu'
-  s.add_development_dependency 'coveralls'
   s.add_development_dependency 'gems'
 end

data/spec/unit/outputs/event_parser_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
     it 'allows for string expansion in table names' do
       sut_instance = sut.new(default_opts.update({ 'table' => '%{[a_field]}' }))
-      sample_event['a_field'] = 'a_value'
+      sample_event.set('a_field', 'a_value')
 
       action = sut_instance.parse(sample_event)
 
@@ -52,7 +52,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
       describe 'properly configured' do
         it 'maps the event key to the column' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }] }))
-          sample_event['a_field'] = 'a_value'
+          sample_event.set('a_field', 'a_value')
 
           action = sut_instance.parse(sample_event)
 
@@ -61,8 +61,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
         it 'works with multiple filter transforms' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }, { 'event_key' => 'another_field', 'column_name' => 'a_different_column' }] }))
-          sample_event['a_field'] = 'a_value'
-          sample_event['another_field'] = 'a_second_value'
+          sample_event.set('a_field', 'a_value')
+          sample_event.set('another_field', 'a_second_value')
 
           action = sut_instance.parse(sample_event)
 
@@ -72,8 +72,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
         it 'allows for string expansion in event keys' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => '%{[pointer_to_another_field]}', 'column_name' => 'a_column' }] }))
-          sample_event['pointer_to_another_field'] = 'another_field'
-          sample_event['another_field'] = 'a_value'
+          sample_event.set('pointer_to_another_field', 'another_field')
+          sample_event.set('another_field', 'a_value')
 
           action = sut_instance.parse(sample_event)
 
@@ -91,8 +91,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
         it 'allows for string expansion in column names' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => '%{[pointer_to_another_field]}' }] }))
-          sample_event['a_field'] = 'a_value'
-          sample_event['pointer_to_another_field'] = 'a_different_column'
+          sample_event.set('a_field', 'a_value')
+          sample_event.set('pointer_to_another_field', 'a_different_column')
 
           action = sut_instance.parse(sample_event)
 
@@ -103,7 +103,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
       describe 'cassandra type mapping' do
         [
-          { :name => 'timestamp', :type => ::Cassandra::Types::Timestamp, :value => Time::parse('1979-07-27 00:00:00 +0300') },
+          { :name => 'timestamp', :type => ::Cassandra::Types::Timestamp, :value => Time::parse('1979-07-27 00:00:00 +0000'), expected: Time::parse('1979-07-27 00:00:00 +0000').utc},
           { :name => 'timestamp', :type => ::Cassandra::Types::Timestamp, :value => '1982-05-04 00:00:00 +0300', expected: Time::parse('1982-05-04 00:00:00 +0300') },
           { :name => 'timestamp', :type => ::Cassandra::Types::Timestamp, :value => 1457606758, expected: Time.at(1457606758) },
           { :name => 'inet',      :type => ::Cassandra::Types::Inet,      :value => '0.0.0.0' },
@@ -123,7 +123,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
           # NOTE: this is not the best test there is, but it is the best / simplest I could think of :/
           it "properly maps #{mapping[:name]} to #{mapping[:type]}" do
             sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => mapping[:name] }] }))
-            sample_event['a_field'] = mapping[:value]
+            sample_event.set('a_field', mapping[:value])
 
             action = sut_instance.parse(sample_event)
 
@@ -135,7 +135,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
         it 'properly maps sets to their specific set types' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => 'set<int>' }] }))
           original_value = [ 1, 2, 3 ]
-          sample_event['a_field'] = original_value
+          sample_event.set('a_field', original_value)
 
           action = sut_instance.parse(sample_event)
 
@@ -145,7 +145,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
         it 'properly maps sets to their specific set types for type which also require actual conversion' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => 'set<timeuuid>' }] }))
           original_value = %w(00000000-0000-0000-0000-000000000000 00000000-0000-0000-0000-000000000001 00000000-0000-0000-0000-000000000002)
-          sample_event['a_field'] = original_value
+          sample_event.set('a_field', original_value)
 
           action = sut_instance.parse(sample_event)
 
@@ -157,8 +157,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
         it 'allows for string expansion in cassandra types' do
           sut_instance = sut.new(default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => '%{[pointer_to_a_field]}' }] }))
-          sample_event['a_field'] = '123'
-          sample_event['pointer_to_a_field'] = 'int'
+          sample_event.set('a_field', '123')
+          sample_event.set('pointer_to_a_field', 'int')
 
           action = sut_instance.parse(sample_event)
 
@@ -168,7 +168,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
         it 'fails in case of an unknown type' do
           options = default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => 'what?!' }] })
           sut_instance = sut.new(options)
-          sample_event['a_field'] = 'a_value'
+          sample_event.set('a_field', 'a_value')
           expect(options['logger']).to(receive(:error)).at_least(:once)
 
           result = sut_instance.parse(sample_event)
@@ -180,8 +180,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
     describe 'from event' do
       it 'obtains the filter transform from the event if defined' do
         sut_instance = sut.new(default_opts.update({ 'filter_transform_event_key' => 'an_event_filter' }))
-        sample_event['a_field'] = 'a_value'
-        sample_event['an_event_filter'] = [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }]
+        sample_event.set('a_field', 'a_value')
+        sample_event.set('an_event_filter', [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }])
 
         action = sut_instance.parse(sample_event)
 
@@ -190,8 +190,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
 
       it 'obtains the filter transform from the event even when it is in the metadata' do
         sut_instance = sut.new(default_opts.update({ 'filter_transform_event_key' => '[@metadata][the_filter]' }))
-        sample_event['a_field'] = 'a_value'
-        sample_event['@metadata'] = { 'the_filter' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }] }
+        sample_event.set('a_field', 'a_value')
+        sample_event.set('@metadata', { 'the_filter' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column' }] })
 
         action = sut_instance.parse(sample_event)
 
@@ -203,8 +203,8 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
   describe 'hints' do
     it 'removes fields starting with @' do
       sut_instance = sut.new(default_opts.update({ 'hints' => {} }))
-      sample_event['leave'] = 'a_value'
-      sample_event['@remove'] = 'another_value'
+      sample_event.set('leave', 'a_value')
+      sample_event.set('@remove', 'another_value')
 
       action = sut_instance.parse(sample_event)
 
@@ -215,18 +215,18 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
     it 'does not attempt to change items with no hints' do
       sut_instance = sut.new(default_opts.update({ 'hints' => {} }))
       expected_value = [ 1, 2, 3 ]
-      sample_event['no_hint_here'] = expected_value
+      sample_event.set('no_hint_here', expected_value)
 
       action = sut_instance.parse(sample_event)
 
-      expect(action['data']['no_hint_here']).to(equal(expected_value))
+      expect(action['data']['no_hint_here']).to(match_array(expected_value))
     end
 
     it 'converts items with hints' do
       sut_instance = sut.new(default_opts.update({ 'hints' => { 'a_set' => 'set<int>', 'an_int' => 'int' } }))
       original_set = [ 1, 2, 3 ]
-      sample_event['a_set'] = original_set
-      sample_event['an_int'] = '123'
+      sample_event.set('a_set', original_set)
+      sample_event.set('an_int', '123')
 
       action = sut_instance.parse(sample_event)
 
@@ -239,7 +239,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
       options = default_opts.update({ 'hints' => { 'a_field' => 'not_a_real_type' } })
       sut_instance = sut.new(options)
       expect(options['logger']).to(receive(:error)).at_least(:once)
-      sample_event['a_field'] = 'a value'
+      sample_event.set('a_field', 'a value')
 
       result = sut_instance.parse(sample_event)
 
@@ -250,7 +250,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
       options = default_opts.update({ 'hints' => { 'a_field' => 'int' } })
       expect(options['logger']).to(receive(:error)).at_least(:once)
       sut_instance = sut.new(options)
-      sample_event['a_field'] = 'i am not an int!!!'
+      sample_event.set('a_field', 'i am not an int!!!')
 
       result = sut_instance.parse(sample_event)
 
@@ -275,7 +275,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
         options = default_opts.update({ 'ignore_bad_values' => true, 'hints' => { 'a_field' => mapping[:name] } })
         expect(options['logger']).to(receive(:warn))
         sut_instance = sut.new(options)
-        sample_event['a_field'] = mapping[:value]
+        sample_event.set('a_field', mapping[:value])
 
         action = sut_instance.parse(sample_event)
 
@@ -287,7 +287,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
       options = default_opts.update({ 'ignore_bad_values' => true, 'hints' => { 'a_field' => 'set<float>' } })
       expect(options['logger']).to(receive(:warn))
       sut_instance = sut.new(options)
-      sample_event['a_field'] = 'i am not a set'
+      sample_event.set('a_field', 'i am not a set')
 
       action = sut_instance.parse(sample_event)
 
@@ -298,7 +298,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
     it 'raises an ArgumentError in case we try to default a type we dont know' do
       options = default_opts.update({ 'ignore_bad_values' => true, 'hints' => { 'a_field' => 'map<float>' } })
       sut_instance = sut.new(options)
-      sample_event['a_field'] = 'i am not a set'
+      sample_event.set('a_field', 'i am not a set')
       expect(options['logger']).to(receive(:error))
 
       result = sut_instance.parse(sample_event)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-cassandra
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - PerimeterX
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - <
+        version: '1.60'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - <
+        version: '1.60'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -61,17 +61,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   name: cabin
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -142,48 +142,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  name: unparser
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: metric_fu
-  prerelease: false
-  type: :development
-  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: coveralls
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: