esp_sdk 2.0.0.rc1 → 2.0.0

data/test/esp/extensions/active_resource/formats/json_api_format_test.rb

@@ -7,13 +7,13 @@ module ActiveResource
         context '# decode' do
           context 'with ESP::Suppression' do
             should 'parse nested objects correctly' do
-              json = json(:alert)
+              json = json(:dashboard)
               parsed_json = JSON.parse(json)
-              stub_request(:get, %r{alerts/5.json*}).to_return(body: json)
+              stub_request(:get, %r{dashboard/recent.json*}).to_return(body: json_list(:dashboard, 1))
 
-              alert = ESP::Alert.find(5)
+              dashboard = ESP::Dashboard.recent
 
-              assert_equal parsed_json['data']['attributes']['metadata']['abc'], alert.metadata.abc
+              assert_equal parsed_json['included'].first['attributes']['stat_signatures'].first['signature']['name'], dashboard.first.stat.stat_signatures.first.signature.name
             end
           end
 
@@ -23,7 +23,7 @@ module ActiveResource
               parsed_json = JSON.parse(json)
               stub_request(:get, %r{reports/1/alerts.json*}).to_return(body: json)
 
-              alert = ESP::Alert.for_report(1).first
+              alert = ESP::Alert.for_report(1, include: 'external_accounts,regions,signatures,cloud_trail_events').first
 
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'external_accounts' }['id'], alert.external_account.id
               assert_equal parsed_json['included'].detect { |e| e['type'] == 'regions' }['id'], alert.region.id
@@ -58,6 +58,29 @@ module ActiveResource
           teardown do
             WebMock.disable_net_connect!
           end
+
+          should 'merge included objects' do
+            alert = ESP::Alert.find(1, include: 'external_account,region,signature')
+
+            assert_not_nil alert.attributes['external_account']
+            assert_equal alert.external_account_id, alert.external_account.id
+            assert_not_nil alert.attributes['region']
+            assert_equal alert.region_id, alert.region.id
+            assert_not_nil alert.attributes['signature']
+            assert_equal alert.signature_id, alert.signature.id
+          end
+
+          should 'assign foreign key for a belongs_to relationship' do
+            user = ESP::User.last
+
+            assert_not_nil user.organization_id
+          end
+
+          should 'assign foreign key for a has_many relationship' do
+            user = ESP::User.last
+
+            assert_not_nil user.sub_organization_ids
+          end
         end
       end
 

data/test/esp/resources/alert_test.rb

@@ -13,18 +13,18 @@ module ESP
 
       context '#update' do
         should 'not be implemented' do
-          cloud_trail_event = build(:cloud_trail_event)
+          alert = build(:alert)
           assert_raises ESP::NotImplementedError do
-            cloud_trail_event.save
+            alert.save
           end
         end
       end
 
       context '#destroy' do
         should 'not be implemented' do
-          cloud_trail_event = build(:cloud_trail_event)
+          alert = build(:alert)
           assert_raises ESP::NotImplementedError do
-            cloud_trail_event.destroy
+            alert.destroy
           end
         end
       end
@@ -106,6 +106,17 @@ module ESP
         end
       end
 
+      context '#metadata' do
+        should 'call the api for the alert' do
+          alert = build(:alert)
+          stubbed_metadata = stub_request(:get, %r{alerts/#{alert.id}/metadata.json*}).to_return(body: json(:metadata))
+
+          alert.metadata
+
+          assert_requested(stubbed_metadata)
+        end
+      end
+
       context '.for_report' do
         should 'throw an error if report_id is not supplied' do
           error = assert_raises ArgumentError do
@@ -232,12 +243,23 @@ module ESP
         setup do
           skip "Make sure you run the live calls locally to ensure proper integration" if ENV['CI_SERVER']
           WebMock.allow_net_connect!
+          @report = ESP::Report.last
+          skip "Live DB does not have any reports.  Add a report and run tests again." if @report.blank?
+          @alert = @report.alerts.last
         end
 
         teardown do
           WebMock.disable_net_connect!
         end
 
+        context '#metadata' do
+          should 'return metata' do
+            assert_nothing_raised do
+              @alert.metadata
+            end
+          end
+        end
+
         context '.for_report' do
           should 'return events for report id' do
             report = ESP::Report.last

data/test/esp/resources/custom_signature_test.rb

@@ -190,7 +190,7 @@ module ESP
           end
 
           should 'return errors' do
-            signature = ESP::CustomSignature.run(external_account_id: 999, regions: 'us_east_1', language: @custom_signature.language, signature: @custom_signature.signature)
+            signature = ESP::CustomSignature.run(external_account_id: 999_999_999_999, regions: 'us_east_1', language: @custom_signature.language, signature: @custom_signature.signature)
 
             assert_equal "Couldn't find ExternalAccount", signature.errors.full_messages.first
           end
@@ -205,7 +205,7 @@ module ESP
           end
 
           should 'return errors' do
-            @custom_signature.run(external_account_id: 999)
+            @custom_signature.run(external_account_id: 999_999_999_999)
 
             assert_equal "Couldn't find ExternalAccount", @custom_signature.errors.full_messages.first
           end

data/test/esp/resources/metadata_test.rb

@@ -0,0 +1,98 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+module ESP
+  class MetadataTest < ActiveSupport::TestCase
+    context ESP::Metadata do
+      context '#create' do
+        should 'not be implemented' do
+          assert_raises ESP::NotImplementedError do
+            ESP::Metadata.create(name: 'test')
+          end
+        end
+      end
+
+      context '#update' do
+        should 'not be implemented' do
+          metadata = build(:metadata)
+          assert_raises ESP::NotImplementedError do
+            metadata.save
+          end
+        end
+      end
+
+      context '#destroy' do
+        should 'not be implemented' do
+          metadata = build(:metadata)
+          assert_raises ESP::NotImplementedError do
+            metadata.destroy
+          end
+        end
+      end
+
+      context '.for_alert' do
+        should 'throw an error if alert id is not supplied' do
+          error = assert_raises ArgumentError do
+            ESP::Metadata.for_alert
+          end
+          assert_equal 'You must supply an alert id.', error.message
+        end
+
+        should 'call the api' do
+          stub_event = stub_request(:get, %r{alerts/5/metadata.json*}).to_return(body: json_list(:metadata, 2))
+
+          metadata = ESP::Metadata.for_alert(5)
+
+          assert_requested(stub_event)
+          assert_equal ESP::Metadata, metadata.class
+        end
+      end
+
+      context '.find' do
+        should 'throw an error if alert_id is not supplied' do
+          error = assert_raises ArgumentError do
+            ESP::Metadata.find(:all, params: { id: 3 })
+          end
+          assert_equal 'You must supply an alert id.', error.message
+        end
+
+        should 'call the show api and return metadata if searching by id' do
+          stub_event = stub_request(:get, %r{metadata/5.json*}).to_return(body: json(:metadata))
+
+          event = ESP::Metadata.find(5)
+
+          assert_requested(stub_event)
+          assert_equal ESP::Metadata, event.class
+        end
+
+        should 'call the api and return metadata when alert_id is supplied' do
+          stub_event = stub_request(:get, %r{alerts/5/metadata.json*}).to_return(body: json_list(:metadata, 2))
+
+          metadata = ESP::Metadata.find(:all, params: { alert_id: 5 })
+
+          assert_requested(stub_event)
+          assert_equal ESP::Metadata, metadata.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 metadata for alert id' do
+            report = ESP::Report.last
+            metadata = ESP::Metadata.for_alert(report.alerts.last.id)
+
+            assert_equal ESP::Metadata, metadata.class
+          end
+        end
+      end
+    end
+  end
+end

data/test/esp/resources/resource_test.rb

@@ -14,6 +14,16 @@ module ESP
           end
         end
 
+        should 'set the User-Agent' do
+          stub_request(:get, %r{teams/3.json*}).to_return(body: json(:team))
+
+          ESP::Team.find(3)
+
+          assert_requested(:get, %r{teams/3.json*}) do |req|
+            assert_equal "Ruby SDK #{ESP::VERSION}", req.headers['User-Agent']
+          end
+        end
+
         should 'set the HMAC needed Authorization header' do
           ESP.access_key_id ||= ApiAuth.generate_secret_key
           ESP.secret_access_key ||= ApiAuth.generate_secret_key

data/test/esp/resources/signature_test.rb

@@ -45,12 +45,12 @@ module ESP
           signature = build(:signature)
           stub_request(:post, %r{signatures/#{signature.id}/run.json*}).to_return(body: json_list(:alert, 2))
 
-          alerts = signature.run(external_account_id: 3, regions: 'param2')
+          alerts = signature.run(external_account_id: 3, region: 'param2')
 
           assert_requested(:post, %r{signatures/#{signature.id}/run.json}) do |req|
             body = JSON.parse req.body
             assert_equal 3, body['data']['attributes']['external_account_id']
-            assert_equal ['param2'], body['data']['attributes']['regions']
+            assert_equal 'param2', body['data']['attributes']['region']
           end
           assert_equal ESP::Alert, alerts.resource_class
         end
@@ -64,7 +64,7 @@ module ESP
           ActiveResource::Connection.any_instance.expects(:post).raises(error)
 
           assert_nothing_raised do
-            result = signature.run(external_account_id: 3, regions: 'param2')
+            result = signature.run(external_account_id: 3, region: 'param2')
             assert_equal JSON.parse(error_response)['errors'].first['title'], result.errors.full_messages.first
           end
         end
@@ -75,12 +75,12 @@ module ESP
           signature = build(:signature)
           stub_request(:post, %r{signatures/#{signature.id}/run.json*}).to_return(body: json_list(:alert, 2))
 
-          alerts = signature.run!(external_account_id: 3, regions: 'param2')
+          alerts = signature.run!(external_account_id: 3, region: 'param2')
 
           assert_requested(:post, %r{signatures/#{signature.id}/run.json}) do |req|
             body = JSON.parse req.body
             assert_equal 3, body['data']['attributes']['external_account_id']
-            assert_equal ['param2'], body['data']['attributes']['regions']
+            assert_equal 'param2', body['data']['attributes']['region']
           end
           assert_equal ESP::Alert, alerts.resource_class
         end
@@ -94,7 +94,7 @@ module ESP
           ActiveResource::Connection.any_instance.expects(:post).raises(error)
 
           error = assert_raises ActiveResource::ResourceInvalid do
-            result = signature.run!(external_account_id: 3, regions: 'param2')
+            result = signature.run!(external_account_id: 3, region: 'param2')
             assert_equal JSON.parse(error_response)['errors'].first['title'], result.errors.full_messages.first
           end
           assert_equal "Failed.  Response code = 400.  Response message = #{JSON.parse(error_response)['errors'].first['title']}.", error.message
@@ -145,16 +145,16 @@ module ESP
             signature = ESP::Signature.first
             external_account_id = ESP::ExternalAccount.last.id
 
-            alerts = signature.run(external_account_id: external_account_id, regions: 'us_east_1')
+            alerts = signature.run(external_account_id: external_account_id, region: 'us_east_1')
 
             assert_equal ESP::Alert, alerts.resource_class
           end
 
           should 'return errors' do
             signature = ESP::Signature.first
-            external_account_id = 999
+            external_account_id = 999_999_999_999
 
-            signature = signature.run(external_account_id: external_account_id, regions: ['us_east_1'])
+            signature = signature.run(external_account_id: external_account_id, region: 'us_east_1')
 
             assert_equal "Couldn't find ExternalAccount", signature.errors.full_messages.first
           end

data/test/esp/resources/suppression_test.rb

@@ -168,7 +168,7 @@ module ESP
           should 'return regions' do
             r = @s.regions
 
-            assert_equal @s.relationships.regions.data.map(&:id).sort, r.map(&:id).sort
+            assert_equal ESP::Region, r.resource_class unless r == []
           end
         end
 
@@ -176,7 +176,7 @@ module ESP
           should 'return external_accounts' do
             e = @s.external_accounts
 
-            assert_equal @s.relationships.external_accounts.data.map(&:id).sort, e.map(&:id).sort
+            assert_equal ESP::ExternalAccount, e.resource_class
           end
         end
 
@@ -184,7 +184,7 @@ module ESP
           should 'return signatures' do
             s = @s.signatures
 
-            assert_equal @s.relationships.signatures.data.map(&:id).sort, s.map(&:id).sort
+            assert_equal ESP::Signature, s.resource_class unless s == []
           end
         end
 
@@ -192,7 +192,7 @@ module ESP
           should 'return custom_signatures' do
             cs = @s.custom_signatures
 
-            assert_equal @s.relationships.custom_signatures.data.map(&:id).sort, cs.map(&:id).sort
+            assert_equal ESP::CustomSignature, cs.resource_class unless cs == []
           end
         end
 

data/test/factories/alerts.rb

@@ -8,7 +8,6 @@ FactoryGirl.define do
     status "fail"
     resource "resource-3"
     updated_at nil
-    metadata { { abc: 123 } }
     started_at { Time.current }
     ended_at nil
     relationships do
@@ -49,6 +48,11 @@ FactoryGirl.define do
             related: "http://test.host/api/v2/suppressions/1.json"
           }
         },
+        metadata: {
+          links: {
+            related: "http://test.host/api/v2/alerts/1017/metadata.json"
+          }
+        },
         cloud_trail_events: {
           data: [
             {

data/test/factories/cloud_trail_events.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :contact_request, class: 'ESP::ContactRequest' do
+  factory :cloud_trail_event, class: 'ESP::CloudTrailEvent' do
     skip_create
 
     sequence(:id) { |n| n }

data/test/factories/contact_requests.rb

@@ -1,14 +1,21 @@
 FactoryGirl.define do
-  factory :cloud_trail_event, class: 'ESP::CloudTrailEvent' do
+  factory :contact_request, class: 'ESP::ContactRequest' do
     skip_create
 
     sequence(:id) { |n| n }
-    type "cloud_trail_events"
-    event_id "1"
-    event_name "1"
-    event_time { Time.current }
-    username "johndoe"
-    ip_address "123.0.0.123"
-    user_agent "Chrome"
+    type "contact_requests"
+    title "Test title"
+    request_type "bug"
+    description "Test description"
+    created_at { Time.current }
+    updated_at { Time.current }
+    relationships do
+      { user: {
+        links: {
+          related: "http://test.host/api/v2/users/1001.json"
+        }
+      }
+      }
+    end
   end
 end

data/test/factories/metadata.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :metadata, class: 'ESP::Metadata' do
+    skip_create
+
+    sequence(:id) { |n| n }
+    type "metadata"
+    data { { resource_id: "sg-dae343se4" } }
+  end
+end

data/test/test_helper.rb

@@ -9,7 +9,6 @@ require 'mocha/mini_test'
 require 'bourne'
 require 'shoulda'
 require 'webmock/minitest'
-require 'awesome_print'
 require 'rubygems'
 require 'active_resource'
 require_relative 'json_strategy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esp_sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,48 +262,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: artii
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: catpix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - support@evident.io
@@ -318,12 +276,14 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/esp_logo.ans
 - assets/logo.png
 - bin/esp_console
 - esp_sdk.gemspec
@@ -339,6 +299,7 @@ files:
 - lib/esp/resources/custom_signature.rb
 - lib/esp/resources/dashboard.rb
 - lib/esp/resources/external_account.rb
+- lib/esp/resources/metadata.rb
 - lib/esp/resources/organization.rb
 - lib/esp/resources/region.rb
 - lib/esp/resources/report.rb
@@ -372,6 +333,7 @@ files:
 - rdoc/ESP/CustomSignature.html
 - rdoc/ESP/Dashboard.html
 - rdoc/ESP/ExternalAccount.html
+- rdoc/ESP/Metadata.html
 - rdoc/ESP/Organization.html
 - rdoc/ESP/Region.html
 - rdoc/ESP/Report.html
@@ -435,6 +397,7 @@ files:
 - test/esp/resources/custom_signature_test.rb
 - test/esp/resources/dashboard_test.rb
 - test/esp/resources/external_account_test.rb
+- test/esp/resources/metadata_test.rb
 - test/esp/resources/organization_test.rb
 - test/esp/resources/region_test.rb
 - test/esp/resources/report_test.rb
@@ -462,6 +425,7 @@ files:
 - test/factories/dashboards.rb
 - test/factories/errors.rb
 - test/factories/external_accounts.rb
+- test/factories/metadata.rb
 - test/factories/organizations.rb
 - test/factories/regions.rb
 - test/factories/reports.rb
@@ -497,9 +461,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6
@@ -516,6 +480,7 @@ test_files:
 - test/esp/resources/custom_signature_test.rb
 - test/esp/resources/dashboard_test.rb
 - test/esp/resources/external_account_test.rb
+- test/esp/resources/metadata_test.rb
 - test/esp/resources/organization_test.rb
 - test/esp/resources/region_test.rb
 - test/esp/resources/report_test.rb
@@ -543,6 +508,7 @@ test_files:
 - test/factories/dashboards.rb
 - test/factories/errors.rb
 - test/factories/external_accounts.rb
+- test/factories/metadata.rb
 - test/factories/organizations.rb
 - test/factories/regions.rb
 - test/factories/reports.rb