MovableInkAWS 2.6.5 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d617b4671eb664f2e36fc1f1df11607066c0a46c1c5e536a552eb2c7ac451545
-  data.tar.gz: 5d975ee847ec37369c1488dd7c4ecc11c5d4abae33bb9131308260af256a557d
+  metadata.gz: 062a7d89881a8deb80193260cee046fd05bc2f354614b4184c9b4f219e6bbfb5
+  data.tar.gz: 2f539ce1e8ffe789ac796f13eb0626eeb7beed534bb2487dd2962341eadfffe3
 SHA512:
-  metadata.gz: 70ace6a3c1a4f9d4a60e1053f93c0d37e10e5737800b149c358f804b02b3de9522dd9624dc0723b1da66bc2912544ce91de18ee8852926e39665c61cc2d8a6d5
-  data.tar.gz: b51afda56e2c80126efa86737ef9359327698324a61fc67e9c86774e4f0eb191cead2c235e665f843c8fb4f0f7b6be881dee04c271671a6c9d3e70680f5862ad
+  metadata.gz: 5a8aaca866b301926dd14e435dc811d1b20d99e78f5e3a91a40a3d6e0258c07df66d15e74d69123e2548272fb89ce64763d2a5eac010b8a137556fd44c69511f
+  data.tar.gz: e9b2eac205025b400cea11b4692be05ec2e5e6ceca621187d0e8151fbab6996351b2ca2d4bfa4ccbcd7b65ec2fd564a6ecdd54cbe9daf78cfd57c59feff0a319

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.6.5)
+    MovableInkAWS (2.7.2)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -25,53 +25,53 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.573.0)
-    aws-sdk-athena (1.52.0)
+    aws-partitions (1.605.0)
+    aws-sdk-athena (1.54.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.78.0)
+    aws-sdk-autoscaling (1.79.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.62.0)
+    aws-sdk-cloudwatch (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.0)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.305.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ec2 (1.321.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.74.0)
+    aws-sdk-eks (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.76.0)
+    aws-sdk-elasticache (1.78.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.68.0)
+    aws-sdk-iam (1.69.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.55.0)
+    aws-sdk-kms (1.57.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.142.0)
+    aws-sdk-rds (1.148.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.62.0)
+    aws-sdk-route53 (1.63.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sdk-sns (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.134.0)
+    aws-sdk-ssm (1.137.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -91,7 +91,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     public_suffix (4.0.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -121,4 +121,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.11
+   2.3.14

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

@@ -13,21 +13,23 @@ module MovableInk
       end
 
       def get_resource_record_sets_by_instance_name(zone, instance_name, client = nil)
-        resource_record_sets(zone, client).select{|rrs| rrs.set_identifier == instance_name}.first.to_h
+        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)
-        resource_record_set = get_resource_record_sets_by_instance_name(zone, instance_name, client)
-        return if resource_record_set.empty?
+      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?
 
         change_batch = {
-          "changes": [{
-            "action": 'DELETE',
-            "resource_record_set": resource_record_set
-          }]
+          "changes": resource_record_sets.map { |resource_record_set|
+            {
+              "action": 'DELETE',
+              "resource_record_set": resource_record_set
+            }
+          }
         }
 
-        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.6.5'
+    VERSION = '2.7.2'
   end
 end

data/spec/route53_spec.rb

@@ -15,6 +15,11 @@ describe MovableInk::AWS::Route53 do
           name: 'host2.domain.tld.',
           set_identifier: '10_0_0_2',
           type: '???'
+        },
+        {
+          name: 'host2-other.domain.tld.',
+          set_identifier: '10_0_0_2',
+          type: '???'
         }
       ])
     }
@@ -23,12 +28,23 @@ describe MovableInk::AWS::Route53 do
       route53.stub_responses(:list_resource_record_sets, rrset_data)
       allow(aws).to receive(:route53).and_return(route53)
 
-      expect(aws.resource_record_sets('Z123').count).to eq(2)
-      expect(aws.resource_record_sets('Z123').first.name).to eq('host1.domain.tld.')
-      expect(aws.resource_record_sets('Z123').last.name).to eq('host2.domain.tld.')
+      expect(aws.resource_record_sets('Z123').count).to eq(3)
+      expect(aws.resource_record_sets('Z123')[0].name).to eq('host1.domain.tld.')
+      expect(aws.resource_record_sets('Z123')[1].name).to eq('host2.domain.tld.')
+      expect(aws.resource_record_sets('Z123')[2].name).to eq('host2-other.domain.tld.')
+    end
+
+    it "returns all sets with an identifier" do
+      route53.stub_responses(:list_resource_record_sets, rrset_data)
+      allow(aws).to receive(:route53).and_return(route53)
+
+      sets = aws.get_resource_record_sets_by_instance_name('Z123', '10_0_0_2')
+      expect(sets.count).to eq(2)
+      expect(sets[0][:name]).to eq('host2.domain.tld.')
+      expect(sets[1][:name]).to eq('host2-other.domain.tld.')
     end
 
-    it 'deletes a rrset that exists' do
+    it 'deletes rrsets that exist under the same identifier' do
       route53.stub_responses(:list_resource_record_sets, rrset_data)
       allow(aws).to receive(:route53).and_return(route53)
 
@@ -41,6 +57,14 @@ describe MovableInk::AWS::Route53 do
               type: "???",
               set_identifier: "10_0_0_2"
             }
+          },
+          {
+            action: "DELETE",
+            resource_record_set: {
+              name: "host2-other.domain.tld.",
+              type: "???",
+              set_identifier: "10_0_0_2"
+            }
           }]
         },
         hosted_zone_id: "Z123"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.7.2
 platform: ruby
 authors:
-- Matt Chesler
+- MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-08-01 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: []