MovableInkAWS 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c6b935514942f31b17b7c3bad0c8e0a856eb3586b977c20a6721ddd6623b8a
-  data.tar.gz: 63144d8ef0655a3df7a5f5768624f2500964a213529de972b286b16d63cc901e
+  metadata.gz: ffffe0e3ef8632871ef9a8645fab2a8072c85d8817e54cde4a8d4770c753b7f0
+  data.tar.gz: d78f852f878caa5c95297b912abe05b34fe66e3fa9cc69d4954b7c917d6a4b3b
 SHA512:
-  metadata.gz: 430fd3b181252e7c3bc538afd4a621ae8a0ec39e98b2329d03266ccbd06d787f91f2065ba9a68ce09b6b45e79cb8f275fec29e367f056d9296e7d0d1dd345ba9
-  data.tar.gz: 28e155f91856f6bc291aa253cc2c35aa259cf941c7290dda27fd917f8139bc0adbf4e45aa452057ebc817e4ae743a5a1ba10770b1496e6807e92d92655176b55
+  metadata.gz: c959b4ed5ca462caf9361beb0ec318850e7a9f5de62ae4677fcea556ed062d31be68cdf98cde6f73a2fb6cf9139c9707cf9fb7003a57ee2e6c9d3d43a1ff417c
+  data.tar.gz: 9d74aaee3fa45e84ae18fc7a2e837a494b866766feaf827f51dc0c782781ed1d3ce9b860492610d017a6d7c1fdda2a5e04137aba93afb0222098197b66fc424c

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.3.0)
+    MovableInkAWS (0.3.3)
       aws-sdk (= 2.11.240)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.2)
+    aws-eventstream (1.0.3)
     aws-sdk (2.11.240)
       aws-sdk-resources (= 2.11.240)
     aws-sdk-core (2.11.240)

data/lib/movable_ink/aws/ec2.rb

@@ -94,15 +94,13 @@ module MovableInk
       end
 
       def instances(role:, region: my_region, availability_zone: nil)
-        role_pattern = mi_env == 'production' ? "^#{role}$" : "^*#{role}*$"
-        role_pattern = role_pattern.gsub('**','*').gsub('*','.*')
         instances = all_instances(region: region).select { |instance|
-          instance.tags.detect { |tag|
-            tag.key == 'mi:roles'&&
-              Regexp.new(role_pattern).match(tag.value) &&
-              !tag.value.include?('decommissioned')
+          instance.tags.select{ |tag| tag.key == 'mi:roles' }.detect { |tag|
+            roles = tag.value.split(/\s*,\s*/)
+            roles.include?(role) && !roles.include?('decommissioned')
           }
         }
+
         if availability_zone
           instances.select { |instance|
             instance.placement.availability_zone == availability_zone

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/spec/ec2_spec.rb

@@ -144,6 +144,77 @@ describe MovableInk::AWS::EC2 do
       end
     end
 
+    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: [
+          {
+            tags: [
+              {
+                key: 'mi:name',
+                value: 'instance1'
+              },
+              {
+                key: 'mi:roles',
+                value: 'app, app_db_replica'
+              }
+            ],
+            private_ip_address: '10.0.0.1',
+            placement: {
+              availability_zone: my_availability_zone
+            }
+          },
+          {
+            tags: [
+              {
+                key: 'mi:name',
+                value: 'instance2'
+              },
+              {
+                key: 'mi:roles',
+                value: 'app_db_replica,db'
+              }
+            ],
+            private_ip_address: '10.0.0.2',
+            placement: {
+              availability_zone: other_availability_zone
+            }
+          },
+          {
+            tags: [
+              {
+                key: 'mi:name',
+                value: 'instance3'
+              },
+              {
+                key: 'mi:roles',
+                value: 'app_db, db'
+              }
+            ],
+            private_ip_address: '10.0.0.2',
+            placement: {
+              availability_zone: other_availability_zone
+            }
+          }
+        ]])
+      }
+
+      it "returns all instances matching a 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')
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance2'])
+
+        instances = aws.instances(role: 'db')
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance2', 'instance3'])
+      end
+    end
+
     context "ordered roles" do
       let(:my_availability_zone) { 'us-east-1a' }
       let(:other_availability_zone) { 'us-east-1b' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk