MovableInkAWS 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b350dcc6432c0f218c528e9779bde52cfc535e605529a0513c05b02e605e396
-  data.tar.gz: 7197977f915549ff7c19623a446fd05c24768bf2773a72851e8cd98bcc619ec8
+  metadata.gz: c67a1debb22324f3f567c390c5a5baf61c714b56567712dd6269dd044b2ed9dd
+  data.tar.gz: 9b02840d52d5ee4a4f99060ec274f9938617247e1df9468efbb352fb2ff2285f
 SHA512:
-  metadata.gz: 9f6130a4a62193455450492c46fa1efde90b8b96c912637550bbc6797ed5fc45b28517295ed624f5668d3ea9efd19a3bc7e90c4afea8a6ab7699507ce38961c1
-  data.tar.gz: 363122ff9d3f11c9d04def581a25251139efdf7b2cb3d1c29ca2cc22d43622b2fda5731ff235016e5f0855ffb78becfb41294bd57f424982f349d051a8ae868e
+  metadata.gz: f547de79011e7fc83bb33db7d905da20c55d8a5308ef6e539193bfabacbcf1a5f0cde3a417ec454b6c24f0361ec1bef5b0d05ebbba5730f1cc5427643be28550
+  data.tar.gz: 87ad9c72f123ef2e70d3ff35d89eeef5dac3948144668e88554de402eff5b71e733144d2d7dc9fd51473662a3e36fc479525c1ff01a63ac0d34c1046d1d2d2c7

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 
 rvm:
-  - 2.2
+  - 2.5
+  - 2.6
 
 bundler_args: "--retry=3"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.0.13)
+    MovableInkAWS (1.0.18)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -19,48 +19,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.3)
-    aws-partitions (1.280.0)
-    aws-sdk-athena (1.22.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.322.0)
+    aws-sdk-athena (1.26.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.32.0)
+    aws-sdk-autoscaling (1.37.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.33.0)
+    aws-sdk-cloudwatch (1.38.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.90.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sdk-core (3.97.0)
+      aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.147.0)
+    aws-sdk-ec2 (1.164.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.29.0)
+    aws-sdk-elasticache (1.35.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.29.0)
+    aws-sdk-kms (1.32.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.78.0)
+    aws-sdk-rds (1.85.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.30.0)
+    aws-sdk-route53 (1.35.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.67.0)
+      aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.21.0)
+    aws-sdk-sns (1.24.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.71.0)
+    aws-sdk-ssm (1.79.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)
@@ -69,7 +69,7 @@ GEM
     jmespath (1.4.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -93,4 +93,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/movable_ink/aws.rb

@@ -59,6 +59,7 @@ module MovableInk
           return yield
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
+               Aws::EC2::Errors::Unavailable,
                Aws::SNS::Errors::ThrottledException,
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,
@@ -76,12 +77,15 @@ module MovableInk
             notify_and_sleep(sleep_time, $!.class)
           end
         rescue Aws::Errors::ServiceError => e
-          message = "#{e.class}: #{e.message}\nFrom `#{e.backtrace.last.gsub("`","'")}`"
+          message = "#{e.class}: #{e.message}\nFrom #{$0}\n```\n#{e.backtrace.first(3).join("\n").gsub("`","'")}\n```"
           notify_slack(subject: 'Unhandled AWS API Error', message: message)
           puts message
           raise MovableInk::AWS::Errors::ServiceError
         end
       end
+      message = "From: #{$0}\n```\n#{Thread.current.backtrace.first(3).join("\n").gsub("`","'")}\n```"
+      notify_slack(subject: "AWS API failed after #{tries} attempts", message: message)
+      puts message
       raise MovableInk::AWS::Errors::FailedWithBackoff
     end
 

data/lib/movable_ink/aws/ec2.rb

@@ -29,23 +29,12 @@ module MovableInk
         raise MovableInk::AWS::Errors::NoEnvironmentTagError
       end
 
-      def thopter_filter
-        [{
-          name: 'tag:mi:roles',
-          values: ['*thopter*']
-        },
-        {
-          name: 'tag:mi:env',
-          values: [mi_env]
-        },
-        {
-          name: 'instance-state-name',
-          values: ['running']
-        }]
-      end
-
       def thopter_instance
-        @thopter_instance ||= load_all_instances('us-east-1', filter: thopter_filter)
+        @thopter_instance ||= all_instances(region: 'us-east-1').select do |instance|
+          instance.tags.select{ |tag| tag.key == 'mi:roles' }.detect do |tag|
+            tag.value.include?('thopter')
+          end
+        end
       end
 
       def all_instances(region: my_region, no_filter: false)
@@ -102,18 +91,27 @@ module MovableInk
         @me ||= all_instances.select{|instance| instance.instance_id == instance_id}.first rescue nil
       end
 
-      def instances(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false)
-        instances = all_instances(region: region).select { |instance|
-          instance.tags.select{ |tag| tag.key == 'mi:roles' }.detect { |tag|
-            roles = tag.value.split(/\s*,\s*/)
-            if exact_match
-              roles == [role]
-            else
-              exclude_roles.push('decommissioned')
-              roles.include?(role) && !roles.any? { |role| exclude_roles.include?(role) }
-            end
+      def instances(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false, use_cache: true)
+        roles = role.split(/\s*,\s*/)
+        if use_cache == false
+          filter = default_filter.push({
+            name: 'tag:mi:roles',
+            values: roles
+          })
+          instances = load_all_instances(my_region, filter: filter)
+        else
+          instances = all_instances(region: region).select { |instance|
+            instance.tags.select{ |tag| tag.key == 'mi:roles' }.detect { |tag|
+              tag_roles = tag.value.split(/\s*,\s*/)
+              if exact_match
+                tag_roles == roles
+              else
+                exclude_roles.push('decommissioned')
+                tag_roles.any? { |tag_role| roles.include?(tag_role) } && !tag_roles.any? { |role| exclude_roles.include?(role) }
+              end
+            }
           }
-        }
+        end
 
         if availability_zone
           instances.select { |instance|
@@ -129,15 +127,15 @@ module MovableInk
       end
 
       def statsd_host
-        instance_ip_addresses_by_role(role: 'statsd', availability_zone: availability_zone).sample
+        instance_ip_addresses_by_role(role: 'statsd', availability_zone: availability_zone, use_cache: false).sample
       end
 
       def private_ip_addresses(instances)
         instances.map(&:private_ip_address)
       end
 
-      def instance_ip_addresses_by_role(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false)
-        private_ip_addresses(instances(role: role, exclude_roles: exclude_roles, region: region, availability_zone: availability_zone, exact_match: exact_match))
+      def instance_ip_addresses_by_role(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false, use_cache: true)
+        private_ip_addresses(instances(role: role, exclude_roles: exclude_roles, region: region, availability_zone: availability_zone, exact_match: exact_match, use_cache: use_cache))
       end
 
       def instance_ip_addresses_by_role_ordered(role:, exclude_roles: [], region: my_region, exact_match: false)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.0.13'
+    VERSION = '1.0.18'
   end
 end

data/spec/aws_spec.rb

@@ -42,9 +42,9 @@ describe MovableInk::AWS do
         ec2 = Aws::EC2::Client.new(stub_responses: true)
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
-        expect(aws).to receive(:notify_slack).exactly(9).times
+        expect(aws).to receive(:notify_slack).exactly(10).times
         expect(aws).to receive(:sleep).exactly(9).times.and_return(true)
-        expect(STDOUT).to receive(:puts).exactly(9).times
+        expect(STDOUT).to receive(:puts).exactly(10).times
 
         aws.run_with_backoff { ec2.describe_instances } rescue nil
       end
@@ -64,9 +64,9 @@ describe MovableInk::AWS do
         ec2 = Aws::EC2::Client.new(stub_responses: true)
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
-        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(aws).to receive(:notify_slack).exactly(2).times
         expect(aws).to receive(:sleep).exactly(9).times.and_return(true)
-        expect(STDOUT).to receive(:puts).exactly(1).times
+        expect(STDOUT).to receive(:puts).exactly(2).times
 
         aws.run_with_backoff(quiet: true) { ec2.describe_instances } rescue nil
       end
@@ -77,6 +77,8 @@ describe MovableInk::AWS do
         ec2.stub_responses(:describe_instances, 'RequestLimitExceeded')
 
         expect(aws).to receive(:notify_and_sleep).exactly(9).times
+        expect(aws).to receive(:notify_slack).exactly(1).times
+        expect(STDOUT).to receive(:puts).exactly(1).times
         expect{ aws.run_with_backoff { ec2.describe_instances } }.to raise_error(MovableInk::AWS::Errors::FailedWithBackoff)
       end
     end

data/spec/ec2_spec.rb

@@ -153,18 +153,6 @@ describe MovableInk::AWS::EC2 do
               availability_zone: availability_zone
             }
           },
-          {
-            tags: [
-              {
-                key: 'mi:roles',
-                value: 'something_else'
-              }
-            ],
-            private_ip_address: '10.0.0.3',
-            placement: {
-              availability_zone: availability_zone
-            }
-          }
         ]])
       }
 
@@ -183,8 +171,8 @@ describe MovableInk::AWS::EC2 do
     context "instances" do
       let(:my_availability_zone) { 'us-east-1a' }
       let(:other_availability_zone) { 'us-east-1b' }
-      let(:instance_data) { ec2.stub_data(:describe_instances, reservations: [
-        instances: [
+      let(:instances) {
+        [
           {
             tags: [
               {
@@ -252,12 +240,54 @@ describe MovableInk::AWS::EC2 do
             placement: {
               availability_zone: other_availability_zone
             }
+          },
+          {
+            tags: [
+              {
+                key: 'mi:name',
+                value: 'instance5'
+              },
+              {
+                key: 'mi:roles',
+                value: 'app_db'
+              }
+            ],
+            instance_id: 'i-321cba',
+            private_ip_address: '10.0.0.5',
+            placement: {
+              availability_zone: other_availability_zone
+            }
           }
-        ]])
+        ]
+      }
+      let(:single_role_instance_data) { ec2.stub_data(:describe_instances, reservations: [
+        instances: instances.select { |instance|
+          instance[:tags].detect { |tag| tag[:key] == 'mi:roles' && tag[:value] == 'app_db_replica' }
+        }
+      ])}
+      let(:multi_role_instance_data) { ec2.stub_data(:describe_instances, reservations: [
+        instances: instances.select { |instance|
+          instance[:tags].detect { |tag|
+            tag[:key] == 'mi:roles' && ['app_db', 'app_db_replica'].any?(tag[:value])
+          }
+        }
+      ])}
+      let(:all_roles_instance_data) { ec2.stub_data(:describe_instances, reservations: [ instances: instances ])
       }
 
       before(:each) do
-        ec2.stub_responses(:describe_instances, instance_data)
+        ec2.stub_responses(:describe_instances, -> (context) {
+          if (context.params[:filters].length == 2)
+            all_roles_instance_data
+          else
+            role_filter = context.params[:filters].detect { |filter| filter[:name] == 'tag:mi:roles' }
+            if role_filter[:values].length == 1
+              single_role_instance_data
+            else
+              multi_role_instance_data
+            end
+          end
+        })
         allow(aws).to receive(:mi_env).and_return('test')
         allow(aws).to receive(:availability_zone).and_return(my_availability_zone)
         allow(aws).to receive(:my_region).and_return('us-east-1')
@@ -283,6 +313,16 @@ describe MovableInk::AWS::EC2 do
         expect(instances.map{|i| i.tags.first.value }).to eq(['instance4'])
       end
 
+      it "returns roles with exactly the specified role, letting the API to the filtering" do
+        instances = aws.instances(role: 'app_db_replica', use_cache: false)
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance4'])
+      end
+
+      it "returns roles with any of the specified roles, letting the API to the filtering" do
+        instances = aws.instances(role: 'app_db,app_db_replica', use_cache: false)
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance4', 'instance5'])
+      end
+
       it "excludes requested roles" do
         instances = aws.instances(role: 'app_db_replica', exclude_roles: ['db'])
         expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance4'])

data/spec/ssm_spec.rb

@@ -82,6 +82,8 @@ describe MovableInk::AWS::SSM do
       allow(aws).to receive(:ssm_client).and_return(1)
       allow(aws).to receive(:ssm_client_failover).and_return(2)
       allow(aws).to receive(:notify_and_sleep).and_return(nil)
+      allow(aws).to receive(:notify_slack).and_return(nil)
+      allow(STDOUT).to receive(:puts).and_return(nil)
 
       results = []
       calls = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core