MovableInkAWS 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf12982879cf6c6fbbd4a1027aa6de717c3084431339ad583cd4ae38d934bc91
-  data.tar.gz: e1baa1af0dc4a999bcba1ee421edc4204465afaadbc72a3190e97c57a948c1de
+  metadata.gz: 46d76e882265a792568c24853fbc6953bcfa54c4677d67b8aaf97d009896cb24
+  data.tar.gz: f02414993d6c9509bd72f5ec246e6bf99fc60c20a036487be9336cb41e780e8f
 SHA512:
-  metadata.gz: 567ef63e82f5d5bbf5b57b9b2aa5a853a63af0d572f710e813c322d135fef345456fc9cc3e3f103666f05065d244f67055ea78350f9b4ecec111b159663d2616
-  data.tar.gz: 2712730cb9852affc31a1586d36eba62b76a621d8e82dad39d8439bb0f47db72e897147666e5ea01ca2f75c7c4aeb3f5363f60b531dabd07f90e96813a846cb1
+  metadata.gz: b987bbb77c3fd5d2c1fc23c84c62e3af00df58074dbbdc9db21fd05fc8181c23f10bf096665f197ee98f79deaf4aaaaabc3fea1418ffcb85f0f256145fe13260
+  data.tar.gz: ddc7c1eff50e05f3d1cd83cb65df72f688c6aadbed822dc3a87cd9e2096451ab23f62293092443f9d22f4e76a84eb7073da2ffb41117987341bfb2663915cc25

data/.github/workflows/test.yaml

@@ -0,0 +1,39 @@
+name: test
+
+on:
+  push:
+    branches: ['**']
+    tags: ['v*']
+  pull_request:
+    branches: [$default-branch]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+
+    - name: Install dependencies
+      run: bundle install --retry=3
+
+    - name: Run tests
+      run: bundle exec rspec spec/
+
+    - name: Publish to RubyGems
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.1.0)
+    MovableInkAWS (2.3.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -23,51 +23,51 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.416.0)
-    aws-sdk-athena (1.33.0)
-      aws-sdk-core (~> 3, >= 3.109.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-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-autoscaling (1.60.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.47.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatch (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.111.0)
+    aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ec2 (1.234.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eks (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticache (1.55.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.110.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-rds (1.118.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-route53 (1.49.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.93.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-sns (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.102.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ssm (1.108.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -85,7 +85,7 @@ GEM
     jmespath (1.4.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     public_suffix (4.0.5)

data/lib/movable_ink/aws.rb

@@ -103,7 +103,11 @@ module MovableInk
     end
 
     def my_region
-      @my_region ||= availability_zone.chop
+      @my_region ||= if ENV['AWS_REGION'].nil?
+        availability_zone.chop
+      else
+        ENV['AWS_REGION']
+      end
     end
 
     def datacenter(region: my_region)

data/lib/movable_ink/aws/ec2.rb

@@ -112,10 +112,6 @@ module MovableInk
           raise MovableInk::AWS::Errors::RoleNameRequiredError
         end
 
-        if role.include?('_')
-          raise MovableInk::AWS::Errors::RoleNameInvalidError
-        end
-
         consul_service_options = {
           dc: datacenter(region: region),
           stale: true,
@@ -124,32 +120,64 @@ module MovableInk
         }
         consul_service_options[:node_meta] = "availability_zone:#{availability_zone}" unless availability_zone.nil?
 
-        Diplomat::Health.service(role, consul_service_options).map { |endpoint|
-          OpenStruct.new (
-          {
-            private_ip_address: endpoint.Node['Address'],
-            instance_id: endpoint.Node['Meta']['instance_id'],
-            tags: [
-              {
-                key: 'Name',
-                value: endpoint.Node['Node']
-              },
-              {
-                key: 'mi:roles',
-                value: endpoint.Node['Meta']['mi_roles']
-              },
-              {
-                key: 'mi:monitoring_roles',
-                value: endpoint.Node['Meta']['mi_monitoring_roles']
-              }
-            ],
-            placement: {
-              availability_zone: endpoint.Node['Meta']['availability_zone']
-            }
-          })
+        # We replace underscores with dashes in the role name in order to comply with
+        # consul service naming conventions while still retaining the role name we use
+        # within MI configuration
+        Diplomat::Health.service(role.gsub('_', '-'), consul_service_options).map { |endpoint|
+          if endpoint.Node.dig('Meta', 'external-source') == 'kubernetes'
+            map_k8s_consul_endpoint(endpoint, role)
+          else
+            map_ec2_consul_endpoint(endpoint)
+          end
         }
       end
 
+      def map_k8s_consul_endpoint(endpoint, role)
+        OpenStruct.new ({
+          private_ip_address: endpoint.Service.dig('Address'),
+          instance_id: nil,
+          tags: [
+            {
+              key: 'Name',
+              value: endpoint.Service.dig('ID')
+            },
+            {
+              key: 'mi:roles',
+              value: role
+            },
+            {
+              key: 'mi:monitoring_roles',
+              value: role
+            }
+          ],
+          placement: { availability_zone: nil }
+        })
+      end
+
+      def map_ec2_consul_endpoint(endpoint)
+        OpenStruct.new ({
+          private_ip_address: endpoint.Node['Address'],
+          instance_id: endpoint.Node['Meta']['instance_id'],
+          tags: [
+            {
+              key: 'Name',
+              value: endpoint.Node['Node']
+            },
+            {
+              key: 'mi:roles',
+              value: endpoint.Node['Meta']['mi_roles']
+            },
+            {
+              key: 'mi:monitoring_roles',
+              value: endpoint.Node['Meta']['mi_monitoring_roles']
+            }
+          ],
+          placement: {
+            availability_zone: endpoint.Node['Meta']['availability_zone']
+          }
+        })
+      end
+
       def instances(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false, use_cache: true, discovery_type: 'ec2')
         if discovery_type == 'ec2'
           instances_with_ec2_discovery(role: role, exclude_roles: exclude_roles, region: region, availability_zone: availability_zone, exact_match: exact_match, use_cache: use_cache)

data/lib/movable_ink/aws/errors.rb

@@ -3,7 +3,7 @@ module MovableInk
     module Errors
       class ServiceError < StandardError; end
       class FailedWithBackoff < StandardError; end
-      class EC2Required < StandardError; end
+      class MetadataTimeout < StandardError; end
       class NoEnvironmentTagError < StandardError; end
       class InvalidDiscoveryTypeError < StandardError; end
       class RoleNameRequiredError < StandardError; end

data/lib/movable_ink/aws/metadata.rb

@@ -3,59 +3,55 @@ require 'net/http'
 module MovableInk
   class AWS
     module Metadata
-      def http
-        @http ||= begin
+      def http(timeout_seconds: 1)
+        @http = begin
           http = Net::HTTP.new("169.254.169.254", 80)
-          http.open_timeout = 1
-          http.read_timeout = 1
+          http.open_timeout = timeout_seconds
+          http.read_timeout = timeout_seconds
           http
         end
       end
 
-      def retrieve_metadata(key)
-        request = Net::HTTP::Get.new("/latest/meta-data/#{key}")
-        request['X-aws-ec2-metadata-token'] = imds_token
-        response = http.request(request)
-        response.body
-      rescue
-        ""
+      def retrieve_metadata(key, tries: 3)
+        tries.times do |num|
+          num += 1
+          request = Net::HTTP::Get.new("/latest/meta-data/#{key}")
+          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
+          sleep(num * 2)
+        end
+
+        raise MovableInk::AWS::Errors::MetadataTimeout
       end
 
       def availability_zone
-        @availability_zone ||= begin
-          az = retrieve_metadata('placement/availability-zone')
-          raise(MovableInk::AWS::Errors::EC2Required) if az.empty?
-          az
-        end
+        @availability_zone ||= retrieve_metadata('placement/availability-zone')
       end
 
       def instance_id
-        @instance_id ||= begin
-          id = retrieve_metadata('instance-id')
-          raise(MovableInk::AWS::Errors::EC2Required) if id.empty?
-          id
-        end
+        @instance_id ||= retrieve_metadata('instance-id')
       end
 
       def private_ipv4
-        @ipv4 ||= begin
-          ipv4 = retrieve_metadata('local-ipv4')
-          raise(MovableInk::AWS::Errors::EC2Required) if ipv4.empty?
-          ipv4
-        end
+        @ipv4 ||= retrieve_metadata('local-ipv4')
       end
 
       private
 
-      def imds_token
-        begin
-          request = Net::HTTP::Put.new('/latest/api/token')
+      def imds_token(tries: 3)
+        tries.times do |num|
+          num += 1
+          request = Net::HTTP::Get.new('/latest/api/token')
           request['X-aws-ec2-metadata-token-ttl-seconds'] = 120
-          response = http.request(request)
-          response.body
-        rescue
-          nil
+          response = http(timeout_seconds: num * 3).request(request)
+          return response.body
+        rescue Net::OpenTimeout, Net::ReadTimeout, Errno::EHOSTDOWN
+          sleep(num * 2)
         end
+
+        raise MovableInk::AWS::Errors::MetadataTimeout
       end
     end
   end

data/lib/movable_ink/aws/sns.rb

@@ -29,42 +29,27 @@ module MovableInk
         sleep seconds
       end
 
-      def notify_nsq_can_not_be_drained
-        notify_slack(subject: 'NSQ not drained',
-                     message: "Unable to drain NSQ for instance <https://#{my_region}.console.aws.amazon.com/ec2/v2/home?region=#{my_region}#Instances:search=#{instance_id};sort=instanceId|#{instance_id}>")
-        notify_pagerduty(region: my_region, instance_id: instance_id)
-      end
-
-      def notify_pagerduty(region:, instance_id:)
-        summary = "Unable to drain NSQ for instance #{instance_id} in region #{region}"
-
-        # the PagerDuty integration key is added to the payload in the AWS integration
-        json_message = {
-          pagerduty: {
-            event_action: 'trigger',
-            payload: {
-              source: 'MovableInkAWS',
-              summary: summary,
-              timestamp: Time.now.utc.iso8601,
-              severity: 'error',
-              component: 'nsq',
-              group: 'nsq',
-              custom_details: {
-                InstanceId: instance_id,
-              },
-            },
-            dedup_key: "nsq-not-draining-#{instance_id}",
-            links: [{
-              href: "https://#{region}.console.aws.amazon.com/ec2/v2/home?region=#{region}#Instances:search=#{instance_id};sort=instanceId",
-              text: 'View Instance'
-            }],
-          }
-        }.to_json
-
+      def send_alert(
+        source: instance_id,
+        links: [],
+        custom_details: {},
+        summary:,
+        dedup_key:
+      )
         run_with_backoff do
-          sns.publish(topic_arn: sns_pagerduty_topic_arn,
-                      subject: "Unable to drain NSQ",
-                      message: json_message)
+          message_json = pd_message_json({
+            source: source,
+            summary: summary,
+            links: links,
+            custom_details: custom_details,
+            dedup_key: dedup_key,
+          })
+
+          sns.publish({
+            topic_arn: sns_pagerduty_topic_arn,
+            subject: summary,
+            message: message_json
+          })
         end
       end
 
@@ -78,6 +63,33 @@ module MovableInk
                       message: "#{required_info}\n#{message}")
         end
       end
+
+      private
+
+      def pd_message_json(
+        source:,
+        summary:,
+        links:,
+        custom_details:,
+        dedup_key:
+      )
+        {
+          pagerduty: {
+            event_action: 'trigger',
+            payload: {
+              source: source,
+              summary: summary,
+              timestamp: Time.now.utc.iso8601,
+              severity: 'error',
+              component: source,
+              group: source,
+              custom_details: custom_details,
+            },
+            dedup_key: dedup_key,
+            links: links,
+          }
+        }.to_json
+      end
     end
   end
 end

data/lib/movable_ink/version.rb

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

data/spec/aws_spec.rb

@@ -1,17 +1,37 @@
 require_relative '../lib/movable_ink/aws'
+require 'webmock/rspec'
 
 describe MovableInk::AWS do
   context "outside EC2" do
+    before(:each) do
+      allow_any_instance_of(MovableInk::AWS).to receive(:sleep).and_return(true)
+    end
+
+    after(:each) { ENV['AWS_REGION'] = nil }
+
     it 'doesnt raise an error if instance_id is set' do
       aws = MovableInk::AWS.new(instance_id: 'i-987654321')
       expect(aws.instance_id).to eq('i-987654321')
     end
+
+    it 'doesnt raise if AWS_REGION is set' do
+      ENV['AWS_REGION'] = 'us-east-1'
+      miaws = MovableInk::AWS.new
+      expect(miaws.my_region).to eq('us-east-1')
+    end
+
+    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)
+      expect { miaws.my_region }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
+    end
   end
 
   context "inside EC2" do
     it "should find the datacenter by region" do
       aws = MovableInk::AWS.new
-      expect(aws).to receive(:retrieve_metadata).with('placement/availability-zone').and_return("us-east-1a")
+      expect(aws).to receive(:availability_zone).and_return("us-east-1a")
       expect(aws.datacenter).to eq('iad')
     end
 

data/spec/ec2_spec.rb

@@ -2,12 +2,16 @@ require_relative '../lib/movable_ink/aws'
 require 'webmock/rspec'
 
 describe MovableInk::AWS::EC2 do
+  before(:each) do
+    allow_any_instance_of(MovableInk::AWS).to receive(:sleep).and_return(true)
+  end
+
   context "outside EC2" do
     it "should raise an error if trying to load mi_env outside of EC2" do
       aws = MovableInk::AWS.new
-      allow(aws).to receive(:retrieve_metadata).with('instance-id').and_return("")
-      allow(aws).to receive(:retrieve_metadata).with('placement/availability-zone').and_return("")
-      expect{ aws.mi_env }.to raise_error(MovableInk::AWS::Errors::EC2Required)
+      # 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)
+      expect{ aws.mi_env }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
 
     it "should use the provided environment" do
@@ -17,12 +21,16 @@ 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)
       expect(aws.me).to eq(nil)
     end
   end
 
   context "inside EC2" do
-    WebMock.allow_net_connect!
+    before(:each) { WebMock.allow_net_connect! }
+    after(:each) { WebMock.disable_net_connect! }
+
     let(:aws) { MovableInk::AWS.new }
     let(:ec2) { Aws::EC2::Client.new(stub_responses: true) }
     let(:tag_data) { ec2.stub_data(:describe_tags, tags: [
@@ -386,6 +394,36 @@ describe MovableInk::AWS::EC2 do
         }]
       }
 
+      let(:consul_kubernetes_service_instances) do
+        [
+          {
+            "Node": {
+              "ID": "",
+              "Node": "k8s-sync",
+              "Address": "127.0.0.1",
+              "Datacenter": "my_datacenter",
+              "TaggedAddresses": nil,
+              "Meta": {
+                "external-source": "kubernetes",
+                "CreateIndex": 987654321,
+                "ModifyIndex": 123456789,
+              }
+            },
+            "Service": {
+              "ID": "pod-name-ac8f920827af",
+              "Service": "kubernetes-service-name",
+              "Tags": ["k8s"],
+              "Address": "10.0.0.1",
+              "Port": 8080,
+              "Meta": {
+                "external-source": "kubernetes",
+                "external-k8s-ns": "default",
+              }
+            }
+          }
+        ]
+      end
+
       before(:each) do
         allow(aws).to receive(:mi_env).and_return('test')
         allow(aws).to receive(:availability_zone).and_return(my_availability_zone)
@@ -397,10 +435,6 @@ describe MovableInk::AWS::EC2 do
         expect{ aws.instances(role: nil, discovery_type: 'consul') }.to raise_error(MovableInk::AWS::Errors::RoleNameRequiredError)
       end
 
-      it "returns an error if an invalid role is passed" do
-        expect{ aws.instances(role: 'asset_proxy', discovery_type: 'consul') }.to raise_error(MovableInk::AWS::Errors::RoleNameInvalidError)
-      end
-
       it "returns all instances matching a consul service" do
         miaws = double(MovableInk::AWS)
         allow(miaws).to receive(:my_region).and_return('us-east-1')
@@ -449,6 +483,33 @@ 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'])
       end
+
+      it "returns backends that are synced from consul-k8s" do
+        miaws = double(MovableInk::AWS)
+        allow(miaws).to receive(:my_region).and_return('us-east-1')
+
+        json = JSON.generate(consul_kubernetes_service_instances)
+        stub_request(:get, "https://localhost:8501/v1/health/service/kubernetes-service-name?cached&dc=#{my_datacenter}&passing&stale")
+          .with({
+            headers: {
+              'Accept'=>'*/*',
+              'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'User-Agent'=>'Faraday v1.0.1'
+            }
+          })
+          .to_return(status: 200, body: json, headers: {})
+
+         resp_instances = aws.instances(role: 'kubernetes-service-name', discovery_type: 'consul')
+         backend = resp_instances.first
+         name_tag = backend.tags.find {|t| t[:key] == 'Name' }
+         roles_tag = backend.tags.find {|t| t[:key] == 'mi:roles' }
+
+         expect(name_tag[:value]).to eq('pod-name-ac8f920827af')
+         expect(roles_tag[:value]).to eq('kubernetes-service-name')
+         expect(backend.instance_id).to eq(nil)
+         expect(backend.private_ip_address).to eq('10.0.0.1')
+         expect(backend.private_ip_address).to eq('10.0.0.1')
+      end
     end
 
     context "ordered roles" do

data/spec/metadata_spec.rb

@@ -1,20 +1,25 @@
 require_relative '../lib/movable_ink/aws'
+require 'webmock/rspec'
 
 describe MovableInk::AWS::Metadata do
+  before(:each) do
+    allow_any_instance_of(MovableInk::AWS).to receive(:sleep).and_return(true)
+  end
+
   context 'outside ec2' do
-    it 'should raise an error if EC2 is required' do
+    it 'should raise an error if the metadata service times out' do
       aws = MovableInk::AWS.new
-      allow(aws).to receive(:retrieve_metadata).with('instance-id').and_return("")
-      allow(aws).to receive(:retrieve_metadata).with('placement/availability-zone').and_return("")
-
-      expect{ aws.instance_id }.to raise_error(MovableInk::AWS::Errors::EC2Required)
-      expect{ aws.availability_zone }.to raise_error(MovableInk::AWS::Errors::EC2Required)
+      # 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)
+      expect{ aws.instance_id }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
+      expect{ aws.availability_zone }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
 
     it 'should raise an error if trying to load private_ipv4 outside of EC2' do
       aws = MovableInk::AWS.new
-      allow(aws).to receive(:retrieve_metadata).with('local-ipv4').and_return('')
-      expect{ aws.private_ipv4 }.to raise_error(MovableInk::AWS::Errors::EC2Required)
+      # 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)
+      expect{ aws.private_ipv4 }.to raise_error(MovableInk::AWS::Errors::MetadataTimeout)
     end
   end
 

data/spec/sns_spec.rb

@@ -47,7 +47,7 @@ describe MovableInk::AWS::SNS do
     allow(aws).to receive(:sns).and_return(sns)
     allow(aws).to receive(:private_ipv4).and_return('10.0.0.1')
 
-    expect(aws.notify_pagerduty(region: 'us-east-1', instance_id: 'i-987654321').message_id).to eq('messageId')
+    expect(aws.send_alert(summary: 'Something bad happened', dedup_key: 'i-987654321').message_id).to eq('messageId')
   end
 
   it "should truncate subjects longer than 100 characters" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -227,7 +227,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/pr-lint.yaml"
-- ".travis.yml"
+- ".github/workflows/test.yaml"
 - Gemfile
 - Gemfile.lock
 - MovableInkAWS.gemspec
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: AWS Utility methods for MovableInk

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6
-
-bundler_args: "--retry=3"
-
-script:
-  - rspec spec/
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: NAHVFo9MwOnAYhq1NzZz22/2p34Iw/L71ZNt2WHSbWuMVnA/xyvVu7Ja/S25aQmaV/btNkxTYtbJbf83QZTO9/IwkashWFcWJtLiptZkBRdpkiunMPWX9Gw3Ap5fODUIPxLFyLYWd53huNBJppBCVQTUPwkLEcWJcQZP4MU7dkhW5QKdQgmyNTlMy8epxyMqCQe7V0n98LCwreUsHxHMToe6/V0FemysjYjpnyNvcFpGFa9kf28VQw8ZpDR0iobw9hg6qs61Xj69Y3ns9fWI3sdnk8VjY29M+V415/ksyn7kzCjYiQsGGCFerzjMffIt/4PXqX81GRvcymxmpXWwtikJYP95kiHYbLGFUNS5GJngbyVgO5+amjx7vSZfaBGSXcUCSkxLV1Ki4QfMYnA4ihogwTdQhIALSEV9GzOfFt147lUok2LgZDzNfn9nCPL+qKMBNaBRe7/YoWGuvLQG/smYjunPYhis0ynAQ1Sytc7lgtbdEtLFzfET87ITVS4Y2F9TQ+z1fxROAn/YwMmdSPyiaXVLEOIUc/gx0BjJneTl43M4l6ZId8Q6maJTNG2Fd0yK0hwLJcsN/257HbnPEiTTgkXBcg58E6/ABfZqwDnJrP3sQPem85M4BxLJIPUvfBkYzyeAEV+ALYDJx+KLaqYCCgavF9M+41VbkkNZyKU=
-  gem: MovableInkAWS
-  on:
-    tags: true
-    repo: movableink/awslib