MovableInkAWS 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 673dc5d1f0f353ad1795ea2e27bed707c2e67571dfd1b62080c49dd91d50e1dd
-  data.tar.gz: a85ec079fa09d003068621e092cb0268a1aa9ed2106fcf744b996f178f0562d6
+  metadata.gz: aee7128060ef1c160ab30f71a01ba8dc906b3cc19e600ebef7b48df7d0fd29d2
+  data.tar.gz: 36d923a0fca6ca5098f8e9dd4c12ee8257f9c0896853d56a2979e9bbe461ac5b
 SHA512:
-  metadata.gz: 94aea2b4db39beff8cf8abf6bc5c0953855b15f3bd2d82a333b055a7e191a74702670c0a4aa9c2a5ec530f32ebe0d9c15681dd71f333f8db28914a950f0fcce8
-  data.tar.gz: e1e34005c48e3677b18c4e88a8414f543919ccce8d35ec66710f0e01e0ac1c3172a0ff59a72e62f6fb436b19b62b6d58de184916b73b754e36e8bc995c486370
+  metadata.gz: f3328245aeb3822471f9a3c52f4e015c4cb60d0ae2950c5af09dff732081b66c0409607c8e4f3d21a676e6986ba8087f7509dc62a87862cfbbf3740af5d75f6a
+  data.tar.gz: a5decec040107d6b7240551412cc43827fdf78be921ae8eaae3fc61d419aa578d72a6af24851d8397f721e7674e03eda56cd662af8871eec9569e125a20a9199

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.5.0)
+    MovableInkAWS (2.6.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -23,55 +23,55 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.445.0)
-    aws-sdk-athena (1.37.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.573.0)
+    aws-sdk-athena (1.52.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.60.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-autoscaling (1.78.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.51.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-cloudwatch (1.62.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.114.0)
+    aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.234.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ec2 (1.305.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.51.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-eks (1.74.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.55.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-elasticache (1.76.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.43.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.118.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-rds (1.142.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.49.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-route53 (1.62.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.113.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-sns (1.39.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ssm (1.134.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.108.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    deep_merge (1.2.1)
+    deep_merge (1.2.2)
     diff-lcs (1.3)
     diplomat (2.4.2)
       deep_merge (~> 1.0, >= 1.0.1)
@@ -82,10 +82,10 @@ GEM
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    jmespath (1.4.0)
-    mime-types (3.3.1)
+    jmespath (1.6.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     public_suffix (4.0.5)
@@ -117,4 +117,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.3
+   2.1.4

data/lib/movable_ink/aws/metadata.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'json'
 
 module MovableInk
   class AWS
@@ -12,20 +13,34 @@ module MovableInk
         end
       end
 
-      def retrieve_metadata(key, tries: 3)
+      def retrieve_data(url, tries: 3)
         tries.times do |num|
           num += 1
-          request = Net::HTTP::Get.new("/latest/meta-data/#{key}")
+          request = Net::HTTP::Get.new(url)
           request['X-aws-ec2-metadata-token'] = imds_token
           response = http(timeout_seconds: num * 3).request(request)
           return response.body
-        rescue Net::OpenTimeout, Net::ReadTimeout, Errno::EHOSTDOWN
+        rescue Net::OpenTimeout, Net::ReadTimeout, Errno::EHOSTDOWN, Errno::ECONNREFUSED
           sleep(num * 2)
         end
 
         raise MovableInk::AWS::Errors::MetadataTimeout
       end
 
+      def retrieve_metadata(key, tries: 3)
+        retrieve_data("/latest/meta-data/#{key}", tries: tries)
+      end
+
+      def retrieve_dynamicdata(key, tries: 3)
+        retrieve_data("/latest/dynamic/#{key}", tries: tries)
+      end
+
+      def instance_identity_document
+        @instance_identity_document ||= JSON.parse(retrieve_dynamicdata('instance-identity/document'))
+      rescue JSON::ParserError
+        return
+      end
+
       def availability_zone
         @availability_zone ||= retrieve_metadata('placement/availability-zone')
       end

data/lib/movable_ink/aws/route53.rb

@@ -3,21 +3,21 @@ require 'aws-sdk-route53'
 module MovableInk
   class AWS
     module Route53
-      def route53
-        @route53_client ||= Aws::Route53::Client.new(region: 'us-east-1')
+      def route53(client = nil)
+        @route53_client ||= (client) ? client : Aws::Route53::Client.new(region: 'us-east-1')
       end
 
-      def resource_record_sets(hosted_zone_id)
+      def resource_record_sets(hosted_zone_id, client = nil)
         @resource_record_sets ||= {}
-        @resource_record_sets[hosted_zone_id] ||= list_all_r53_resource_record_sets(hosted_zone_id)
+        @resource_record_sets[hosted_zone_id] ||= list_all_r53_resource_record_sets(hosted_zone_id, client)
       end
 
-      def get_resource_record_sets_by_instance_name(zone, instance_name)
-        resource_record_sets(zone).select{|rrs| rrs.set_identifier == instance_name}.first.to_h
+      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
       end
 
-      def delete_resource_record_sets(zone, instance_name)
-        resource_record_set = get_resource_record_sets_by_instance_name(zone, instance_name)
+      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?
 
         change_batch = {
@@ -28,36 +28,36 @@ module MovableInk
         }
 
         run_with_backoff do
-          route53.change_resource_record_sets({change_batch: change_batch, hosted_zone_id: zone})
+          route53(client).change_resource_record_sets({change_batch: change_batch, hosted_zone_id: zone})
         end
       end
 
-      def list_all_r53_resource_record_sets(hosted_zone_id)
+      def list_all_r53_resource_record_sets(hosted_zone_id, client = nil)
         run_with_backoff do
-          route53.list_resource_record_sets({
+          route53(client).list_resource_record_sets({
             hosted_zone_id: hosted_zone_id
           }).flat_map(&:resource_record_sets)
         end
       end
 
-      def list_health_checks
+      def list_health_checks(client = nil)
         run_with_backoff do
-          route53.list_health_checks().flat_map(&:health_checks)
+          route53(client).list_health_checks().flat_map(&:health_checks)
         end
       end
 
-      def get_health_check_tags(health_check_id)
+      def get_health_check_tags(health_check_id, client = nil)
         run_with_backoff do
-          route53.list_tags_for_resource({
+          route53(client).list_tags_for_resource({
             resource_type: 'healthcheck',
             resource_id: health_check_id
           }).resource_tag_set.tags
         end
       end
 
-      def find_health_check_by_tag(key, value)
-        list_health_checks.detect do |health_check|
-          get_health_check_tags(health_check.id).detect { |tag| tag.key == key && tag.value.include?(value) }
+      def find_health_check_by_tag(key, value, client = nil)
+        list_health_checks(client).detect do |health_check|
+          get_health_check_tags(health_check.id, client).detect { |tag| tag.key == key && tag.value.include?(value) }
         end
       end
     end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.5.0'
+    VERSION = '2.6.0'
   end
 end

data/spec/metadata_spec.rb

@@ -15,6 +15,19 @@ describe MovableInk::AWS::Metadata do
       expect{ aws.availability_zone }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
 
+    it 'should raise an error if the metadata service times out on getting dynamic data' do
+      aws = MovableInk::AWS.new
+      # stub an error making a request to the metadata api
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      expect{ aws.instance_identity_document }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
+    end
+
+    it 'should return nil if the metadata service returns unparseable dynamic data' do
+      aws = MovableInk::AWS.new
+      expect(aws).to receive(:retrieve_data).with('/latest/dynamic/instance-identity/document', {tries: 3}).and_return("something")
+      expect(aws.instance_identity_document).to eq(nil)
+    end
+
     it 'should raise an error if trying to load private_ipv4 outside of EC2' do
       aws = MovableInk::AWS.new
       # stub an error making a request to the metadata api

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core