md-logstasher 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2904af9e8b7395dd7b50dbc848bd57cedb273a707a807a4fe33192434afb92
-  data.tar.gz: a06fecadb7ceb313eb7d829f564c7d46025a0b28434254f43d4bf0d05186f93d
+  metadata.gz: 818b367f70c5c67513ffee0eb376b16ef3a7e7bfb11d48ad00ef43db7ff181ec
+  data.tar.gz: 34d1591c89c63b24475a432aaa738470d9fe8605377073c24a5dba4dc8f6bf84
 SHA512:
-  metadata.gz: 6785ff4d5b8fc0e82442ff49df6686ee720ec0d5ee27b8141b4e4176bef0ef22e267dcde51a44a73a7681c0c319d744492dbdea4f1f33a26c61cdd7f7bcc73e5
-  data.tar.gz: 124954b6f62e435bad90f5f0505edef2ecc99b2dab92db51357a047df59e25951fc9da0b6af8d37644132bbff7717c15664df3a9395df605660ffd3c477b1a98
+  metadata.gz: 349c390bf7a5a71d2c7a7bac71fe308a2186b053a8e3fcc852e61f0b2ec5e2045c0bd8cf764e131444ba2386d24e22754253e8f4c3cf67905946e97cc8123c40
+  data.tar.gz: 847f72fe1ce8a872f6f600ee0e4f2f896b95ba102e40d25dbee1499cf596e35b0d94ba3e748c4cbc9a2912dcd561b4fb8bf792ed6eb6a6ee6705e5067ae58fc7

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

data/lib/logstasher.rb

@@ -93,7 +93,7 @@ module LogStasher
       payload = ::LogStash::Event.new(payload) if as_logstash_event
 
       # Validate payload if a dry_validation_contract is configured
-      validate_payload(payload) if dry_validation_contract
+      payload = validate_payload(payload) if dry_validation_contract
 
       logger << payload.to_json + $INPUT_RECORD_SEPARATOR
     end
@@ -117,17 +117,16 @@ module LogStasher
   private
 
     def validate_payload(payload)
-      return unless payload.is_a?(::LogStash::Event) || payload.is_a?(::Hash)
+      return payload unless payload.is_a?(::LogStash::Event) || payload.is_a?(::Hash)
 
       formatted_payload = ::JSON.parse(payload.to_json).deep_symbolize_keys
-      validation = dry_validation_contract.call(formatted_payload)
-      validation_payload = {
-        dry_validation_success: validation.success?,
-        dry_validation_errors: validation.errors.to_h.to_json
+      validation_results = dry_validation_contract.call(formatted_payload)
+      validation_metadata = {
+        dry_validation_success: validation_results.success?,
+        dry_validation_errors: validation_results.errors.to_h.to_json
       }
 
-      return payload.append(validation_payload) if payload.is_a?(::LogStash::Event)
-      return payload.merge!(validation_payload) if payload.is_a?(::Hash)
+      formatted_payload.deep_merge(validation_results.to_h).merge(validation_metadata)
     end
   end
 end

data/spec/lib/logstasher/logstasher_spec.rb

@@ -61,9 +61,11 @@ describe ::LogStasher do
 
     context "with dry validation contract" do
       let(:validation_contract) do
+        Types = Dry.Types()
         Class.new(Dry::Validation::Contract) do
-          params do
+          schema do
             required(:yolo).filled(:string)
+            optional(:yolo_coercible).maybe(Types::Coercible::String)
           end
         end.new
       end
@@ -146,6 +148,15 @@ describe ::LogStasher do
 
         ::LogStasher.log_as_json(::LogStash::Event.new("yolo" => :brolo))
       end
+
+      it "logs coerced types" do
+        expect(::LogStasher.logger).to receive(:<<) do |json|
+          payload = ::JSON.parse(json)
+          expect(payload["yolo_coercible"]).to eq("123")
+        end
+
+        ::LogStasher.log_as_json(::LogStash::Event.new("yolo_coercible" => 123))
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md-logstasher
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Devin Christensen