MovableInkAWS 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d76e882265a792568c24853fbc6953bcfa54c4677d67b8aaf97d009896cb24
-  data.tar.gz: f02414993d6c9509bd72f5ec246e6bf99fc60c20a036487be9336cb41e780e8f
+  metadata.gz: 1c9a86a0ab40e4e623c361481330fd62111efa6d6f62cb79e1959d2ef49c9824
+  data.tar.gz: 0c792c6c2775ab5d6bc6d838713059a68313e1e5bac7e461757595e5b53ff166
 SHA512:
-  metadata.gz: b987bbb77c3fd5d2c1fc23c84c62e3af00df58074dbbdc9db21fd05fc8181c23f10bf096665f197ee98f79deaf4aaaaabc3fea1418ffcb85f0f256145fe13260
-  data.tar.gz: ddc7c1eff50e05f3d1cd83cb65df72f688c6aadbed822dc3a87cd9e2096451ab23f62293092443f9d22f4e76a84eb7073da2ffb41117987341bfb2663915cc25
+  metadata.gz: 470d135f2a065395a53fa0a362f6075cc3755815a0bfd6e426e46427932dcf1eca04af944b50dad190a067a1a8202d8951d027e79949263935f579e93446450c
+  data.tar.gz: 45fd5275c71dc36ad59295f660684018f3b5a386cca5d084fada593aaa02260dc4bb2751922462dc702bb8c59e5a0040b040d13a86b933c8414f643c24c143cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.3.0)
+    MovableInkAWS (2.4.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)

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/ec2.rb

@@ -156,24 +156,24 @@ module MovableInk
 
       def map_ec2_consul_endpoint(endpoint)
         OpenStruct.new ({
-          private_ip_address: endpoint.Node['Address'],
-          instance_id: endpoint.Node['Meta']['instance_id'],
+          private_ip_address: endpoint.Node.dig('Address'),
+          instance_id: endpoint.Node.dig('Meta', 'instance_id'),
           tags: [
             {
               key: 'Name',
-              value: endpoint.Node['Node']
+              value: endpoint.Node.dig('Node')
             },
             {
               key: 'mi:roles',
-              value: endpoint.Node['Meta']['mi_roles']
+              value: endpoint.Node.dig('Meta', 'mi_roles')
             },
             {
               key: 'mi:monitoring_roles',
-              value: endpoint.Node['Meta']['mi_monitoring_roles']
+              value: endpoint.Node.dig('Meta', 'mi_monitoring_roles')
             }
           ],
           placement: {
-            availability_zone: endpoint.Node['Meta']['availability_zone']
+            availability_zone: endpoint.Node.dig('Meta', 'availability_zone')
           }
         })
       end

data/lib/movable_ink/aws/metadata.rb

@@ -34,6 +34,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
@@ -43,7 +47,7 @@ module MovableInk
       def imds_token(tries: 3)
         tries.times do |num|
           num += 1
-          request = Net::HTTP::Get.new('/latest/api/token')
+          request = Net::HTTP::Put.new('/latest/api/token')
           request['X-aws-ec2-metadata-token-ttl-seconds'] = 120
           response = http(timeout_seconds: num * 3).request(request)
           return response.body

data/lib/movable_ink/aws.rb

@@ -65,6 +65,8 @@ module MovableInk
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
                Aws::EC2::Errors::Unavailable,
+               Aws::EC2::Errors::InternalError,
+               Aws::EC2::Errors::Http503Error,
                Aws::EKS::Errors::TooManyRequestsException,
                Aws::SNS::Errors::ThrottledException,
                Aws::SNS::Errors::Throttling,
@@ -77,6 +79,9 @@ module MovableInk
                Aws::Route53::Errors::ServiceUnavailable,
                Aws::SSM::Errors::TooManyUpdates,
                Aws::SSM::Errors::ThrottlingException,
+               Aws::SSM::Errors::InternalServerError,
+               Aws::SSM::Errors::Http503Error,
+               Aws::SSM::Errors::Http502Error,
                Aws::Athena::Errors::ThrottlingException,
                MovableInk::AWS::Errors::NoEnvironmentTagError
           sleep_time = (num+1)**2 + rand(10)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.3.0'
+    VERSION = '2.4.0'
   end
 end

data/spec/aws_spec.rb

@@ -23,7 +23,7 @@ describe MovableInk::AWS do
     it 'raises when AWS_REGION is not set and the metadata service is not available' do
       miaws = MovableInk::AWS.new
       # stub an error making a request to the metadata api
-      stub_request(:get, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
       expect { miaws.my_region }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
   end

data/spec/ec2_spec.rb

@@ -10,7 +10,7 @@ describe MovableInk::AWS::EC2 do
     it "should raise an error if trying to load mi_env outside of EC2" do
       aws = MovableInk::AWS.new
       # stub an error making a request to the metadata api
-      stub_request(:get, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
       expect{ aws.mi_env }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
 
@@ -22,7 +22,7 @@ describe MovableInk::AWS::EC2 do
     it "should not find a 'me'" do
       aws = MovableInk::AWS.new
       # stub an error making a request to the metadata api
-      stub_request(:get, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
       expect(aws.me).to eq(nil)
     end
   end
@@ -482,6 +482,7 @@ describe MovableInk::AWS::EC2 do
 
         ojos_instances = aws.instances(role: 'ojos', availability_zone: other_availability_zone, discovery_type: 'consul')
         expect(ojos_instances.map{|i| i.tags.first[:value]}).to eq(['ojos_instance2', 'ojos_instance3'])
+        expect(ojos_instances.map{|i| i.tags[1][:value]}).to eq(['ojos', 'ojos'])
       end
 
       it "returns backends that are synced from consul-k8s" do

data/spec/metadata_spec.rb

@@ -10,7 +10,7 @@ describe MovableInk::AWS::Metadata do
     it 'should raise an error if the metadata service times out' do
       aws = MovableInk::AWS.new
       # stub an error making a request to the metadata api
-      stub_request(:get, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
       expect{ aws.instance_id }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
       expect{ aws.availability_zone }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
@@ -18,7 +18,7 @@ describe MovableInk::AWS::Metadata do
     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
-      stub_request(:get, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
+      stub_request(:put, 'http://169.254.169.254/latest/api/token').to_raise(Net::OpenTimeout)
       expect{ aws.private_ipv4 }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
   end

metadata

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