esp_sdk 2.2.0 → 2.3.0

data/test/esp/resources/suppression/unique_identifier_test.rb

@@ -51,36 +51,6 @@ module ESP
             assert_equal ESP::Suppression::UniqueIdentifier, suppression.class
           end
         end
-
-        context 'live calls' do
-          setup do
-            skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
-            WebMock.allow_net_connect!
-          end
-
-          teardown do
-            WebMock.disable_net_connect!
-          end
-
-          context '.create' do
-            should 'return error when reason is not supplied' do
-              alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
-
-              suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id)
-
-              assert_equal "Reason can't be blank", suppression.errors.full_messages.first
-            end
-
-            should 'return suppression' do
-              alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
-
-              suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id, reason: 'test')
-
-              assert_predicate suppression.errors, :blank?
-              assert_equal ESP::Suppression::UniqueIdentifier, suppression.class
-            end
-          end
-        end
       end
     end
   end

data/test/esp/resources/suppression_test.rb

@@ -187,100 +187,6 @@ module ESP
           assert_equal "Failed.  Response code = 400.  Response message = #{JSON.parse(error_response)['errors'].first['title']}.", error.message
         end
       end
-
-      context 'live calls' do
-        setup do
-          skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
-          WebMock.allow_net_connect!
-          @s = ESP::Suppression.first
-          skip "Live DB does not have any suppressions.  Add a suppression and run tests again." if @s.blank?
-        end
-
-        teardown do
-          WebMock.disable_net_connect!
-        end
-
-        context '#organization' do
-          should 'return an organization' do
-            org = @s.organization
-
-            assert_equal @s.organization_id, org.id
-          end
-        end
-
-        context '#created_by' do
-          should 'return a user' do
-            u = @s.created_by
-
-            assert_equal @s.created_by_id, u.id
-          end
-        end
-
-        context '#regions' do
-          should 'return regions' do
-            r = @s.regions
-
-            assert_equal ESP::Region, r.resource_class unless r == []
-          end
-        end
-
-        context '#external_accounts' do
-          should 'return external_accounts' do
-            e = @s.external_accounts
-
-            assert_equal ESP::ExternalAccount, e.resource_class
-          end
-        end
-
-        context '#signatures' do
-          should 'return signatures' do
-            s = @s.signatures
-
-            assert_equal ESP::Signature, s.resource_class unless s == []
-          end
-        end
-
-        context '#custom_signatures' do
-          should 'return custom_signatures' do
-            cs = @s.custom_signatures
-
-            assert_equal ESP::CustomSignature, cs.resource_class unless cs == []
-          end
-        end
-
-        context '#deactivate' do
-          should 'deactivate the suppression' do
-            status = @s.status
-
-            @s.deactivate
-
-            assert_equal 'inactive', @s.status
-            assert_contains @s.errors.full_messages.first, 'Access Denied' if status == 'inactive'
-          end
-        end
-
-        context '#deactivate!' do
-          should 'raise an error if already inactive' do
-            status = @s.status
-
-            if status == 'inactive'
-              assert_raises ActiveResource::ResourceInvalid do
-                @s.deactivate!
-              end
-              assert_equal 'inactive', @s.status
-              assert_contains @s.errors.full_messages.first, 'Access Denied' if status == 'inactive'
-            end
-          end
-        end
-
-        context '.where' do
-          should 'return suppression objects' do
-            suppressions = ESP::Suppression.where(id_eq: @s.id)
-
-            assert_equal ESP::Suppression, suppressions.resource_class
-          end
-        end
-      end
     end
   end
 end

data/test/esp/resources/tag_test.rb

@@ -81,26 +81,6 @@ module ESP
           assert_equal ESP::Tag, tags.resource_class
         end
       end
-
-      context 'live calls' do
-        setup do
-          skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
-          WebMock.allow_net_connect!
-        end
-
-        teardown do
-          WebMock.disable_net_connect!
-        end
-
-        context '.for_alert' do
-          should 'return tags for alert id' do
-            report = ESP::Report.all.detect { |r| r.status == 'complete' }
-            events = ESP::Tag.for_alert(report.alerts.last.id)
-
-            assert_equal ESP::Tag, events.resource_class
-          end
-        end
-      end
     end
   end
 end

data/test/esp/resources/team_test.rb

@@ -38,6 +38,20 @@ module ESP
         end
       end
 
+      context '#custom_signatures' do
+        should 'call the api' do
+          team = build(:team)
+          stub_request(:put, /custom_signatures.json*/).to_return(body: json_list(:custom_signature, 2))
+
+          team.custom_signatures
+
+          assert_requested(:put, /custom_signatures.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal team.id, body['filter']['teams_id_eq']
+          end
+        end
+      end
+
       context '#reports' do
         should 'call the api' do
           team = build(:team)
@@ -65,84 +79,6 @@ module ESP
           end
         end
       end
-
-      context 'live calls' do
-        setup do
-          skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
-          WebMock.allow_net_connect!
-          @team = ESP::Team.last
-          skip "Live DB does not have any teams.  Add a team and run tests again." if @team.blank?
-        end
-
-        teardown do
-          WebMock.disable_net_connect!
-        end
-
-        context '#organization' do
-          should 'return an organization' do
-            org = @team.organization
-
-            assert_equal @team.organization_id, org.id
-          end
-        end
-
-        context '#sub_organization' do
-          should 'return a sub_organization' do
-            sub_org = @team.sub_organization
-
-            assert_equal @team.sub_organization_id, sub_org.id
-          end
-        end
-
-        context '#external_accounts' do
-          should 'return an array of external_accounts' do
-            external_accounts = @team.external_accounts
-
-            assert_equal ESP::ExternalAccount, external_accounts.resource_class
-          end
-        end
-
-        context '#reports' do
-          should 'return an array of reports' do
-            reports = @team.reports
-
-            assert_equal ESP::Report, reports.resource_class
-          end
-        end
-
-        context '.where' do
-          should 'return team objects' do
-            teams = ESP::Team.where(name_eq: @team.name)
-
-            assert_equal ESP::Team, teams.resource_class
-          end
-        end
-
-        context '#CRUD' do
-          should 'be able to create, update and destroy' do
-            team = ESP::Team.new(name: 'bob', organization_id: @team.organization_id, sub_organization_id: @team.sub_organization_id)
-
-            assert_predicate team, :new?
-
-            team.save
-
-            refute_predicate team, :new?
-
-            team.name = 'jim'
-            team.save
-
-            assert_nothing_raised do
-              ESP::Team.find(team.id)
-            end
-
-            team.destroy
-
-            assert_raises ActiveResource::ResourceNotFound do
-              ESP::Team.find(team.id)
-            end
-          end
-        end
-      end
     end
   end
 end

data/test/esp/resources/user_test.rb

@@ -91,53 +91,6 @@ module ESP
           assert_not_requested(:put, /teams.json*/)
         end
       end
-
-      context 'live calls' do
-        setup do
-          skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
-          WebMock.allow_net_connect!
-          @user = ESP::User.last
-          skip "Live DB does not have any users.  Add a user and run tests again." if @user.blank?
-        end
-
-        teardown do
-          WebMock.disable_net_connect!
-        end
-
-        context '#organization' do
-          should 'return an organization' do
-            org = @user.organization
-
-            assert_equal @user.organization_id, org.id
-          end
-        end
-
-        context '#sub_organizations' do
-          should 'return an array of sub_organizations' do
-            sub_orgs = @user.sub_organizations
-
-            assert_equal @user.sub_organization_ids.count, sub_orgs.count
-            assert_equal @user.sub_organization_ids, sub_orgs.map(&:id)
-          end
-        end
-
-        context '#teams' do
-          should 'return an array of teams' do
-            teams = @user.teams
-
-            assert_equal @user.team_ids.count, teams.count
-            assert_equal @user.team_ids.sort, teams.map(&:id).sort
-          end
-        end
-
-        context '.where' do
-          should 'return user objects' do
-            users = ESP::User.where(id_eq: @user.id)
-
-            assert_equal ESP::User, users.resource_class
-          end
-        end
-      end
     end
   end
 end

data/test/factories/custom_signatures.rb

@@ -15,16 +15,26 @@ FactoryGirl.define do
     language "javascript"
     updated_at nil
     relationships do
-      { organization: {
-        data: {
-          type: "organizations",
-          id: "1003"
+      {
+        organization: {
+          data: {
+            type: "organizations",
+            id: "1003"
+          },
+          links: {
+            related: "http://test.host/api/v2/organizations/1003.json"
+          }
         },
-        links: {
-          related: "http://test.host/api/v2/organizations/1003.json"
+        teams: {
+          data: {
+            type: "teams",
+            id: "1003"
+          },
+          links: {
+            related: "http://test.host/api/v2/teams?filter%5Bcustom_signatures_id_eq%5D=#{id}"
+          }
         }
       }
-      }
     end
   end
 end

data/test/factories/teams.rb

@@ -8,15 +8,16 @@ FactoryGirl.define do
     created_at { Time.current }
     updated_at { Time.current }
     relationships do
-      { sub_organization: {
-        data: {
-          type: "sub_organizations",
-          id: "2"
+      {
+        sub_organization: {
+          data: {
+            type: "sub_organizations",
+            id: "2"
+          },
+          links: {
+            related: "http://localhost:3000/api/v2/sub_organizations/2.json"
+          }
         },
-        links: {
-          related: "http://localhost:3000/api/v2/sub_organizations/2.json"
-        }
-      },
         organization: {
           data: {
             type: "organizations",
@@ -25,6 +26,15 @@ FactoryGirl.define do
           links: {
             related: "http://localhost:3000/api/v2/organizations/2.json"
           }
+        },
+        custom_signatures: {
+          data: {
+            type: "custom_signatures",
+            id: "2"
+          },
+          links: {
+            related: "http://localhost:3000/api/v2/custom_signatures?filter%5Bteam_id_eq%5D=#{id}"
+          }
         }
       }
     end

data/test/parallel_reporter.rb

@@ -0,0 +1,93 @@
+require 'ansi/code'
+
+module Minitest
+  module Reporters
+    # Features:
+    #   Like the SpecReporter but with the pass/time on the left
+    #   Collects the message before doing a puts so that lines dont get mixed up when running tests in threads
+    #   Highlights lines in a stacktrace from this project
+    #   Highlights slow tests
+    class ParallelReporter < BaseReporter
+      # fix coloring for parallel_tests
+      require 'ansi/code'
+      include ::ANSI::Code
+      extend ::ANSI::Code
+
+      include RelativePosition
+
+      def report
+        super
+        msg = "\n"
+        msg += "Finished in #{format('%f', total_time)}s"
+        msg += "\n"
+        msg += "#{format('%d', count)} tests, #{format('%d', assertions)} assertions, "
+        color = failures.zero? && errors.zero? ? :green : :red
+        msg += send(color) { "#{format('%d', failures)} failures, #{format('%d', errors)} errors, " }
+        msg += yellow { "#{format('%d', skips)} skips" }
+        msg += "\n"
+        puts msg
+      end
+
+      def record(test)
+        super
+        if test.passed?
+          print_pass(test)
+        else
+          print_fail(test)
+        end
+      end
+
+      private
+
+      def print_pass(_test)
+        print green '.'
+      end
+
+      def print_fail(test)
+        puts ''
+        msg = ''
+        msg += colored_status(test)
+        msg += color_by_time(" (#{format('%.2f', test.time)}s)", test.time)
+        msg += pad_test(test.name).gsub('test_: ', "[#{blue ENV['TEST_ENV_NUMBER'].to_i}] ")
+        msg += stacktrace(test)
+        puts msg
+        puts ''
+      end
+
+      def color_by_time(string, time)
+        if time > 5
+          red string
+        elsif time > 1
+          yellow string
+        else
+          string
+        end
+      end
+
+      def colored_status(test)
+        if test.passed?
+          green { pad_mark(result(test).to_s.upcase) }
+        elsif test.skipped?
+          yellow { pad_mark(result(test).to_s.upcase) }
+        else
+          red { pad_mark(result(test).to_s.upcase) }
+        end
+      end
+
+      def stacktrace(test) # rubocop:disable Metrics/MethodLength
+        return '' unless !test.skipped? && test.failure
+        msg = "\n"
+        msg += red(test.failure.message.split("\n    ").first.to_s) + "\n"
+        test.failure.backtrace.each do |line|
+          msg += if line.include?('esp_sdk/lib')
+                   yellow line
+                 else
+                   line
+                 end
+          msg += "\n"
+        end
+        msg
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,9 @@
 ENV['ESP_ENV'] = 'test'
-require 'coveralls'
-Coveralls.wear!
+# Don't run coveralls when esp web runs sdk tests.
+if ENV['CI_BUILD_STAGE'].to_s.casecmp('test_sdk') != 0
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 require 'minitest/autorun'
 require 'minitest/reporters'
@@ -13,11 +16,12 @@ require 'rubygems'
 require 'active_resource'
 require_relative 'json_strategy'
 require_relative '../lib/esp_sdk'
+require_relative 'parallel_reporter'
 
 FactoryGirl.definition_file_paths = [File.expand_path('factories', File.dirname(__FILE__))]
 FactoryGirl.find_definitions
 FactoryGirl.register_strategy(:json, JsonStrategy)
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+Minitest::Reporters.use! Minitest::Reporters::ParallelReporter.new(color: true)
 
 class ActiveSupport::TestCase
   include FactoryGirl::Syntax::Methods # so we can use json(:object) instead of FactoryGirl.json(:object)
@@ -33,7 +37,7 @@ class ActiveSupport::TestCase
   def json_list(*args)
     page_args = args.last.delete(:page) if args.last.present? && args.last.is_a?(Hash)
     page_args ||= { number: 1, size: 20 }
-    json_array = args.first == :empty ? [] : super
+    json_array       = args.first == :empty ? [] : super
     data             = json_array.map { |j| JSON.parse(j)['data'] }
     links            = build_links(data, page_args)
     list             = { 'data'  => data.slice(0, page_args[:size]),
@@ -57,3 +61,15 @@ class ActiveSupport::TestCase
     end
   end
 end
+
+module ESP::Integration
+  class TestCase < ActiveSupport::TestCase
+    setup do
+      WebMock.allow_net_connect!
+    end
+
+    teardown do
+      WebMock.disable_net_connect!
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esp_sdk
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -336,6 +336,7 @@ files:
 - lib/esp/resources/organization.rb
 - lib/esp/resources/region.rb
 - lib/esp/resources/report.rb
+- lib/esp/resources/reports/export/integration.rb
 - lib/esp/resources/resource.rb
 - lib/esp/resources/scan_interval.rb
 - lib/esp/resources/service.rb
@@ -362,6 +363,37 @@ files:
 - test/esp/extensions/active_resource/paginated_collection_test.rb
 - test/esp/extensions/active_resource/validations_test.rb
 - test/esp/external_account_creator_test.rb
+- test/esp/integration/alert_integration_test.rb
+- test/esp/integration/cloud_trail_event_integration_test.rb
+- test/esp/integration/contact_request_integration_test.rb
+- test/esp/integration/custom_signature_integration_test.rb
+- test/esp/integration/dashboard_integration_test.rb
+- test/esp/integration/external_account_integration_test.rb
+- test/esp/integration/json_api_format_integration_test.rb
+- test/esp/integration/metadata_integration_test.rb
+- test/esp/integration/organization_integration_test.rb
+- test/esp/integration/paginated_collection_integration_test.rb
+- test/esp/integration/region_integration_test.rb
+- test/esp/integration/report_export_integration_integration_test.rb
+- test/esp/integration/report_integration_test.rb
+- test/esp/integration/resource_integration_test.rb
+- test/esp/integration/scan_interval_integration_test.rb
+- test/esp/integration/service_integration_test.rb
+- test/esp/integration/signature_integration_test.rb
+- test/esp/integration/stat_custom_signature_integration_test.rb
+- test/esp/integration/stat_integration_test.rb
+- test/esp/integration/stat_region_integration_test.rb
+- test/esp/integration/stat_service_integration_test.rb
+- test/esp/integration/stat_signature_integration_test.rb
+- test/esp/integration/sub_organization_integration_test.rb
+- test/esp/integration/suppression_integration_test.rb
+- test/esp/integration/suppression_region_integration_test.rb
+- test/esp/integration/suppression_signature_integration_test.rb
+- test/esp/integration/suppression_unique_identifier_integration_test.rb
+- test/esp/integration/tag_integration_test.rb
+- test/esp/integration/team_integration_test.rb
+- test/esp/integration/user_integration_test.rb
+- test/esp/integration/validations_integration_test.rb
 - test/esp/resources/alert_test.rb
 - test/esp/resources/cloud_trail_event_test.rb
 - test/esp/resources/contact_request_test.rb
@@ -372,6 +404,7 @@ files:
 - test/esp/resources/organization_test.rb
 - test/esp/resources/region_test.rb
 - test/esp/resources/report_test.rb
+- test/esp/resources/reports/export/integration_test.rb
 - test/esp/resources/resource_test.rb
 - test/esp/resources/scan_interval_test.rb
 - test/esp/resources/service_test.rb
@@ -418,6 +451,7 @@ files:
 - test/factories/teams.rb
 - test/factories/users.rb
 - test/json_strategy.rb
+- test/parallel_reporter.rb
 - test/test_helper.rb
 homepage: https://github.com/EvidentSecurity/esp_sdk
 licenses:
@@ -439,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: SDK for interacting with the ESP API.
@@ -449,6 +483,37 @@ test_files:
 - test/esp/extensions/active_resource/paginated_collection_test.rb
 - test/esp/extensions/active_resource/validations_test.rb
 - test/esp/external_account_creator_test.rb
+- test/esp/integration/alert_integration_test.rb
+- test/esp/integration/cloud_trail_event_integration_test.rb
+- test/esp/integration/contact_request_integration_test.rb
+- test/esp/integration/custom_signature_integration_test.rb
+- test/esp/integration/dashboard_integration_test.rb
+- test/esp/integration/external_account_integration_test.rb
+- test/esp/integration/json_api_format_integration_test.rb
+- test/esp/integration/metadata_integration_test.rb
+- test/esp/integration/organization_integration_test.rb
+- test/esp/integration/paginated_collection_integration_test.rb
+- test/esp/integration/region_integration_test.rb
+- test/esp/integration/report_export_integration_integration_test.rb
+- test/esp/integration/report_integration_test.rb
+- test/esp/integration/resource_integration_test.rb
+- test/esp/integration/scan_interval_integration_test.rb
+- test/esp/integration/service_integration_test.rb
+- test/esp/integration/signature_integration_test.rb
+- test/esp/integration/stat_custom_signature_integration_test.rb
+- test/esp/integration/stat_integration_test.rb
+- test/esp/integration/stat_region_integration_test.rb
+- test/esp/integration/stat_service_integration_test.rb
+- test/esp/integration/stat_signature_integration_test.rb
+- test/esp/integration/sub_organization_integration_test.rb
+- test/esp/integration/suppression_integration_test.rb
+- test/esp/integration/suppression_region_integration_test.rb
+- test/esp/integration/suppression_signature_integration_test.rb
+- test/esp/integration/suppression_unique_identifier_integration_test.rb
+- test/esp/integration/tag_integration_test.rb
+- test/esp/integration/team_integration_test.rb
+- test/esp/integration/user_integration_test.rb
+- test/esp/integration/validations_integration_test.rb
 - test/esp/resources/alert_test.rb
 - test/esp/resources/cloud_trail_event_test.rb
 - test/esp/resources/contact_request_test.rb
@@ -459,6 +524,7 @@ test_files:
 - test/esp/resources/organization_test.rb
 - test/esp/resources/region_test.rb
 - test/esp/resources/report_test.rb
+- test/esp/resources/reports/export/integration_test.rb
 - test/esp/resources/resource_test.rb
 - test/esp/resources/scan_interval_test.rb
 - test/esp/resources/service_test.rb
@@ -505,4 +571,5 @@ test_files:
 - test/factories/teams.rb
 - test/factories/users.rb
 - test/json_strategy.rb
+- test/parallel_reporter.rb
 - test/test_helper.rb