MovableInkAWS 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe55480a2a2c96efcd39918d21548949818a350547c4b74620ebd279e74b955f
-  data.tar.gz: 0567e3fd685f43f7bfbb283451662564f736dfb3417bacf8d81f6b2b9094730b
+  metadata.gz: 0539bfb11df57a94a89383fd54ba31df82b1fbee4980262d1ea35c023fad9664
+  data.tar.gz: 6684d49314bbb159b52b88d35a0783e8c917bccbd2bd273cf3fe0adf320128b6
 SHA512:
-  metadata.gz: 7a8c162aa5efdc6e1799126527cf7e65192a369defec263849f48c9a4c0dbf1529a737b2190370fdb1dfc10a0260d7ebd9e7a63fb17fda839ce09388e9a5320f
-  data.tar.gz: 24e8aca54e3f8090fabefab524ca859ab30b2eca49ec01b9b5faf317c115bbc33eb68d1cfdbddab06be38e9fa747b65075b218f46f5cfbc2739aa8f9e05208d8
+  metadata.gz: 26464d435dc1f1306967b4166c9d970c6ca9dab58e22b3ec1f8f3b1a94b1b40259f004f2141cfb63364a29280cf36cbafc253709cf4ad39ed70e2ee77b2de2de
+  data.tar.gz: ea438262feb93ca615aff818c417d117651d4b017250c9bf6b0b0f930ae86f16e01ff3d855481db7ce9a4650a590966cfc978ec847d2f883340cc42de134b683

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.1.3)
+    MovableInkAWS (0.1.4)
       aws-sdk (~> 2.10, >= 2.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.10.125)
-      aws-sdk-resources (= 2.10.125)
-    aws-sdk-core (2.10.125)
+    aws-sdk (2.11.28)
+      aws-sdk-resources (= 2.11.28)
+    aws-sdk-core (2.11.28)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.125)
-      aws-sdk-core (= 2.10.125)
+    aws-sdk-resources (2.11.28)
+      aws-sdk-core (= 2.11.28)
     aws-sigv4 (1.0.2)
     diff-lcs (1.3)
     jmespath (1.3.1)
@@ -39,4 +39,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/lib/movable_ink/aws/ec2.rb

@@ -11,16 +11,20 @@ module MovableInk
       end
 
       def load_mi_env
-        run_with_backoff do
-          ec2.describe_tags(filters: [
-                {
-                  name: 'resource-id',
-                  values: [instance_id]
-                }
-              ])
-             .tags
-             .detect { |tag| tag.key == 'mi:env' }
-             .value
+        run_with_backoff(quiet: true) do
+          begin
+            ec2.describe_tags(filters: [
+                  {
+                    name: 'resource-id',
+                    values: [instance_id]
+                  }
+                ])
+              .tags
+              .detect { |tag| tag.key == 'mi:env' }
+              .value
+          rescue NoMethodError
+            raise MovableInk::AWS::Errors::NoEnvironmentTagError
+          end
         end
       end
 

data/lib/movable_ink/aws/errors.rb

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

data/lib/movable_ink/aws.rb

@@ -30,7 +30,7 @@ module MovableInk
       @mi_env = environment
     end
 
-    def run_with_backoff
+    def run_with_backoff(quiet: false)
       9.times do |num|
         begin
           return yield
@@ -40,8 +40,14 @@ module MovableInk
                Aws::S3::Errors::SlowDown,
                Aws::Route53::Errors::ThrottlingException,
                Aws::Route53::Errors::ServiceError,
-               Aws::SSM::Errors::TooManyUpdates
-          notify_and_sleep((num+1)**2 + rand(10), $!.class)
+               Aws::SSM::Errors::TooManyUpdates,
+               MovableInk::AWS::Errors::NoEnvironmentTagError
+          sleep_time = (num+1)**2 + rand(10)
+          if quiet
+            (num >=8) ? notify_and_sleep(sleep_time, $!.class) : sleep(sleep_time)
+          else
+            notify_and_sleep(sleep_time, $!.class)
+          end
         end
       end
       raise MovableInk::AWS::Errors::FailedWithBackoff

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/spec/aws_spec.rb

@@ -42,6 +42,18 @@ describe MovableInk::AWS do
         aws.run_with_backoff { ec2.describe_instances } rescue nil
       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)
+        ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
+
+        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(aws).to receive(:sleep).exactly(9).times.and_return(true)
+        expect(STDOUT).to receive(:puts).exactly(1).times
+
+        aws.run_with_backoff(quiet: true) { ec2.describe_instances } rescue nil
+      end
+
       it "should raise an error after too many timeouts" 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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk