inventory-server 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9646b4e4c9f3f5f45ef89fa027abbbb92fa5ab74
-  data.tar.gz: d6e13c24240418e1ceffbfece628a8c2922f8891
+  metadata.gz: 84d72e786ae3173c439ccb24170aa15e3a16bf0d
+  data.tar.gz: ad4c6d4b89247e08e5ce89b8f3d64e329223fddd
 SHA512:
-  metadata.gz: 40480cd931607662fb2627b45e6ca30f29ea0ded355b7510ae697dab9ef5f490562a638402d5089da5358c04a451507a99ec42f7633a3513d13560a57882a116
-  data.tar.gz: 6f7bd911501c5c8ee1dccd45b3721cc0875b8ca30ad1515aa0ab1fdadd7a3b561c150c44965c3b898e47228ca025ee1c01b8bedba210d5cfa7cf070e74350113
+  metadata.gz: d91e3d181aa1e25a39609a04e6fbe83976df36002da60de6b8745e0e3dbd27c16da6621cbb2afdfac8128e12ef57b500e30b9c52831abb59b725b2aaf374c496
+  data.tar.gz: 50a189ca44fd4d93d903d6a58e9a8042ecb27c7367570bfd4be5102756e947b2a403e22052fc4923474f1f31d9c0f8c2cb29caefa7488ea8fd6f075c5234f10f

data/lib/inventory/server/version.rb

@@ -1,5 +1,5 @@
 module Inventory
   module Server
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/plugins/log_failures_in_es.rb

@@ -21,13 +21,23 @@ module Inventory
 
         url = "#{@config[:es_host]}/#{@config[:es_failure_index]}/#{@config[:es_failure_type]}/#{id}"
         begin
-          @app.call(env)
-          RestClient.delete(url)
+          result = @app.call(env)
+          RestClient.delete(url) rescue result
+          return result
         rescue => e
+          InventoryLogger.logger.error $!
+          InventoryLogger.logger.error "#{e.backtrace}"
+          InventoryLogger.logger.error "Failed facts stored on #{url}"
+    
           env['error_message'] = $!
           env['stack_trace'] = "#{e.backtrace}"
 
-          RestClient.put(url, env.to_json)
+          begin
+            RestClient.put(url, env.to_json) 
+          rescue => e
+            InventoryLogger.logger.error "Fail to store failed facts #{e}: #{e.response}"
+            raise e
+          end
 
           raise e
         end

data/spec/unit/facts_parser_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require_relative '../../plugins/facts_parser'
 
-noop = lambda {|env|}
+noop = lambda {|env| 42}
 
 RSpec.describe Inventory::Server::FactsParser, '#call' do
   context "without body" do
@@ -33,8 +33,9 @@ RSpec.describe Inventory::Server::FactsParser, '#call' do
 
   context "with good JSON" do
     env = { :body => '{"key":"value"}' }
-    it "should throw an error" do
-      Inventory::Server::FactsParser.new(noop, {}).call(env)
+    it "should not throw an error" do
+      result= Inventory::Server::FactsParser.new(noop, {}).call(env)
+      expect(result).to eq(42)
       expect(env[:facts]).to eq 'key' => 'value'
     end
   end

data/spec/unit/index_spec.rb

@@ -63,7 +63,8 @@ RSpec.describe Inventory::Server::Index, '#call' do
       env = {:id => 'MY_UUID', :facts => { :key => 'value' } }
       stub = stub_request(:put, "#{config[:es_host]}/inventory_facts/1-0-0/MY_UUID").to_return(:body => '{"OK": true}')
 
-      Inventory::Server::Index.new(noop, config).call(env)
+      result = Inventory::Server::Index.new(noop, config).call(env)
+      expect(result).to eq({ :key => 'value' })
 
       expect(stub).to have_been_requested
     end

data/spec/unit/json_schema_validator_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../plugins/json_schema_validator'
 
 require 'rspec/mocks'
 
-noop = lambda {|env|}
+noop = lambda {|env| 42}
 
 config = Inventory::Server::Config::defaults
 
@@ -34,7 +34,8 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
 
     context "without JSON schema" do
       it "should pass" do
-        Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
+        result = Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
+        expect(result).to eq 42
       end
     end
 

data/spec/unit/log_failures_in_es_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../plugins/log_failures_in_es'
 require 'rspec/mocks'
 
-noop = lambda {|env|}
+noop = lambda {|env| 42}
 
 RSpec.describe Inventory::Server::LogFailuresInEs do
   config = { :failed_facts_dir => './log' , :es_failure_index => "itdiscovery-failures", :es_failure_type => "v1", :es_host => "http://localhost:9200"}
@@ -33,14 +33,21 @@ RSpec.describe Inventory::Server::LogFailuresInEs do
       it "should pass without writing anything" do
         expect(RestClient).to receive(:delete).with('http://localhost:9200/itdiscovery-failures/v1/MY_UUID')
         expect(RestClient).to_not receive(:put).with(any_args)
-        Inventory::Server::LogFailuresInEs.new(noop, config).call(env)
+        result = Inventory::Server::LogFailuresInEs.new(noop, config).call(env)
+        expect(result).to eq 42
+      end
+
+      it "should pass without even when ES fails to delete the error document" do
+        expect(RestClient).to receive(:delete).with('http://localhost:9200/itdiscovery-failures/v1/MY_UUID').and_raise('404 Not Found')
+        result = Inventory::Server::LogFailuresInEs.new(noop, config).call(env)
+        expect(result).to eq 42
       end
     end
 
     context "with error" do
       it "should write facts" do
         raise_error = lambda{ |e| raise "an error" }
-        expect(RestClient).to receive(:put).with('http://localhost:9200/itdiscovery-failures/v1/MY_UUID', /(?=.*my_body)(?=.*an error)(?=.*log_failures_in_es_spec.rb:42)/)
+        expect(RestClient).to receive(:put).with('http://localhost:9200/itdiscovery-failures/v1/MY_UUID', /(?=.*my_body)(?=.*an error)(?=.*log_failures_in_es_spec.rb:)/)
         expect {
           Inventory::Server::LogFailuresInEs.new(raise_error, config).call(env)
         }.to raise_error 'an error'

data/spec/unit/log_failures_on_disk_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../plugins/log_failures_on_disk'
 require 'rspec/mocks'
 
-noop = lambda {|env|}
+noop = lambda {|env| 42 }
 
 RSpec.describe Inventory::Server::LogFailuresOnDisk do
   config = { :failed_facts_dir => './log' }
@@ -31,8 +31,9 @@ RSpec.describe Inventory::Server::LogFailuresOnDisk do
 
     context "without error" do
       it "should pass without writing anything" do
-        Inventory::Server::LogFailuresOnDisk.new(noop, config).call(env)
         expect(File).to_not receive(:write)
+        result = Inventory::Server::LogFailuresOnDisk.new(noop, config).call(env)
+        expect(result).to eq 42
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inventory-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Filirom1