MovableInkAWS 2.6.3 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7ad037cd5628c4064e602e7818305adf691666f178b1cba16f967c17021b1d
-  data.tar.gz: 7f6fbc76c3c7669aadd15682cd806c2e3268f39cd74dd395913910aa01b826f7
+  metadata.gz: 4bb30965f9a405275bbe54e8119bdc243bb4def14fb23af716488429639c6593
+  data.tar.gz: 9d31d8cde5eac0c2ae5be1673f167c2f550b2648a5593d3bc68213ce437c075d
 SHA512:
-  metadata.gz: 73af21192d6d001442427ed83f21e18b7aee0e214243b6e8572d1ca51f2b9d15a562e14435f666737f6158651285c2a95ac59f3c7a38d8a7539404a4f24a2559
-  data.tar.gz: 0cc73c99406611d2d6482149eea67a8c235b7b5caa0dd7d366ac0e6256c5a2b8faae3de6e83350ff71a464cac40f2b518c6b7a5b72e80613af8a8ee8042352c3
+  metadata.gz: 94c2a5c1b1028585739c75c57e1a83ce5c9629539ad5c8dbb977e9b38a3abc0d9f81d47883c37a252cfe6c4dd2ee241c30349bdbf97ce0bfc37f732a8de0c6cc
+  data.tar.gz: a7e9c6001f0f659178b1be1f50527d7d1e7495f4220dfefb1e8d8d2df3b297a3d94af39603161205b719e62053548c3ae397300ed0998b88b9f998c984ad15af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.6.3)
+    MovableInkAWS (2.7.1)
       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/route53.rb

@@ -13,18 +13,20 @@ 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?
+        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

data/lib/movable_ink/aws.rb

@@ -36,7 +36,8 @@ module MovableInk
           'rld' => 'us-west-2',
           'dub' => 'eu-west-1',
           'ord' => 'us-east-2',
-          'fra' => 'eu-central-1'
+          'fra' => 'eu-central-1',
+          'par' => 'eu-west-3'
         }
       end
     end
@@ -99,7 +100,7 @@ module MovableInk
           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```"
@@ -112,6 +113,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.3'
+    VERSION = '2.7.1'
   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.3
+  version: 2.7.1
 platform: ruby
 authors:
-- Matt Chesler
+- MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-07-20 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: []