MovableInkAWS 2.4.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c9a86a0ab40e4e623c361481330fd62111efa6d6f62cb79e1959d2ef49c9824
-  data.tar.gz: 0c792c6c2775ab5d6bc6d838713059a68313e1e5bac7e461757595e5b53ff166
+  metadata.gz: 363e1c1c55ce4788534ff1c245a354e862e9320d179770c9ccacc54fd335177c
+  data.tar.gz: d453d58d25b0ec69b236d0e5aa3392615099b526294eac9966cebd46bf068b2f
 SHA512:
-  metadata.gz: 470d135f2a065395a53fa0a362f6075cc3755815a0bfd6e426e46427932dcf1eca04af944b50dad190a067a1a8202d8951d027e79949263935f579e93446450c
-  data.tar.gz: 45fd5275c71dc36ad59295f660684018f3b5a386cca5d084fada593aaa02260dc4bb2751922462dc702bb8c59e5a0040b040d13a86b933c8414f643c24c143cd
+  metadata.gz: 2d305359f482dc45af20f878acf18f6569438356121fe63c9f8861277b5cb8a192d65e41c3de9f6dbbf47c0e368b235671f172749a08ad0dc61cbfb1d1c500a3
+  data.tar.gz: 3a2bc49178a06fae7316ed380f693ad86502db0e0df71be9e6144fd10bfe888a625c756e4e631d7b47ef24cb5efe3237b075cecda011c4087c32e82950818042

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.4.0)
+    MovableInkAWS (2.5.2)
       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.rb

@@ -34,7 +34,8 @@ module MovableInk
           'iad' => 'us-east-1',
           'rld' => 'us-west-2',
           'dub' => 'eu-west-1',
-          'ord' => 'us-east-2'
+          'ord' => 'us-east-2',
+          'fra' => 'eu-central-1'
         }
       end
     end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.4.0'
+    VERSION = '2.5.2'
   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.4.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core