inventory-server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595a004bb77d3fdca856383c3d152fd56661116b
-  data.tar.gz: 94473b188763f55c6b0fc01f273081eecaa4d985
+  metadata.gz: 9646b4e4c9f3f5f45ef89fa027abbbb92fa5ab74
+  data.tar.gz: d6e13c24240418e1ceffbfece628a8c2922f8891
 SHA512:
-  metadata.gz: a7a68d033a11a1749a7aefc7e33507ca594547dc06de24e047495e3cef0a31cacff3ef1887e2ae64aaa07dc8de0bb49d45188c005eecdc8a4cb8cccd4e1c1301
-  data.tar.gz: 66c8c902a5fec61afb29d5b4d0832d8ee98176095c85a1955df0ad7e5a6de07bc8f9cebe7a131bd27a48044bd07865f4a952f0a6ff1edb121dbc185523c80f15
+  metadata.gz: 40480cd931607662fb2627b45e6ca30f29ea0ded355b7510ae697dab9ef5f490562a638402d5089da5358c04a451507a99ec42f7633a3513d13560a57882a116
+  data.tar.gz: 6f7bd911501c5c8ee1dccd45b3721cc0875b8ca30ad1515aa0ab1fdadd7a3b561c150c44965c3b898e47228ca025ee1c01b8bedba210d5cfa7cf070e74350113

data/Dockerfile

@@ -4,13 +4,12 @@ MAINTAINER Filirom1 <filirom1@gmail.com>
 RUN yum install -y epel-release
 RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c++ zlib-devel libxml2-devel nginx 
 
-ADD . /app
-
-RUN cd /app  && bundle install
-
-RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
-    cp /app/docker/unicorn/nginx.conf /etc/nginx/nginx.conf && \
-    echo "daemon off;" >> /etc/nginx/nginx.conf
+# optimize layer caching for bundle install
+RUN mkdir -p /tmp/lib/inventory/server
+ADD Gemfile /tmp/Gemfile
+ADD inventory-server.gemspec /tmp/inventory-server.gemspec
+ADD lib/inventory/server/version.rb /tmp/lib/inventory/server/version.rb
+RUN cd /tmp  && bundle install
 
 RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
     mkdir -p /var/lib/inventory/ && chmod o+rwX /var/lib/inventory && \
@@ -19,5 +18,13 @@ RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
 VOLUME ["/var/log/nginx", "/var/log/inventory"]
 
 EXPOSE 80
+
+ADD . /app
+
+RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
+    cp /app/docker/unicorn/nginx.conf /etc/nginx/nginx.conf && \
+    echo "daemon off;" >> /etc/nginx/nginx.conf
+
 WORKDIR /app
+
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/Dockerfile-passenger

@@ -8,12 +8,22 @@ RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c+
     http://puias.math.ias.edu/data/puias/unsupported/7/x86_64/rubygem-passenger-native-4.0.18-9.5.sdl7.x86_64.rpm \
     http://puias.math.ias.edu/data/puias/unsupported/7/x86_64/rubygem-passenger-native-libs-4.0.18-9.5.sdl7.x86_64.rpm
 
+RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory
+
+# optimize layer caching for bundle install
+RUN mkdir -p /tmp/lib/inventory/server
+ADD Gemfile /tmp/Gemfile
+ADD inventory-server.gemspec /tmp/inventory-server.gemspec
+ADD lib/inventory/server/version.rb /tmp/lib/inventory/server/version.rb
+RUN cd /tmp  && bundle install
+
+EXPOSE 80
+
 ADD . /app
 
-RUN cd /app  && bundle install
 RUN cp /app/docker/passenger/passenger.conf /etc/httpd/conf.d/passenger.conf
-RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory
 
-EXPOSE 80
+
 WORKDIR /app
+
 CMD    ["/app/docker/passenger/run-httpd.sh"]

data/Dockerfile-unicorn

@@ -4,13 +4,12 @@ MAINTAINER Filirom1 <filirom1@gmail.com>
 RUN yum install -y epel-release
 RUN yum install -y patch tar git ruby ruby-devel rubygem-bundler make gcc gcc-c++ zlib-devel libxml2-devel nginx 
 
-ADD . /app
-
-RUN cd /app  && bundle install
-
-RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
-    cp /app/docker/unicorn/nginx.conf /etc/nginx/nginx.conf && \
-    echo "daemon off;" >> /etc/nginx/nginx.conf
+# optimize layer caching for bundle install
+RUN mkdir -p /tmp/lib/inventory/server
+ADD Gemfile /tmp/Gemfile
+ADD inventory-server.gemspec /tmp/inventory-server.gemspec
+ADD lib/inventory/server/version.rb /tmp/lib/inventory/server/version.rb
+RUN cd /tmp  && bundle install
 
 RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
     mkdir -p /var/lib/inventory/ && chmod o+rwX /var/lib/inventory && \
@@ -19,5 +18,13 @@ RUN mkdir -p /var/log/inventory && chmod o+rwX /var/log/inventory && \
 VOLUME ["/var/log/nginx", "/var/log/inventory"]
 
 EXPOSE 80
+
+ADD . /app
+
+RUN cp /app/docker/unicorn/unicorn.conf /etc/nginx/conf.d/unicorn.conf && \
+    cp /app/docker/unicorn/nginx.conf /etc/nginx/nginx.conf && \
+    echo "daemon off;" >> /etc/nginx/nginx.conf
+
 WORKDIR /app
+
 CMD    ["/app/docker/unicorn/run-unicorn.sh"]

data/circle.yml

@@ -14,10 +14,9 @@ database:
 
 test:
   override:
-    - docker-compose up -d
-    - docker-compose run web cd /app  && bundle install 
-    - docker-compose run web cd /app  && bundle exec rspec spec
-    - docker-compose run web cd /app  && bundle exec rspec spec --tag integration
+    - docker-compose up -d && sleep 5
+    - docker-compose run web bundle exec rspec spec
+    - docker-compose run web bundle exec rspec spec --tag integration
 
 deployment:
   prod:

data/docker-compose.yml

@@ -1,10 +1,12 @@
 web:
   build: .
-  links:
-   - elasticsearch
+  volumes:
+   - .:/app
   ports:
    - "80:80"
   environment:
     INVENTORY_ES_HOST: http://elasticsearch:9200
+  links:
+   - elasticsearch
 elasticsearch:
   image: elasticsearch:1.4.4

data/lib/inventory/server/version.rb

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

data/plugins/json_schema_validator.rb

@@ -18,15 +18,19 @@ module Inventory
         type = facts[@config[:type_key]] || @config[:type_default]
         version = facts[@config[:version_key]] || @config[:version_default]
 
-        json_schema_file = File.join @config[:json_schema_dir], type, "#{version}.json"
+        schema_type_file = File.join @config[:json_schema_dir], "#{type}.json"
+        schema_version_file = File.join @config[:json_schema_dir], type, "#{version}.json"
 
-        if ! File.file? json_schema_file
-          InventoryLogger.logger.info "No JSON Schema found at #{json_schema_file}, skip validation"
-          return @app.call(env)
+        if File.file? schema_type_file
+          InventoryLogger.logger.info "Use JSON Schema #{schema_type_file}"
+          JSON::Validator.validate!(schema_type_file, facts)
+        end
+
+        if File.file? schema_version_file
+          InventoryLogger.logger.info "Use JSON Schema #{schema_version_file}"
+          JSON::Validator.validate!(schema_version_file, facts)
         end
 
-        InventoryLogger.logger.info "Use JSON Schema #{json_schema_file}"
-        JSON::Validator.validate!(json_schema_file, facts)
         @app.call(env)
       end
     end

data/plugins/log_failures_in_es.rb

@@ -0,0 +1,37 @@
+require 'inventory/server/inventory_error'
+require "inventory/server/logger"
+
+require 'rest-client'
+
+module Inventory
+  module Server
+    class LogFailuresInEs
+      def initialize(app, config)
+        @app = app
+        @failed_facts_dir = config[:failed_facts_dir]
+        @config = config
+      end
+
+      def call(env)
+        id = env[:id]
+        raise InventoryError.new 'id missing' if id.nil? || id.empty?
+
+        body = env[:body]
+        raise InventoryError.new "body missing" if body.nil? || body.empty?
+
+        url = "#{@config[:es_host]}/#{@config[:es_failure_index]}/#{@config[:es_failure_type]}/#{id}"
+        begin
+          @app.call(env)
+          RestClient.delete(url)
+        rescue => e
+          env['error_message'] = $!
+          env['stack_trace'] = "#{e.backtrace}"
+
+          RestClient.put(url, env.to_json)
+
+          raise e
+        end
+      end
+    end
+  end
+end

data/spec/integration/http_spec.rb

@@ -5,19 +5,21 @@ require 'parallel'
 FIXTURES_PATH = File.join File.expand_path(File.dirname(__FILE__)), 'fixtures'
 XML_STR = File.read(File.join FIXTURES_PATH, 'facter.xml')
 
+IP = ENV['WEB_PORT_80_TCP_ADDR'] || 'localhost'
+
 context "HTTP integration tests" do
   before(:all) do
     WebMock.allow_net_connect!
   end
 
   it "integrates one document", :integration => true do
-    response = RestClient.post "http://localhost/api/v1/facts/MY_UUID", XML_STR
+    response = RestClient.post "http://#{IP}/api/v1/facts/MY_UUID", XML_STR
     expect(response.code).to eq 200
   end
 
   it "integrates 500 document", :integration => true do
     Parallel.each([*1..500], :in_threads=>20){|i| 
-      response = RestClient.post "http://localhost/api/v1/facts/MY_UUID_#{i}", XML_STR
+      response = RestClient.post "http://#{IP}/api/v1/facts/MY_UUID_#{i}", XML_STR
       expect(response.code).to eq 200
     }
   end

data/spec/unit/json_schema_validator_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
   context "without version and type" do
     env = { :facts => { 'key' => 'value'} }
     it "should use the default config" do
+      expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/facts.json").and_return false
       expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/facts/1-0-0.json").and_return false
       Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
     end
@@ -39,29 +40,51 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
 
     context "with JSON schema" do
       it "should fail if the file is not redable" do
-        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
         expect {
           Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
         }.to raise_error Errno::ENOENT
       end
 
       it "should fail if the file is not a valid JSON" do
-        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
-        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return '{"dsf": dsf}'
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return '{"dsf": dsf}'
         expect {
           Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
         }.to raise_error MultiJson::ParseError
       end
 
-      it "should fail if the facts do not respect the type" do
+      it "should fail if the facts do not respect the type json schema" do
         schema = {
           "type" => "object",
           "properties" => {
             "key"=> {"type" => "integer" }
           }
         }
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return schema.to_json
+        expect {
+          Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
+        }.to raise_error JSON::Schema::ValidationError
+      end
+
+      it "should fail if the facts do not respect the version json schema" do
+        type_schema = {
+          "type" => "object",
+          "properties" => {
+          }
+        }
+        version_schema = {
+          "type" => "object",
+          "properties" => {
+            "key"=> {"type" => "integer" }
+          }
+        }
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
         expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
-        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return schema.to_json
+
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return type_schema.to_json
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return version_schema.to_json
         expect {
           Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
         }.to raise_error JSON::Schema::ValidationError
@@ -74,7 +97,10 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
             "key"=> {"type" => "string" }
           }
         }
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
         expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
+
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return schema.to_json
         expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return schema.to_json
 
         Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
@@ -86,7 +112,10 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
           "properties" => {
           }
         }
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
         expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
+
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return schema.to_json
         expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return schema.to_json
 
         Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
@@ -99,7 +128,10 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
             "optional"=> {"type" => "string" }
           }
         }
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
         expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
+
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return schema.to_json
         expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return schema.to_json
 
         Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)
@@ -113,8 +145,8 @@ RSpec.describe Inventory::Server::JsonSchemaValidator, '#call' do
             "mandatory"=> {"type" => "string" }
           }
         }
-        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return true
-        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact/my_version.json").and_return schema.to_json
+        expect(File).to receive(:file?).with("#{config[:json_schema_dir]}/my_fact.json").and_return true
+        expect(File).to receive(:read).with("#{config[:json_schema_dir]}/my_fact.json").and_return schema.to_json
 
         expect {
           Inventory::Server::JsonSchemaValidator.new(noop, config).call(env)

data/spec/unit/log_failures_in_es_spec.rb

@@ -0,0 +1,50 @@
+require_relative '../../plugins/log_failures_in_es'
+require 'rspec/mocks'
+
+noop = lambda {|env|}
+
+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"}
+
+  context "without body" do
+    env = { :id => 'id', :body => nil }
+    it "should throw an error" do
+      expect {
+        Inventory::Server::LogFailuresInEs.new(noop, config).call(env)
+        Inventory::Server::FactsParser.new(noop, {}).call(env)
+      }.to raise_error 'body missing'
+    end
+  end
+
+  context "without id" do
+    env = { :id => nil, :body => 'body' }
+    it "should throw an error" do
+      expect {
+        Inventory::Server::LogFailuresInEs.new(noop, config).call(env)
+        Inventory::Server::FactsParser.new(noop, {}).call(env)
+      }.to raise_error 'id missing'
+    end
+  end
+
+  context "with all mandatory params" do
+    env = { :id => 'MY_UUID', :body => 'my_body' }
+
+    context "without error" 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)
+      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 {
+          Inventory::Server::LogFailuresInEs.new(raise_error, config).call(env)
+        }.to raise_error 'an error'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory-server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Filirom1
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-smtp-server
@@ -333,6 +333,7 @@ files:
 - plugins/facts_parser.rb
 - plugins/index.rb
 - plugins/json_schema_validator.rb
+- plugins/log_failures_in_es.rb
 - plugins/log_failures_on_disk.rb
 - plugins/sample.rb
 - public/.gitignore
@@ -348,6 +349,7 @@ files:
 - spec/unit/index_spec.rb
 - spec/unit/json_schema_validator_spec.rb
 - spec/unit/loader_spec.rb
+- spec/unit/log_failures_in_es_spec.rb
 - spec/unit/log_failures_on_disk_spec.rb
 - spec/unit/server_spec.rb
 - spec/unit/smtp_server_spec.rb
@@ -389,6 +391,7 @@ test_files:
 - spec/unit/index_spec.rb
 - spec/unit/json_schema_validator_spec.rb
 - spec/unit/loader_spec.rb
+- spec/unit/log_failures_in_es_spec.rb
 - spec/unit/log_failures_on_disk_spec.rb
 - spec/unit/server_spec.rb
 - spec/unit/smtp_server_spec.rb