logstash-output-charrington 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ae186abb98be6db8aca5f0713593a0597737f516608c97ea05fca4b58537a4
-  data.tar.gz: 9cecf3cf3ed56956fe8907032a6a2322a6c46495a8fe1fc074ac066d15b00d01
+  metadata.gz: e031c490f1a81f62f0a781e259ce3872712255e014e11a41fc7420e120368fd8
+  data.tar.gz: f54fb87f22fed7eda64e068897a2942323f08fb54dd9cac4972ce58a3ae0217e
 SHA512:
-  metadata.gz: f661d570cf5b4d04c170253354387da2b157f132a8b8dba60a5be5b5bdb7b087f959eb0234ce28c4dae91b984ea53e0ccbeafcbd5eb97a6dbf9d40474f236acf
-  data.tar.gz: fac3bc74393a48e88df615afe5c3451fb0d2d073c5a400ceae06ce3ca441da202324f8f964b24f6b665a627464cbece2da0b9d95badcbb78e74498384120f826
+  metadata.gz: eeef47c0d66f3b1533adb9eb539e4db501b190b1ac47c89b1ad71c1e12f6748b7a957fbb4f3e08c58e75d45ae50186469e871ceb7e487a7595e81901a04f1ef7
+  data.tar.gz: 8f8da734bb7054bf04da564032a2d17402c905e2160ed03a78dc05f35b05faf6d67312566cc278c88ca521c2f8f86ef03d9ac9d3cd42e02d096fde38f4022eb0

data/lib/logstash/outputs/charrington/insert.rb

@@ -29,7 +29,10 @@ module Charrington
       @connection = connection
       @schema = opts[:schema].empty? ? '' : "#{opts[:schema]}."
 
-      @table_name = "#{event_name.gsub(/[^a-z0-9]+/, "_")}"
+      @table_name = "#{event_name
+                         .gsub(/[^a-z0-9]+/, "_")
+                         .gsub(/\A_+/, "")
+                         .gsub(/_+\z/, "")}"
 
       @columns = event.keys
       @should_retry = false

data/lib/logstash/outputs/charrington.rb

@@ -188,15 +188,15 @@ class LogStash::Outputs::Charrington < LogStash::Outputs::Base
   def get_schema(event)
     if !@schema.nil?
       @schema
-    elsif driver == "redshift"
+    else
       case event.to_hash["app_name"]
       when "Web App"
         "dea_webapp"
-      else
+      when "Mobile App"
         "dea_mobileapp"
+      else
+        ""
       end
-    else
-      ""
     end
   end
 

data/logstash-output-charrington.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-charrington'
-  s.version = '0.3.7'
+  s.version = '0.3.9'
 
   s.licenses = ['Apache-2.0']
   s.homepage = 'https://gitlab.podium.com/engineering/analytics/logstash-output-charrington'

data/spec/outputs/charrington_spec.rb

@@ -32,6 +32,34 @@ describe LogStash::Outputs::Charrington do
     end
   end
 
+  describe 'removes a trailing plus sign' do
+    let(:config) do
+      <<-CONFIG
+      input {
+        generator {
+          message => '{"app_name": "Web App", "event": "with plus +", "meta": { "type": "XML" } }'
+          codec => 'json'
+          count => 1
+        }
+      }
+
+      output {
+        charrington {
+          connection_string => '#{@url}'
+          driver_jar_path => '#{driver_path}'
+        }
+      }
+      CONFIG
+    end
+
+    it 'creates a table and inserts a record' do
+      drop_table('with_plus')
+      run_pipeline
+      expect(query('SELECT * FROM with_plus')).to match_array([{id: "1", app_name: "Web App", event: "with plus +", inserted_at: a_kind_of(String), :meta_type => "XML"}])
+      expect(query('SELECT COUNT(1) FROM with_plus').first[:count]).to eq("1")
+    end
+  end
+
   describe '2 event payloads with different metadata' do
     let(:config) do
       <<-CONFIG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-charrington
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - dconger
@@ -182,8 +182,6 @@ files:
 - README.md
 - THANKS.md
 - lib/com/zaxxer/HikariCP/2.7.2/HikariCP-2.7.2.jar
-- lib/commons-io/commons-io/2.4/commons-io-2.4.jar
-- lib/de/flapdoodle/embed/de.flapdoodle.embed.process/2.0.2/de.flapdoodle.embed.process-2.0.2.jar
 - lib/logstash-output-charrington_jars.rb
 - lib/logstash/outputs/charrington.rb
 - lib/logstash/outputs/charrington/alter_postgres_table.rb
@@ -195,16 +193,9 @@ files:
 - lib/logstash/outputs/charrington/service.rb
 - lib/logstash/outputs/charrington/transform_postgres.rb
 - lib/logstash/outputs/charrington/transform_redshift.rb
-- lib/net/java/dev/jna/jna-platform/4.0.0/jna-platform-4.0.0.jar
-- lib/net/java/dev/jna/jna/4.0.0/jna-4.0.0.jar
-- lib/org/apache/commons/commons-compress/1.10/commons-compress-1.10.jar
-- lib/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar
 - lib/org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar
 - lib/org/apache/logging/log4j/log4j-slf4j-impl/2.6.2/log4j-slf4j-impl-2.6.2.jar
-- lib/org/postgresql/postgresql/42.2.5/postgresql-42.2.5.jar
 - lib/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
-- lib/ru/yandex/qatools/embed/postgresql-embedded/2.10/postgresql-embedded-2.10.jar
-- lib/ru/yandex/qatools/embed/postgresql-embedded/2.8/postgresql-embedded-2.8.jar
 - logstash-output-charrington.gemspec
 - spec/charrington_spec_helper.rb
 - spec/logstash-output-charrington_test_jars.rb