esp_sdk 2.0.0 → 2.1.0

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

@@ -4,6 +4,14 @@ module ESP
   class Suppression
     class SignatureTest < ActiveSupport::TestCase
       context ESP::Suppression::Signature do
+        context '.where' do
+          should 'not be implemented' do
+            assert_raises ESP::NotImplementedError do
+              ESP::Suppression::Signature.where(id_eq: 2)
+            end
+          end
+        end
+
         context '#find' do
           should 'not be implemented' do
             assert_raises ESP::NotImplementedError do
@@ -93,7 +101,7 @@ module ESP
 
             context 'for_alert' do
               should 'return error when reason is not supplied' do
-                alert_id = ESP::Report.last.alerts.last.id
+                alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
 
                 suppression = ESP::Suppression::Signature.create(alert_id: alert_id)
 
@@ -101,7 +109,7 @@ module ESP
               end
 
               should 'return suppression' do
-                alert_id = ESP::Report.last.alerts.last.id
+                alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
 
                 suppression = ESP::Suppression::Signature.create(alert_id: alert_id, reason: 'test')
 

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

@@ -4,6 +4,14 @@ module ESP
   class Suppression
     class UniqueIdentifierTest < ActiveSupport::TestCase
       context ESP::Suppression::UniqueIdentifier do
+        context '.where' do
+          should 'not be implemented' do
+            assert_raises ESP::NotImplementedError do
+              ESP::Suppression::UniqueIdentifier.where(id_eq: 2)
+            end
+          end
+        end
+
         context '#find' do
           should 'not be implemented' do
             assert_raises ESP::NotImplementedError do
@@ -56,7 +64,7 @@ module ESP
 
           context '.create' do
             should 'return error when reason is not supplied' do
-              alert_id = ESP::Report.last.alerts.last.id
+              alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
 
               suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id)
 
@@ -64,7 +72,7 @@ module ESP
             end
 
             should 'return suppression' do
-              alert_id = ESP::Report.last.alerts.last.id
+              alert_id = ESP::Report.all.detect { |r| r.status == 'complete' }.alerts.last.id
 
               suppression = ESP::Suppression::UniqueIdentifier.create(alert_id: alert_id, reason: 'test')
 

data/test/esp/resources/suppression_test.rb

@@ -53,54 +53,106 @@ module ESP
 
       context '#regions' do
         should 'call the api for the report and the passed in params' do
-          suppression = build(:suppression)
-          stub_request(:get, /regions.json*/).to_return(body: json_list(:region, 2))
+          suppression = build(:suppression, region_ids: [1, 2])
+          stub_request(:put, /regions.json*/).to_return(body: json_list(:region, 2))
 
           suppression.regions
 
-          assert_requested(:get, /regions.json*/) do |req|
-            assert_equal "filter[suppressions_id_eq]=#{suppression.id}", URI.unescape(req.uri.query)
+          assert_requested(:put, /regions.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{suppressions/1.json*}).to_return(body: json(:suppression, :with_include))
+          suppression = ESP::Suppression.find(1)
+          stub_request(:put, /regions.json*/)
+
+          assert_not_nil suppression.attributes['regions']
+
+          suppression.regions
+
+          assert_not_requested(:put, /regions.json*/)
+        end
       end
 
       context '#external_accounts' do
         should 'call the api for the report and the passed in params' do
-          suppression = build(:suppression)
-          stub_request(:get, /external_accounts.json*/).to_return(body: json_list(:external_account, 2))
+          suppression = build(:suppression, external_account_ids: [1, 2])
+          stub_request(:put, /external_accounts.json*/).to_return(body: json_list(:external_account, 2))
 
           suppression.external_accounts
 
-          assert_requested(:get, /external_accounts.json*/) do |req|
-            assert_equal "filter[suppressions_id_eq]=#{suppression.id}", URI.unescape(req.uri.query)
+          assert_requested(:put, /external_accounts.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{suppressions/1.json*}).to_return(body: json(:suppression, :with_include))
+          suppression = ESP::Suppression.find(1)
+          stub_request(:put, /external_accounts.json*/)
+
+          assert_not_nil suppression.attributes['external_accounts']
+
+          suppression.external_accounts
+
+          assert_not_requested(:put, /external_accounts.json*/)
+        end
       end
 
       context '#signatures' do
         should 'call the api for the report and the passed in params' do
           suppression = build(:suppression, signature_ids: [1, 2])
-          stub_request(:get, /signatures.json*/).to_return(body: json_list(:signature, 2))
+          stub_request(:put, /signatures.json*/).to_return(body: json_list(:signature, 2))
 
           suppression.signatures
 
-          assert_requested(:get, /signatures.json*/) do |req|
-            assert_equal "filter[id_in][0]=#{suppression.signature_ids.first}&filter[id_in][1]=#{suppression.signature_ids.second}", URI.unescape(req.uri.query)
+          assert_requested(:put, /signatures.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{suppressions/1.json*}).to_return(body: json(:suppression, :with_include))
+          suppression = ESP::Suppression.find(1)
+          stub_request(:put, /signatures.json*/)
+
+          assert_not_nil suppression.attributes['signatures']
+
+          suppression.signatures
+
+          assert_not_requested(:put, /signatures.json*/)
+        end
       end
 
       context '#custom_signatures' do
         should 'call the api for the report and the passed in params' do
           suppression = build(:suppression, custom_signature_ids: [1, 2])
-          stub_request(:get, /custom_signatures.json*/).to_return(body: json_list(:custom_signature, 2))
+          stub_request(:put, /custom_signatures.json*/).to_return(body: json_list(:custom_signature, 2))
 
           suppression.custom_signatures
 
-          assert_requested(:get, /custom_signatures.json*/) do |req|
-            assert_equal "filter[id_in][0]=#{suppression.custom_signature_ids.first}&filter[id_in][1]=#{suppression.custom_signature_ids.second}", URI.unescape(req.uri.query)
+          assert_requested(:put, /custom_signatures.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{suppressions/1.json*}).to_return(body: json(:suppression, :with_include))
+          suppression = ESP::Suppression.find(1)
+          stub_request(:put, /custom_signatures.json*/)
+
+          assert_not_nil suppression.attributes['custom_signatures']
+
+          suppression.custom_signatures
+
+          assert_not_requested(:put, /custom_signatures.json*/)
+        end
       end
 
       context '#deactivate' do
@@ -220,6 +272,14 @@ module ESP
             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

data/test/esp/resources/tag_test.rb

@@ -29,6 +29,14 @@ module ESP
         end
       end
 
+      context '.where' do
+        should 'not be implemented' do
+          assert_raises ESP::NotImplementedError do
+            Tag.where(id_eq: 2)
+          end
+        end
+      end
+
       context '.for_alert' do
         should 'throw an error if alert id is not supplied' do
           error = assert_raises ArgumentError do
@@ -86,7 +94,7 @@ module ESP
 
         context '.for_alert' do
           should 'return tags for alert id' do
-            report = ESP::Report.last
+            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

data/test/esp/resources/team_test.rb

@@ -110,6 +110,14 @@ module ESP
           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)

data/test/esp/resources/user_test.rb

@@ -43,33 +43,61 @@ module ESP
       context '#sub_organizations' do
         should 'call the api' do
           u = build(:user, sub_organization_ids: [1, 2])
-          stub_request(:get, /sub_organizations.json*/).to_return(body: json_list(:sub_organization, 2))
+          stub_request(:put, /sub_organizations.json*/).to_return(body: json_list(:sub_organization, 2))
 
           u.sub_organizations
 
-          assert_requested(:get, /sub_organizations.json*/) do |req|
-            assert_equal "filter[id_in][0]=#{u.sub_organization_ids.first}&filter[id_in][1]=#{u.sub_organization_ids.second}", URI.unescape(req.uri.query)
+          assert_requested(:put, /sub_organizations.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{users/1.json*}).to_return(body: json(:user, :with_include))
+          user = ESP::User.find(1)
+          stub_request(:put, /sub_organizations.json*/)
+
+          assert_not_nil user.attributes['sub_organizations']
+
+          user.sub_organizations
+
+          assert_not_requested(:put, /sub_organizations.json*/)
+        end
       end
 
       context '#teams' do
         should 'call the api' do
           u = build(:user, team_ids: [1, 2])
-          stub_request(:get, /teams.json*/).to_return(body: json_list(:team, 2))
+          stub_request(:put, /teams.json*/).to_return(body: json_list(:team, 2))
 
           u.teams
 
-          assert_requested(:get, /teams.json*/) do |req|
-            assert_equal "filter[id_in][0]=#{u.team_ids.first}&filter[id_in][1]=#{u.team_ids.second}", URI.unescape(req.uri.query)
+          assert_requested(:put, /teams.json*/) do |req|
+            body = JSON.parse(req.body)
+            assert_equal [1, 2], body["filter"]["id_in"]
           end
         end
+
+        should 'not call the api if it was returned in an include' do
+          stub_request(:get, %r{users/1.json*}).to_return(body: json(:user, :with_include))
+          user = ESP::User.find(1)
+          stub_request(:put, /teams.json*/)
+
+          assert_not_nil user.attributes['teams']
+
+          user.teams
+
+          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
@@ -78,33 +106,35 @@ module ESP
 
         context '#organization' do
           should 'return an organization' do
-            u = ESP::User.last
+            org = @user.organization
 
-            org = u.organization
-
-            assert_equal u.organization_id, org.id
+            assert_equal @user.organization_id, org.id
           end
         end
 
         context '#sub_organizations' do
           should 'return an array of sub_organizations' do
-            u = ESP::User.last
-
-            sub_orgs = u.sub_organizations
+            sub_orgs = @user.sub_organizations
 
-            assert_equal u.sub_organization_ids.count, sub_orgs.count
-            assert_equal u.sub_organization_ids, sub_orgs.map(&:id)
+            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
-            u = ESP::User.last
+            teams = @user.teams
+
+            assert_equal @user.team_ids.count, teams.count
+            assert_equal @user.team_ids.sort, teams.map(&:id).sort
+          end
+        end
 
-            teams = u.teams
+        context '.where' do
+          should 'return user objects' do
+            users = ESP::User.where(id_eq: @user.id)
 
-            assert_equal u.team_ids.count, teams.count
-            assert_equal u.team_ids.sort, teams.map(&:id).sort
+            assert_equal ESP::User, users.resource_class
           end
         end
       end

data/test/esp_test.rb

@@ -44,6 +44,22 @@ class ESPTest < ActiveSupport::TestCase
       end
     end
 
+    context '.http_proxy' do
+      should 'be set manually' do
+        ESP.http_proxy = 'http://foo.com/blah_blah'
+
+        assert_equal 'http://foo.com/blah_blah', ESP.http_proxy
+        assert_equal URI.parse('http://foo.com/blah_blah'), ESP::Resource.proxy
+      end
+
+      should 'be set from an environment variable' do
+        ESP.http_proxy = nil
+        ENV['http_proxy'] = 'http://foo.com/blah_blah'
+
+        assert_equal 'http://foo.com/blah_blah', ESP.http_proxy
+      end
+    end
+
     context '.host=' do
       setup do
         ESP.host = nil
@@ -97,11 +113,12 @@ class ESPTest < ActiveSupport::TestCase
         ESP.host = nil
       end
 
-      should 'set site, access_key_id, secret_access_key' do
+      should 'set site, access_key_id, secret_access_key, http_proxy' do
         ESP.configure do |config|
           config.host = 'https://sample.com'
           config.access_key_id = '1234'
           config.secret_access_key = '5678'
+          config.http_proxy = 'proxy.com'
         end
 
         assert_equal "https://sample.com#{ESP::PATH}", ESP.site
@@ -110,6 +127,7 @@ class ESPTest < ActiveSupport::TestCase
         assert_equal '1234', ESP::Resource.hmac_access_id
         assert_equal '5678', ESP.secret_access_key
         assert_equal '5678', ESP::Resource.hmac_secret_key
+        assert_equal URI.parse("proxy.com"), ESP::Resource.proxy
       end
     end
 

data/test/factories/alerts.rb

@@ -125,6 +125,76 @@ FactoryGirl.define do
             }
           }
         },
+        {
+          id: '5',
+          type: "teams",
+          name: "Default Team",
+          created_at: "2015-09-11T21:12:15.183Z",
+          updated_at: "2015-09-11T21:12:15.183Z",
+          relationships: {
+            sub_organization: {
+              data: {
+                type: "sub_organizations",
+                id: "5"
+              },
+              links: {
+                related: "http://localhost:3000/api/v2/sub_organizations/2.json"
+              }
+            },
+            organization: {
+              data: {
+                type: "organizations",
+                id: "5"
+              },
+              links: {
+                related: "http://localhost:3000/api/v2/organizations/2.json"
+              }
+            }
+          }
+        },
+        {
+          id: '5',
+          type: "organizations",
+          created_at: "2015-09-11T21:12:15.183Z",
+          name: "Test Org",
+          updated_at: "2015-09-11T21:12:15.183Z",
+          relationships: {
+            sub_organizations: {
+              data: [
+                {
+                  type: "sub_organizations",
+                  id: "24"
+                },
+                {
+                  type: "sub_organizations",
+                  id: "2"
+                }
+              ],
+              links: {
+                related: "http://localhost:3000/api/v2/sub_organizations.json?filter%5Borganization_id_eq%5D=2"
+              }
+            },
+            teams: {
+              data: [
+                {
+                  type: "teams",
+                  id: "2"
+                },
+                {
+                  type: "teams",
+                  id: "20"
+                },
+                {
+                  type: "teams",
+                  id: "21"
+                }
+              ],
+              links: {
+                related: "http://localhost:3000/api/v2/teams.json?filter%5Borganization_id_eq%5D=2"
+              }
+            }
+          }
+        },
         {
           id: "1014",
           type: "regions",

data/test/factories/organizations.rb

@@ -20,7 +20,7 @@ FactoryGirl.define do
           }
         ],
         links: {
-          related: "http://localhost:3000/api/v2/sub_organizations.json?q%5Borganization_id_eq%5D=2"
+          related: "http://localhost:3000/api/v2/sub_organizations.json?filter%5Borganization_id_eq%5D=2"
         }
       },
         teams: {
@@ -39,7 +39,7 @@ FactoryGirl.define do
             }
           ],
           links: {
-            related: "http://localhost:3000/api/v2/teams.json?q%5Borganization_id_eq%5D=2"
+            related: "http://localhost:3000/api/v2/teams.json?filter%5Borganization_id_eq%5D=2"
           }
         }
       }

data/test/factories/regions.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     skip_create
 
     sequence(:id) { |n| n }
-    type "services"
+    type "regions"
     code "us_east_test_1"
   end
 end

data/test/factories/sub_organizations.rb

@@ -25,7 +25,7 @@ FactoryGirl.define do
             }
           ],
           links: {
-            related: "http://localhost:3000/api/v2/teams.json?q%5Bsub_organization_id_eq%5D=34"
+            related: "http://localhost:3000/api/v2/teams.json?filter%5Bsub_organization_id_eq%5D=34"
           }
         }
       }

data/test/factories/suppressions.rb

@@ -4,12 +4,12 @@ FactoryGirl.define do
 
     sequence(:id) { |n| n }
     type "suppressions"
-    created_at { Time.current }
+    created_at "2015-09-11T21:12:15.183Z"
     reason "I said"
     resource ''
     suppression_type "regions"
     status "active"
-    updated_at { Time.current }
+    updated_at "2015-09-11T21:12:15.183Z"
     relationships do
       { organization: {
         data: {
@@ -63,9 +63,115 @@ FactoryGirl.define do
           }
         },
         custom_signatures: {
-          data: []
+          data: [
+            {
+              id: "6",
+              type: "custom_signatures"
+            }
+          ],
+          links: {
+            related: "http://test.host/api/v2/custom_signatures.json?filter%5Bid_in%5D%5B%5D=6"
+          }
         }
       }
     end
+
+    trait :with_include do
+      included do
+        [
+          {
+            id: '1',
+            type: "regions",
+            code: "us_east_test_1"
+          },
+          {
+            id: '1015',
+            type: "external_accounts",
+            account: "762160981991",
+            arn: "arn:aws:iam::762160981991:role/Evident-Service-Role-Kevin",
+            created_at: "2015-09-11T21:12:15.183Z",
+            external_id: "913310e7-6a9c-49f7-bd69-120721ec1122",
+            name: "Dev",
+            updated_at: "2015-09-11T21:12:15.183Z",
+            relationships: {
+              organization: {
+                data: {
+                  type: "organizations",
+                  id: "1"
+                },
+                links: {
+                  related: "http://localhost:3000/api/v2/organizations/1.json"
+                }
+              },
+              sub_organization: {
+                data: {
+                  type: "sub_organizations",
+                  id: "1"
+                },
+                links: {
+                  related: "http://localhost:3000/api/v2/sub_organizations/1.json"
+                }
+              },
+              team: {
+                data: {
+                  type: "teams",
+                  id: "1"
+                },
+                links: {
+                  related: "http://localhost:3000/api/v2/teams/1.json"
+                }
+              }
+            }
+          },
+          {
+            id: '6',
+            type: "signatures",
+            created_at: "2015-09-11T21:12:15.183Z",
+            description: "Some description for some test",
+            identifier: "1 Unique ID",
+            name: "1_test_signature",
+            resolution: "Turn on some setting",
+            risk_level: "High",
+            updated_at: nil,
+            relationships: {
+              service: {
+                data: {
+                  type: "services",
+                  id: "1"
+                },
+                links: {
+                  related: "http://test.host/api/v2/services/1.json"
+                }
+              }
+            }
+          },
+          {
+            id: '6',
+            type: "custom_signatures",
+            created_at: "2015-09-11T21:12:15.183Z",
+            active: true,
+            description: "Test description",
+            identifier: "AWS::Test::001",
+            name: "Test",
+            resolution: "Test resolution",
+            risk_level: "Medium",
+            signature: "Some javascript",
+            language: "javascript",
+            updated_at: nil,
+            relationships: {
+              organization: {
+                data: {
+                  type: "organizations",
+                  id: "1003"
+                },
+                links: {
+                  related: "http://test.host/api/v2/organizations/1003.json"
+                }
+              }
+            }
+          }
+        ]
+      end
+    end
   end
 end