MovableInkAWS 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85b7a7cacd3d56c98e276a780730187b57d96beea4197e972858e093ff8b5b6
-  data.tar.gz: 0edf31bf91bbc3498f2336df122eaa70631b2e4d62c4b3dbc373365dea9b4209
+  metadata.gz: ac88eb29fbafb05b27ad196f6308d5184b38d9220f6213d38965915b22505c76
+  data.tar.gz: 36df30eeaeb57db6f742d95819266d902b9ea118f14ca56c685ffba62a4172b5
 SHA512:
-  metadata.gz: 5834796db467a574a0ce7f9cb88c6bb1f6995ebb54292d543881c23884de2733ff41a1729fa49e0d40056e89959e49e84e6347bb1ecaaea1ee718f54ad039f3e
-  data.tar.gz: 8ced1573db88a51ded5905888e01bac2a606dbffb1811e2dbd9ea5c230872711febc0867f5ba4380c8fd45d7c51dc9f87c4e5064c9d1c5c10532e38b89e6642c
+  metadata.gz: 6d1df5299ea1db3985f1747779ac4b626605880062286c8b97872485cd8d1c848b18c06d2f09ec223c670c6c6ec674a60c93951c6299f0495ed5b919ec849cf4
+  data.tar.gz: 509c3fe4f8257378bf70a816b3c9631141aa8d7b36ece74ee5dcafbb5006f1b76b7b2b9465331017ab1836f19a0f2c0231686bc37216bb99940a538b75953ab5

data/lib/movable_ink/aws/ec2.rb

@@ -91,11 +91,15 @@ module MovableInk
         @me ||= all_instances.select{|instance| instance.instance_id == instance_id}
       end
 
-      def instances(role:, region: my_region, availability_zone: nil)
+      def instances(role:, 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*/)
-            roles.include?(role) && !roles.include?('decommissioned')
+            if exact_match
+              roles == [role]
+            else
+              roles.include?(role) && !roles.include?('decommissioned')
+            end
           }
         }
 
@@ -120,12 +124,12 @@ module MovableInk
         instances.map(&:private_ip_address)
       end
 
-      def instance_ip_addresses_by_role(role:, region: my_region, availability_zone: nil)
-        private_ip_addresses(instances(role: role, region: region, availability_zone: availability_zone))
+      def instance_ip_addresses_by_role(role:, region: my_region, availability_zone: nil, exact_match: false)
+        private_ip_addresses(instances(role: role, region: region, availability_zone: availability_zone, exact_match: exact_match))
       end
 
-      def instance_ip_addresses_by_role_ordered(role:, region: my_region)
-        instances = instances(role: role, region: region)
+      def instance_ip_addresses_by_role_ordered(role:, region: my_region, exact_match: false)
+        instances = instances(role: role, region: region, exact_match: exact_match)
         instances_in_my_az = instances.select { |instance| instance.placement.availability_zone == availability_zone }
         ordered_instances = instances_in_my_az.shuffle + (instances - instances_in_my_az).shuffle
         private_ip_addresses(ordered_instances)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

data/spec/ec2_spec.rb

@@ -202,7 +202,23 @@ describe MovableInk::AWS::EC2 do
                 value: 'app_db, db'
               }
             ],
-            private_ip_address: '10.0.0.2',
+            private_ip_address: '10.0.0.3',
+            placement: {
+              availability_zone: other_availability_zone
+            }
+          },
+          {
+            tags: [
+              {
+                key: 'mi:name',
+                value: 'instance4'
+              },
+              {
+                key: 'mi:roles',
+                value: 'app_db_replica'
+              }
+            ],
+            private_ip_address: '10.0.0.4',
             placement: {
               availability_zone: other_availability_zone
             }
@@ -218,11 +234,22 @@ describe MovableInk::AWS::EC2 do
         allow(aws).to receive(:ec2).and_return(ec2)
 
         instances = aws.instances(role: 'app_db_replica')
-        expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance2'])
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance2', 'instance4'])
 
         instances = aws.instances(role: 'db')
         expect(instances.map{|i| i.tags.first.value }).to eq(['instance2', 'instance3'])
       end
+
+      it "returns roles with exactly the specified role" do
+        ec2.stub_responses(:describe_instances, instance_data)
+        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')
+        allow(aws).to receive(:ec2).and_return(ec2)
+
+        instances = aws.instances(role: 'app_db_replica', exact_match: true)
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance4'])
+      end
     end
 
     context "ordered roles" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk