MovableInkAWS 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8da5fcf1d95cc4642ae47bc180040671d9baeb9bbabb3c92bdf8c7a1a387b33b
-  data.tar.gz: ebb0966bf640735e8e5d2e2b0903ac246a8e61f85eb3f21a2950afd935ca338d
+  metadata.gz: 4563a27230a7711f44768ef561751a2366e03195de236dfb18a29bbff559c78b
+  data.tar.gz: b42568ac0c14f98d09420d4c2819b58eb047be5c31ca9a2e576c61685f69445b
 SHA512:
-  metadata.gz: 635c4fe35a5c3bb404ec5ea1621345a5dca26bb8e85a911e772ad2420cbd6469a0ac896a1311f4f86326948fc25298d006981451521df244333d50d2654c82b1
-  data.tar.gz: af18dbf13eab9fc4b06a3006c593289f7a6323afc779e08fe881f6b3e93a2ce76a0091ef36855653e848b17887d369745750c9d857085ea4816d6070e6b62053
+  metadata.gz: e9d9d52abbe8c75ce57a6cbd4165ea5188341106c4cf79cdc49fb96b9eda8db2b1e2216b948c750867c6333a9d29c682ef12084fd75186619b29d435606a99b7
+  data.tar.gz: c956e15226b703d33fdf7d74b367dac8259106cea459f5ca00ddfbe7fd05b17ccca18bdee22bde39c697370c7fb33ddd1ddf6210141efeea329f35b23f0a95c8

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.16)
+    MovableInkAWS (1.0.17)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -21,46 +21,46 @@ GEM
   specs:
     aws-eventstream (1.1.0)
     aws-partitions (1.322.0)
-    aws-sdk-athena (1.25.0)
+    aws-sdk-athena (1.26.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.36.0)
+    aws-sdk-autoscaling (1.37.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.37.0)
+    aws-sdk-cloudwatch (1.38.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.96.1)
+    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.163.0)
+    aws-sdk-ec2 (1.164.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.34.0)
+    aws-sdk-elasticache (1.35.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.31.0)
+    aws-sdk-kms (1.32.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.84.0)
+    aws-sdk-rds (1.85.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.34.0)
+    aws-sdk-route53 (1.35.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.66.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.23.0)
+    aws-sdk-sns (1.24.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.78.0)
+    aws-sdk-ssm (1.79.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)

data/lib/movable_ink/aws/ec2.rb

@@ -91,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|

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.0.16'
+    VERSION = '1.0.17'
   end
 end

data/spec/ec2_spec.rb

@@ -183,8 +183,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 +252,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 +325,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'])

metadata

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