MovableInkAWS 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d186d81b84022427ded3829a3fdbff164a3b683aaa9156d2eca326021961628d
-  data.tar.gz: '09ab0a5e2e503c6e86b200d9113288c53b687e27346ee7da434833fe6b048ca6'
+  metadata.gz: fe536c901487ed0196cb22c0c03dc62850aeb11ae503b467cd0be73caeacff04
+  data.tar.gz: bdc29c62402c6199ffb2ae84064013ef894fca69f5bd91ea517bd78288e7fabb
 SHA512:
-  metadata.gz: f55481a7fb36fe5305f5aff741a21455de3891bf882788af848fbd8c27bea203a720da9840eb7ff4477f2b8629d3828ae57ca172c4672b3fafa40fdce200df49
-  data.tar.gz: f899220d2d7a0dd219b1f96f7b7efd68dbbc1ff59e330c0296b8d418315f67fcfa760726be6cb5bfc1a7bb536cbe7dc1dfaa81b97599847b52aeb417fd5227cd
+  metadata.gz: ccde77e086f1787390314059aa32b11836cefd854518481afbd09ce198da9258c60eb0ed91e075b87fc70bac1fcd9ecb77b0d649c1c1bf90ec9f108becabd9bc
+  data.tar.gz: 682c1979026eb42cdfaa570be510c855412797d1e0ff41e20f644a6486cb27d96488dc34f1c465dd02de0d815f33f4ccd35ef42bf4289b797f182116cb68ab4a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.0.4)
+    MovableInkAWS (1.0.6)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-core (~> 3)
@@ -18,7 +18,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.236.0)
+    aws-partitions (1.238.0)
     aws-sdk-athena (1.21.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)

data/lib/movable_ink/aws/ec2.rb

@@ -67,9 +67,9 @@ module MovableInk
 
       def instance_id
         @instance_id ||= begin
-          az = `ec2metadata --instance-id 2>/dev/null`.chomp
-          raise(MovableInk::AWS::Errors::EC2Required) if az.empty?
-          az
+          id = `ec2metadata --instance-id 2>/dev/null`.chomp
+          raise(MovableInk::AWS::Errors::EC2Required) if id.empty?
+          id
         end
       end
 
@@ -90,7 +90,7 @@ module MovableInk
       end
 
       def me
-        @me ||= all_instances.select{|instance| instance.instance_id == instance_id}
+        @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)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.0.4'
+    VERSION = '1.0.6'
   end
 end

data/spec/ec2_spec.rb

@@ -19,6 +19,11 @@ describe MovableInk::AWS::EC2 do
       aws = MovableInk::AWS.new(environment: 'test')
       expect(aws.mi_env).to eq('test')
     end
+
+    it "should not find a 'me'" do
+      aws = MovableInk::AWS.new
+      expect(aws.me).to eq(nil)
+    end
   end
 
   context "inside EC2" do
@@ -170,6 +175,7 @@ describe MovableInk::AWS::EC2 do
                 value: 'app, app_db_replica'
               }
             ],
+            instance_id: 'i-12345',
             private_ip_address: '10.0.0.1',
             placement: {
               availability_zone: my_availability_zone
@@ -186,6 +192,7 @@ describe MovableInk::AWS::EC2 do
                 value: 'app_db_replica,db'
               }
             ],
+            instance_id: 'i-54321',
             private_ip_address: '10.0.0.2',
             placement: {
               availability_zone: other_availability_zone
@@ -202,6 +209,7 @@ describe MovableInk::AWS::EC2 do
                 value: 'app_db, db'
               }
             ],
+            instance_id: 'i-123abc',
             private_ip_address: '10.0.0.3',
             placement: {
               availability_zone: other_availability_zone
@@ -218,6 +226,7 @@ describe MovableInk::AWS::EC2 do
                 value: 'app_db_replica'
               }
             ],
+            instance_id: 'i-zyx987',
             private_ip_address: '10.0.0.4',
             placement: {
               availability_zone: other_availability_zone
@@ -226,38 +235,34 @@ describe MovableInk::AWS::EC2 do
         ]])
       }
 
-      it "returns all instances matching a role" do
+      before(:each) 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)
+      end
 
-        instances = aws.instances(role: 'app_db_replica')
-        expect(instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance2', 'instance4'])
+      it "finds me" do
+        allow(aws).to receive(:instance_id).and_return('i-12345')
 
-        instances = aws.instances(role: 'db')
-        expect(instances.map{|i| i.tags.first.value }).to eq(['instance2', 'instance3'])
+        expect(aws.me.instance_id).to eq('i-12345')
       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)
+      it "returns all instances matching a role" do
+        app_db_replica_instances = aws.instances(role: 'app_db_replica')
+        expect(app_db_replica_instances.map{|i| i.tags.first.value }).to eq(['instance1', 'instance2', 'instance4'])
+
+        db_instances = aws.instances(role: 'db')
+        expect(db_instances.map{|i| i.tags.first.value }).to eq(['instance2', 'instance3'])
+      end
 
+      it "returns roles with exactly the specified role" 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core