MovableInkAWS 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb30965f9a405275bbe54e8119bdc243bb4def14fb23af716488429639c6593
-  data.tar.gz: 9d31d8cde5eac0c2ae5be1673f167c2f550b2648a5593d3bc68213ce437c075d
+  metadata.gz: 062a7d89881a8deb80193260cee046fd05bc2f354614b4184c9b4f219e6bbfb5
+  data.tar.gz: 2f539ce1e8ffe789ac796f13eb0626eeb7beed534bb2487dd2962341eadfffe3
 SHA512:
-  metadata.gz: 94c2a5c1b1028585739c75c57e1a83ce5c9629539ad5c8dbb977e9b38a3abc0d9f81d47883c37a252cfe6c4dd2ee241c30349bdbf97ce0bfc37f732a8de0c6cc
-  data.tar.gz: a7e9c6001f0f659178b1be1f50527d7d1e7495f4220dfefb1e8d8d2df3b297a3d94af39603161205b719e62053548c3ae397300ed0998b88b9f998c984ad15af
+  metadata.gz: 5a8aaca866b301926dd14e435dc811d1b20d99e78f5e3a91a40a3d6e0258c07df66d15e74d69123e2548272fb89ce64763d2a5eac010b8a137556fd44c69511f
+  data.tar.gz: e9b2eac205025b400cea11b4692be05ec2e5e6ceca621187d0e8151fbab6996351b2ca2d4bfa4ccbcd7b65ec2fd564a6ecdd54cbe9daf78cfd57c59feff0a319

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.7.1)
+    MovableInkAWS (2.7.2)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 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,6 +98,7 @@ 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

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.7.1'
+    VERSION = '2.7.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core