MovableInkAWS 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee1a2c8481d6a86018db27fd2b80bd5860893c8a615640c5f49b82ae73aee4b2
-  data.tar.gz: 87cabc275736604f8157a9794611c28603858f233619edf90325440cbc03bbc8
+  metadata.gz: 32cc5f4b290b7afc559ccc8c34f3abf54c5c2216aaca0b2d4d5f1d066dddee48
+  data.tar.gz: b14670bd7662e6e013c3889af9cf2da3ff4e64ebb01470f9a1d022aced3e3396
 SHA512:
-  metadata.gz: 0ed46b18675f3443e3c16c8fec22b2a0a9ddb3847f9dc2c4b1898b703daa39bf31f5494207ff5039ed797170e1cb20c32999ff8a2005d3060637b9cd3f1d47c7
-  data.tar.gz: 5300b9afe47940466a709feed4d4fa30cd33fd55a63fa3cadf38a628cbb147a92d6d85ceffbc873be09ded9f1fdf902af5996e5764c22f4303c77bdbb0da552e
+  metadata.gz: 3292926afdd6716234a244c4b3a8e1fb99ddbf2b421383bee0a28ef54244587f8b919717e1b2fb8f23858e0f91970f5583b9f7faa6e680b323610a75c57b1b49
+  data.tar.gz: 85f0a66e12260cb970dc80902979188926e123d803ec1267c816ac543d7e951b6209a3fcca179ff4d4aed651c48fca9d5f2f8e704346b9ba3728fe755327698d

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.1.8)
+    MovableInkAWS (0.1.10)
       aws-sdk (~> 2.11, >= 2.11.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.11.21)
-      aws-sdk-resources (= 2.11.21)
-    aws-sdk-core (2.11.21)
+    aws-sdk (2.11.88)
+      aws-sdk-resources (= 2.11.88)
+    aws-sdk-core (2.11.88)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.21)
-      aws-sdk-core (= 2.11.21)
-    aws-sigv4 (1.0.2)
+    aws-sdk-resources (2.11.88)
+      aws-sdk-core (= 2.11.88)
+    aws-sigv4 (1.0.3)
     diff-lcs (1.3)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -39,4 +39,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/movable_ink/aws/errors.rb

@@ -1,6 +1,7 @@
 module MovableInk
   class AWS
     module Errors
+      class ServiceError < StandardError; end
       class FailedWithBackoff < StandardError; end
       class EC2Required < StandardError; end
       class NoEnvironmentTagError < StandardError; end

data/lib/movable_ink/aws.rb

@@ -43,7 +43,7 @@ module MovableInk
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,
                Aws::Route53::Errors::ThrottlingException,
-               Aws::Route53::Errors::ServiceError,
+               Aws::Route53::Errors::PriorRequestNotComplete,
                Aws::SSM::Errors::TooManyUpdates,
                Aws::Athena::Errors::ThrottlingException,
                MovableInk::AWS::Errors::NoEnvironmentTagError
@@ -53,6 +53,12 @@ module MovableInk
           else
             notify_and_sleep(sleep_time, $!.class)
           end
+        rescue Aws::Errors::ServiceError => e
+          message = "#{e.class}: #{e.message}\nFrom `#{e.backtrace.last.gsub("`","'")}`"
+          notify_slack(subject: 'Unhandled AWS API Error',
+                       message: message)
+          puts message
+          raise MovableInk::AWS::Errors::ServiceError
         end
       end
       raise MovableInk::AWS::Errors::FailedWithBackoff

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

data/spec/aws_spec.rb

@@ -41,6 +41,16 @@ describe MovableInk::AWS do
         aws.run_with_backoff { ec2.describe_instances } rescue nil
       end
 
+      it "should not retry and raise if a non-throttling error occurs" do
+        aws = MovableInk::AWS.new(environment: 'test')
+        route53 = Aws::Route53::Client.new(stub_responses: true)
+        route53.stub_responses(:list_resource_record_sets, 'NoSuchHostedZone')
+
+        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(STDOUT).to receive(:puts).exactly(1).times
+        expect{ aws.run_with_backoff { route53.list_resource_record_sets(hosted_zone_id: 'foo') } }.to raise_error(MovableInk::AWS::Errors::ServiceError)
+      end
+
       it "should not notify slack when quiet param is passed in" do
         aws = MovableInk::AWS.new(environment: 'test')
         ec2 = Aws::EC2::Client.new(stub_responses: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk