elasticity 6.0.4 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfb7218cb99e8354fa0131b0abb59d4ff270871
-  data.tar.gz: 824cc467d7beec5a50d63200d75805f4c8cb801e
+  metadata.gz: d313d736b8c2be8bda97c7cba0c200c611b5fc59
+  data.tar.gz: e0c4afadd4d192770e3c79a67f5c62147425c1dd
 SHA512:
-  metadata.gz: 35806e42575b2be800ffaa2559f5e511b6c11c46eae4ad337744249f525146f2e4c800aaa2a19f00139036d848492407b1d2d09b7a84a896a29244d0664a8037
-  data.tar.gz: 1ba0336770e3bef6dbcde18021902f44b880c717855224a5a6ce7e6f022eb69eafc2d41bc38808812b9dc13806931953e22b24f4063c85ad1160f4cbf0a84a67
+  metadata.gz: 2c3c35bdeb9408756f085cc9fc8550c6ca6165fec7134af6a8f639279128cb6bf2a84a067766891ead282e6532adbb5a1a2fa7aff6fa62ed65261171f8fb7f80
+  data.tar.gz: cbab3121a67c1b7f0d3370f6ee662b7dd308fa0d8c57122e68db1f2b0b1e5a87119533968baadfae8c3e4a5bbd76a94ae28a49f362e276fb42d68e34e9d58e8f

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 .idea
 tmp/*
+.DS_Store

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 6.0.5 - August 28, 2015
+
+- - Including PR [#119](https://github.com/rslifka/elasticity/pull/119) - "Error handling for API rate limiting".  Thank you [@robert2d](https://github.com/robert2d)!
+
 ## 6.0.4 - August 3, 2015
 
 - Including PR [#118](https://github.com/rslifka/elasticity/pull/118) - "jobflow ids must be passed as an array to AWS".  Thank you [@robert2d](https://github.com/robert2d)!

data/lib/elasticity/aws_session.rb

@@ -1,9 +1,8 @@
 module Elasticity
 
-  class MissingKeyError < StandardError;
-  end
-  class MissingRegionError < StandardError;
-  end
+  class MissingKeyError < StandardError; end
+  class MissingRegionError < StandardError; end
+  class ThrottlingException < StandardError; end
 
   class AwsSession
 
@@ -29,7 +28,9 @@ module Elasticity
       begin
         RestClient.post(aws_request.url, aws_request.payload, aws_request.headers)
       rescue RestClient::BadRequest => e
-        raise ArgumentError, AwsSession.parse_error_response(e.http_body)
+        type, message = AwsSession.parse_error_response(e.http_body)
+        raise ThrottlingException, message if type == 'ThrottlingException'
+        raise ArgumentError, message
       end
     end
 
@@ -45,7 +46,10 @@ module Elasticity
     # the error document.
     def self.parse_error_response(error_json)
       error = JSON.parse(error_json)
-      "AWS EMR API Error (#{error['__type']}): #{error['message']}"
+      [
+        error['__type'],
+        "AWS EMR API Error (#{error['__type']}): #{error['message']}"
+      ]
     end
 
   end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '6.0.4'
+  VERSION = '6.0.5'
 end

data/spec/lib/elasticity/aws_request_v4_spec.rb

@@ -123,7 +123,7 @@ describe Elasticity::AwsRequestV4 do
 
   describe '.aws_v4_signature' do
     it 'should create the proper signature' do
-      subject.send(:aws_v4_signature).should == 'd58b9ceeb51d56225de948616432438063fe9261be05c8c9f95de15b0053f15a'
+      subject.send(:aws_v4_signature).should == '107261f2d6a4d5caa0b14c6be4aabd283f730ce11f1e855890553288b21e1f5a'
     end
   end
 

data/spec/lib/elasticity/aws_session_spec.rb

@@ -94,6 +94,16 @@ describe Elasticity::AwsSession do
           subject.submit({})
         }.to raise_error(ArgumentError, "AWS EMR API Error (#{error_type}): #{error_message}")
       end
+
+      context 'EMR API rate limit hit' do
+        let(:error_type) { 'ThrottlingException' }
+        it 'should raise a Throttling error with the body of the error' do
+          RestClient.should_receive(:post).and_raise(error)
+          expect {
+            subject.submit({})
+          }.to raise_error(Elasticity::ThrottlingException, "AWS EMR API Error (#{error_type}): #{error_message}")
+        end
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.5
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client