md-logstasher 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe9fbb482168a2c0e95473e02f2b219cbf116ee4f2006fe6ed15a6cde16bb44
-  data.tar.gz: 9735b52eae692c0b08205949cc65f894a3351e4e6e0275f25cc8a1663d1076eb
+  metadata.gz: 3f2904af9e8b7395dd7b50dbc848bd57cedb273a707a807a4fe33192434afb92
+  data.tar.gz: a06fecadb7ceb313eb7d829f564c7d46025a0b28434254f43d4bf0d05186f93d
 SHA512:
-  metadata.gz: db9a456790e5bf911c52f135cc1c9ce8f1486f6e47ed1aad91de52ccb9347cf6c86a83f453f8abd774be7836cfb91641f4911be017cfc23dc5463de52788e694
-  data.tar.gz: 4b2e935c1457a249a40297de6330ea991c5095539070acb75fe2f32d5b592039ad4c80b23b9e2ec7870a5211671a1cf188e4f568cc7b22dd207d81f85e941ed5
+  metadata.gz: 6785ff4d5b8fc0e82442ff49df6686ee720ec0d5ee27b8141b4e4176bef0ef22e267dcde51a44a73a7681c0c319d744492dbdea4f1f33a26c61cdd7f7bcc73e5
+  data.tar.gz: 124954b6f62e435bad90f5f0505edef2ecc99b2dab92db51357a047df59e25951fc9da0b6af8d37644132bbff7717c15664df3a9395df605660ffd3c477b1a98

data/lib/logstasher/version.rb

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

data/lib/logstasher.rb

@@ -119,15 +119,15 @@ module LogStasher
     def validate_payload(payload)
       return unless payload.is_a?(::LogStash::Event) || payload.is_a?(::Hash)
 
-      validation = dry_validation_contract.call(payload.to_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
       }
 
       return payload.append(validation_payload) if payload.is_a?(::LogStash::Event)
-      return payload.deep_merge!(validation_payload) if payload.is_a?(::Hash)
+      return payload.merge!(validation_payload) if payload.is_a?(::Hash)
     end
   end
 end

data/spec/lib/logstasher/logstasher_spec.rb

@@ -134,6 +134,18 @@ describe ::LogStasher do
 
         ::LogStasher.log_as_json([{"yolo" => "brolo"}])
       end
+
+      it "formats the payload correctly for the contract call" do
+        expect(::LogStasher.logger).to receive(:<<) do |json|
+          payload = ::JSON.parse(json)
+          expect(payload["dry_validation_errors"]).to eq("{}")
+          expect(payload["dry_validation_success"]).to be true
+          expect(payload["yolo"]).to eq("brolo")
+          expect(payload["metadata"]["namespace"]).to eq("cooldude")
+        end
+
+        ::LogStasher.log_as_json(::LogStash::Event.new("yolo" => :brolo))
+      end
     end
   end
 

metadata

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