MovableInkAWS 2.3.3 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: add902b34bc1b872e499b1dd0d62ae1750fd7a2f136f954371e74b1c13a3f762
-  data.tar.gz: e691e43c549acd10af89ece802b06ebead70ebbd6e96b314f832947ea82738b3
+  metadata.gz: bf00286ca6df97b28e2721514ae975f5033f1c1645270b787acdade801895431
+  data.tar.gz: 18cced6b07a7ed5b683c6ccfe037aabadd6d54eb58eee399eb23cb2d0a2e152a
 SHA512:
-  metadata.gz: 4666488ed8debc85bf3ca0e18d3f65ce23ccb0ac41061899cfe0bebadcfbc614a7f4fcdd4ac98342330b4a3b7e6f73d9199d3be3072b44effab4732b1aa5c759
-  data.tar.gz: 694dbc4e5b8d6eb4bf9c4966b7f149a225a3199b2d0f4093a9fe9ee949049f3d653ec92b4c85cba02bc56ff875ba028a652f34aa6050b007ed7b730c4d288f4b
+  metadata.gz: d690d05079f5d2b51b87003e5de4a6322110897935e8a2a5fa387fe12a242b017ed0b6fcad3dfbd9976a50d81c22a78788009bf2c52bce25c338ad784a5aa753
+  data.tar.gz: 9026ea88eecfaa54abfbe18df7856d2e481279d4dd2ada91c1ed60b94a883b8cf527d402f513c24622227adb9b669bb2acbf43033a2f47b8841ba196e461ef85

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.3.3)
+    MovableInkAWS (2.5.1)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -23,8 +23,8 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.445.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.554.0)
     aws-sdk-athena (1.37.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
@@ -34,9 +34,9 @@ GEM
     aws-sdk-cloudwatch (1.51.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.114.0)
+    aws-sdk-core (3.126.1)
       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)
@@ -67,11 +67,11 @@ GEM
     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,7 +82,7 @@ GEM
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    jmespath (1.4.0)
+    jmespath (1.6.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
@@ -117,4 +117,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.3
+   2.1.4

data/PULL_REQUEST_TEMPLATE.md

@@ -12,4 +12,5 @@
 
 #### Dependencies (if any)
 
-:house: [chXXXX](https://app.clubhouse.io/movableink/story/XXXX)
+
+:house: [sc-XXXX](https://app.shortcut.com/movableink/story/XXXX)

data/lib/movable_ink/aws/metadata.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'json'
 
 module MovableInk
   class AWS
@@ -12,10 +13,10 @@ 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
@@ -26,6 +27,20 @@ module MovableInk
         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
@@ -34,6 +49,10 @@ module MovableInk
         @instance_id ||= retrieve_metadata('instance-id')
       end
 
+      def instance_type
+        @instance_type ||= retrieve_metadata('instance-type')
+      end
+
       def private_ipv4
         @ipv4 ||= retrieve_metadata('local-ipv4')
       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.3.3'
+    VERSION = '2.5.1'
   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.3.3
+  version: 2.5.1
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core