MovableInkAWS 2.7.0 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c539b888e241eca594269dd052c7742eefdad57ab4dd5eeb0790a0fad507cff
-  data.tar.gz: 0ae613422476b0371f818eee49d7b8da5f659f93e4d8541f361816fb93afb3c4
+  metadata.gz: e63c5966f197e0bce1048cd51aae3a310fea5f76bc25e3d116b6a08e5113c25d
+  data.tar.gz: b72b5c3f38e8344217e7d999c2cd086bc9328fcf196f476f70c12b2f7bd58543
 SHA512:
-  metadata.gz: 31f107ee7940dd7b18d7e7c50764fcc2971c63660eafc14ae642cf1819389487a118b2b26438912cd7e234b00e4009f95d60c58308a8200d31f47c86971390a3
-  data.tar.gz: 70b71c81bd0fe0a7806824b034dea3c4d08151582377de6eec2c9416a6d5fecc1fb4fae20f62ffe948a2c5c609f6399a70460d2fa4ba5cebdaae3726abc7bc8d
+  metadata.gz: 3bd418547afcad6e528d987863eacf8e2c85b48f04ec3cbc990c0ab6fde12fc33699bc8469bed92d3e4dabcb0de833b95991fc2387ee6bb229389d4d87983742
+  data.tar.gz: fd7eee67d42e52e1677eb79e9d2a2be393bbd8a74c7fd511e3aad0bfd3f9a3fb52224cf79e03916760bc343b9d4028f4417091b5298f2239327bb2370d29ea34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.7.0)
+    MovableInkAWS (2.7.3)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -22,7 +22,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
     aws-partitions (1.605.0)
@@ -73,8 +73,8 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     deep_merge (1.2.2)
     diff-lcs (1.3)
     diplomat (2.4.2)
@@ -82,7 +82,7 @@ GEM
       faraday (>= 0.9, < 1.1.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -92,7 +92,8 @@ GEM
     mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
-    public_suffix (4.0.5)
+    public_suffix (4.0.7)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -106,9 +107,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    safe_yaml (1.0.5)
-    webmock (3.7.6)
-      addressable (>= 2.3.6)
+    webmock (3.17.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -121,4 +121,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.14
+   2.3.11

data/MovableInkAWS.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.version       = MovableInk::AWS::VERSION
   s.summary       = 'AWS Utility methods for MovableInk'
   s.description   = 'AWS Utility methods for MovableInk'
-  s.authors       = ['Matt Chesler']
-  s.email         = 'mchesler@movableink.com'
+  s.authors       = ['MI SRE']
+  s.email         = 'devops@movableink.com'
 
   s.add_runtime_dependency 'aws-sdk-core', '~> 3'
   s.add_runtime_dependency 'aws-sdk-athena', '~> 1'

data/lib/movable_ink/aws/errors.rb

@@ -8,6 +8,21 @@ module MovableInk
       class InvalidDiscoveryTypeError < StandardError; end
       class RoleNameRequiredError < StandardError; end
       class RoleNameInvalidError < StandardError; end
+
+      class ExpectedError
+        def initialize(error_class, message_patterns = [])
+          @error_class = error_class
+          message_patterns.each { |pattern| raise StandardError.new("Invalid message pattern provided #{pattern.inspect}") unless pattern.class == Regexp }
+          @message_patterns = message_patterns
+        end
+
+        def match?(exception)
+          return false unless exception.class == @error_class
+          return true if @message_patterns.length == 0
+          @message_patterns.each {|pattern| return true if exception.message.match(pattern) }
+          false
+        end
+      end
     end
   end
 end

data/lib/movable_ink/aws/route53.rb

@@ -16,7 +16,7 @@ module MovableInk
         resource_record_sets(zone, client).select{|rrs| rrs.set_identifier == instance_name}.map(&:to_h)
       end
 
-      def delete_resource_record_sets(zone, instance_name, client = nil)
+      def delete_resource_record_sets(zone, instance_name, client = nil, expected_errors = [])
         resource_record_sets = get_resource_record_sets_by_instance_name(zone, instance_name, client)
         return if resource_record_sets.empty?
 
@@ -29,7 +29,7 @@ module MovableInk
           }
         }
 
-        run_with_backoff do
+        run_with_backoff(expected_errors: expected_errors) do
           route53(client).change_resource_record_sets({change_batch: change_batch, hosted_zone_id: zone})
         end
       end

data/lib/movable_ink/aws.rb

@@ -61,7 +61,8 @@ module MovableInk
       end
     end
 
-    def run_with_backoff(quiet: false, tries: 9)
+    # exected_errors[0].class == MovableInk::AWS::ExpectedError
+    def run_with_backoff(quiet: false, tries: 9, expected_errors: [])
       tries.times do |num|
         begin
           return yield
@@ -97,10 +98,11 @@ module MovableInk
             notify_and_sleep(sleep_time, $!.class)
           end
         rescue Aws::Errors::ServiceError => e
+          expected_errors.each {|expected_error| return if expected_error.match?(e) }
           message = "#{e.class}: #{e.message}\nFrom #{$0}\n```\n#{e.backtrace.first(3).join("\n").gsub("`","'")}\n```"
           notify_slack(subject: 'Unhandled AWS API Error', message: message)
           puts message
-          raise MovableInk::AWS::Errors::ServiceError
+          raise MovableInk::AWS::Errors::ServiceError.new("#{e.class}: #{e.message}")
         end
       end
       message = "From: #{$0}\n```\n#{Thread.current.backtrace.first(3).join("\n").gsub("`","'")}\n```"
@@ -113,6 +115,10 @@ module MovableInk
       self.class.regions
     end
 
+    def my_aws_account_id
+      @my_aws_account_id ||= instance_identity_document['accountId'].to_i
+    end
+
     def my_region
       @my_region ||= if ENV['AWS_REGION'].nil?
         availability_zone.chop

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.7.0'
+    VERSION = '2.7.3'
   end
 end

data/spec/errors_spec.rb

@@ -0,0 +1,21 @@
+require_relative '../lib/movable_ink/aws'
+require 'webmock/rspec'
+
+describe MovableInk::AWS::Errors do
+  context 'ExpectedError' do
+    it 'matches exception by class name and pattern' do
+      expected = MovableInk::AWS::Errors::ExpectedError.new(Aws::Errors::ServiceError, [/something failed/])
+      expect(expected.match?(Aws::Errors::ServiceError.new(nil, 'There\'s something failed.'))).to eq(true)
+    end
+
+    it 'matches exception by class name only' do
+      expected = MovableInk::AWS::Errors::ExpectedError.new(Aws::Errors::ServiceError)
+      expect(expected.match?(Aws::Errors::ServiceError.new(nil, 'There\'s something failed.'))).to eq(true)
+    end
+
+    it 'matches exception by class name only - negative match' do
+      expected = MovableInk::AWS::Errors::ExpectedError.new(Aws::IAM::Errors::Throttling)
+      expect(expected.match?(Aws::Errors::ServiceError.new(nil, 'There\'s something failed.'))).to eq(false)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.3
 platform: ruby
 authors:
-- Matt Chesler
+- MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.2
 description: AWS Utility methods for MovableInk
-email: mchesler@movableink.com
+email: devops@movableink.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -268,6 +268,7 @@ files:
 - spec/consul_spec.rb
 - spec/ec2_spec.rb
 - spec/elasticache_spec.rb
+- spec/errors_spec.rb
 - spec/iam_spec.rb
 - spec/metadata_spec.rb
 - spec/route53_spec.rb