MovableInkAWS 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a003b444c6b5e150a6420624b2a52de2484738d4cce518081435bce1051dabe
-  data.tar.gz: 5fd9b8e1f6954aa4b3031c7a7fe808bfa158c698e0f16f5c23f6a00e64f9cfb0
+  metadata.gz: 1563396dc437243706adf250a3ab303f3e089c20d37b96f2e46e84389a099513
+  data.tar.gz: f59d9ad7bbea43ac3b2b18b1bf2fc6524aa0088bdfbe97e673dcfdb2bb548676
 SHA512:
-  metadata.gz: baa941aa3b93e8fefe7fd7be692551e85b8de4f58c3d3b5e720305066ed34f7d867481f5e82ed42b60b5a611f78fae5c80496825683c528de641c9594f3c3c91
-  data.tar.gz: 43e9683d74acebb93296b42f8bc83c208d805a39ba4e4b87182ad0c25d669687589380d81219bd90a9a0620abbfb77979e4fa7def095768fc2c5cca7d8a14ac4
+  metadata.gz: fa44c9970ef0d0522c38c4af1824545f812ea0c2d5f796ae43d328539afe4e4a2ecdc3074925d6a68637a19c9162e600b9b2896e8812a806e0ef85e9f96d515a
+  data.tar.gz: 2f54162fa8a88a9293cacd11281d999e9f36e885f34389fe90349de5ddb173d4ff6f052e3f940878d98eb30a62c0f469ca54339908b0583555ae4c530262ffcf

data/Gemfile.lock

@@ -1,8 +1,10 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.3.5)
+    MovableInkAWS (0.5.0)
       aws-sdk (= 2.11.240)
+      aws-sigv4 (~> 1.1)
+      httparty (= 0.16.3)
 
 GEM
   remote: https://rubygems.org/
@@ -18,7 +20,14 @@ GEM
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     diff-lcs (1.3)
+    httparty (0.16.3)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
     jmespath (1.4.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    multi_xml (0.6.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -41,4 +50,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/lib/movable_ink/aws/ec2.rb

@@ -91,14 +91,15 @@ module MovableInk
         @me ||= all_instances.select{|instance| instance.instance_id == instance_id}
       end
 
-      def instances(role:, region: my_region, availability_zone: nil, exact_match: false)
+      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
-              roles.include?(role) && !roles.include?('decommissioned')
+              exclude_roles.push('decommissioned')
+              roles.include?(role) && !roles.any? { |role| exclude_roles.include?(role) }
             end
           }
         }
@@ -124,12 +125,12 @@ module MovableInk
         instances.map(&:private_ip_address)
       end
 
-      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))
+      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))
       end
 
-      def instance_ip_addresses_by_role_ordered(role:, region: my_region, exact_match: false)
-        instances = instances(role: role, region: region, exact_match: exact_match)
+      def instance_ip_addresses_by_role_ordered(role:, exclude_roles: [], region: my_region, exact_match: false)
+        instances = instances(role: role, exclude_roles: exclude_roles, 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.4.0'
+    VERSION = '0.5.0'
   end
 end

data/spec/ec2_spec.rb

@@ -250,6 +250,17 @@ describe MovableInk::AWS::EC2 do
         instances = aws.instances(role: 'app_db_replica', exact_match: true)
         expect(instances.map{|i| i.tags.first.value }).to eq(['instance4'])
       end
+
+      it "excludes requested roles" 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', exclude_roles: ['db'])
+        expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', '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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk