MovableInkAWS 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffffe0e3ef8632871ef9a8645fab2a8072c85d8817e54cde4a8d4770c753b7f0
-  data.tar.gz: d78f852f878caa5c95297b912abe05b34fe66e3fa9cc69d4954b7c917d6a4b3b
+  metadata.gz: f85b7a7cacd3d56c98e276a780730187b57d96beea4197e972858e093ff8b5b6
+  data.tar.gz: 0edf31bf91bbc3498f2336df122eaa70631b2e4d62c4b3dbc373365dea9b4209
 SHA512:
-  metadata.gz: c959b4ed5ca462caf9361beb0ec318850e7a9f5de62ae4677fcea556ed062d31be68cdf98cde6f73a2fb6cf9139c9707cf9fb7003a57ee2e6c9d3d43a1ff417c
-  data.tar.gz: 9d74aaee3fa45e84ae18fc7a2e837a494b866766feaf827f51dc0c782781ed1d3ce9b860492610d017a6d7c1fdda2a5e04137aba93afb0222098197b66fc424c
+  metadata.gz: 5834796db467a574a0ce7f9cb88c6bb1f6995ebb54292d543881c23884de2733ff41a1729fa49e0d40056e89959e49e84e6347bb1ecaaea1ee718f54ad039f3e
+  data.tar.gz: 8ced1573db88a51ded5905888e01bac2a606dbffb1811e2dbd9ea5c230872711febc0867f5ba4380c8fd45d7c51dc9f87c4e5064c9d1c5c10532e38b89e6642c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.3.3)
+    MovableInkAWS (0.3.5)
       aws-sdk (= 2.11.240)
 
 GEM

data/lib/movable_ink/aws/autoscaling.rb

@@ -44,33 +44,59 @@ module MovableInk
         end
       end
 
-      def complete_lifecycle_action(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token:)
-        run_with_backoff do
-          autoscaling.complete_lifecycle_action({
-            lifecycle_hook_name:     lifecycle_hook_name,
-            auto_scaling_group_name: auto_scaling_group_name,
-            lifecycle_action_token:  lifecycle_action_token,
-            lifecycle_action_result: 'CONTINUE'
-          })
+      def complete_lifecycle_action(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token: nil, instance_id: nil)
+        raise ArgumentError.new('lifecycle_action_token or instance_id required') if lifecycle_action_token.nil? && instance_id.nil?
+
+        if lifecycle_action_token
+          run_with_backoff do
+            autoscaling.complete_lifecycle_action({
+              lifecycle_hook_name:     lifecycle_hook_name,
+              auto_scaling_group_name: auto_scaling_group_name,
+              lifecycle_action_token:  lifecycle_action_token,
+              lifecycle_action_result: 'CONTINUE'
+            })
+          end
+        else
+          run_with_backoff do
+            autoscaling.complete_lifecycle_action({
+              instance_id:             instance_id,
+              lifecycle_hook_name:     lifecycle_hook_name,
+              auto_scaling_group_name: auto_scaling_group_name,
+              lifecycle_action_result: 'CONTINUE'
+            })
+          end
         end
       end
 
-      def record_lifecycle_action_heartbeat(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token:)
-        run_with_backoff do
-          autoscaling.record_lifecycle_action_heartbeat({
-            lifecycle_hook_name:     lifecycle_hook_name,
-            auto_scaling_group_name: auto_scaling_group_name,
-            lifecycle_action_token:  lifecycle_action_token
-          })
+      def record_lifecycle_action_heartbeat(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token: nil, instance_id: nil)
+        raise ArgumentError.new('lifecycle_action_token or instance_id required') if lifecycle_action_token.nil? && instance_id.nil?
+
+        if lifecycle_action_token
+          run_with_backoff do
+            autoscaling.record_lifecycle_action_heartbeat({
+              lifecycle_hook_name:     lifecycle_hook_name,
+              auto_scaling_group_name: auto_scaling_group_name,
+              lifecycle_action_token:  lifecycle_action_token
+            })
+          end
+        else
+          run_with_backoff do
+            autoscaling.record_lifecycle_action_heartbeat({
+              instance_id:             instance_id,
+              lifecycle_hook_name:     lifecycle_hook_name,
+              auto_scaling_group_name: auto_scaling_group_name,
+            })
+          end
         end
       end
 
-      def keep_instance_alive(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token:)
+      def keep_instance_alive(lifecycle_hook_name:, auto_scaling_group_name:, lifecycle_action_token: nil, instance_id: nil)
         24.downto(1) do |hours|
           record_lifecycle_action_heartbeat(
             lifecycle_hook_name: lifecycle_hook_name,
             auto_scaling_group_name: auto_scaling_group_name,
-            lifecycle_action_token: lifecycle_action_token
+            lifecycle_action_token: lifecycle_action_token,
+            instance_id: instance_id
           )
           sleep 3600
         end

data/lib/movable_ink/aws/ec2.rb

@@ -11,21 +11,11 @@ module MovableInk
       end
 
       def load_mi_env
-        run_with_backoff(quiet: true) do
-          begin
-            ec2.describe_tags(filters: [
-                  {
-                    name: 'resource-id',
-                    values: [instance_id]
-                  }
-                ])
-              .tags
-              .detect { |tag| tag.key == 'mi:env' }
-              .value
-          rescue NoMethodError
-            raise MovableInk::AWS::Errors::NoEnvironmentTagError
-          end
-        end
+        instance_tags
+          .detect { |tag| tag.key == 'mi:env' }
+          .value
+      rescue NoMethodError
+        raise MovableInk::AWS::Errors::NoEnvironmentTagError
       end
 
       def thopter_filter
@@ -81,6 +71,14 @@ module MovableInk
         end
       end
 
+      def instance_tags
+        @instance_tags ||= run_with_backoff(quiet: true) do
+          ec2.describe_tags({
+            filters: [{ name: 'resource-id', values: [instance_id] } ]
+          }).tags
+        end
+      end
+
       def private_ipv4
         @ipv4 ||= begin
           ipv4 = `ec2metadata --local-ipv4 2>/dev/null`.chomp

data/lib/movable_ink/version.rb

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

data/spec/autoscaling_spec.rb

@@ -10,7 +10,7 @@ describe MovableInk::AWS::Autoscaling do
   let(:create_tags_data) { ec2.stub_data(:create_tags, {}) }
   let(:delete_tags_data) { ec2.stub_data(:delete_tags, {}) }
 
-  it "should mark an instance as unhealthy" do
+  it 'should mark an instance as unhealthy' do
     autoscaling.stub_responses(:set_instance_health, set_instance_health_data)
     allow(aws).to receive(:my_region).and_return('us-east-1')
     allow(aws).to receive(:instance_id).and_return('i-12345')
@@ -37,19 +37,76 @@ describe MovableInk::AWS::Autoscaling do
     expect(aws.delete_role_tag(role: 'some_role')).to eq(Aws::EmptyStructure.new)
   end
 
+  it 'raises an ArgumentError when instance_id and lifecycle_action_token are not provided' do
+    autoscaling.stub_responses(:complete_lifecycle_action, complete_lifecycle_action_data)
+    allow(aws).to receive(:my_region).and_return('us-east-1')
+    allow(aws).to receive(:autoscaling).and_return(autoscaling)
+    expect {
+      aws.complete_lifecycle_action(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group')
+    }.to raise_error(ArgumentError)
+  end
+
   it "should complete lifecycle actions" do
     autoscaling.stub_responses(:complete_lifecycle_action, complete_lifecycle_action_data)
     allow(aws).to receive(:my_region).and_return('us-east-1')
     allow(aws).to receive(:autoscaling).and_return(autoscaling)
 
+    expect(autoscaling).to receive(:complete_lifecycle_action).with({
+      lifecycle_action_result: 'CONTINUE',
+      lifecycle_action_token: 'token',
+      lifecycle_hook_name: 'hook',
+      auto_scaling_group_name: 'group',
+    }).and_call_original
     expect(aws.complete_lifecycle_action(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group', lifecycle_action_token: 'token')).to eq(Aws::EmptyStructure.new)
   end
 
-  it "should record lifecycle action heartbeats" do
+  it 'allows passing the instance_id to complete a lifecycle action' do
+    autoscaling.stub_responses(:complete_lifecycle_action, complete_lifecycle_action_data)
+    allow(aws).to receive(:my_region).and_return('us-east-1')
+    allow(aws).to receive(:autoscaling).and_return(autoscaling)
+
+    expect(autoscaling).to receive(:complete_lifecycle_action).with({
+      lifecycle_action_result: 'CONTINUE',
+      lifecycle_hook_name: 'hook',
+      instance_id: 'i-987654321',
+      auto_scaling_group_name: 'group'
+    }).and_call_original
+    expect(aws.complete_lifecycle_action(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group', instance_id: 'i-987654321')).to eq(Aws::EmptyStructure.new)
+  end
+
+  it 'should record lifecycle action heartbeats' do
     autoscaling.stub_responses(:record_lifecycle_action_heartbeat, record_lifecycle_action_heartbeat_data)
     allow(aws).to receive(:my_region).and_return('us-east-1')
     allow(aws).to receive(:autoscaling).and_return(autoscaling)
 
+    expect(autoscaling).to receive(:record_lifecycle_action_heartbeat).with({
+      lifecycle_action_token: 'token',
+      lifecycle_hook_name: 'hook',
+      auto_scaling_group_name: 'group'
+    }).and_call_original
     expect(aws.record_lifecycle_action_heartbeat(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group', lifecycle_action_token: 'token')).to eq(Aws::EmptyStructure.new)
   end
+
+  it 'allows passing the instance_id to record lifecycle action heartbeats' do
+    autoscaling.stub_responses(:record_lifecycle_action_heartbeat, record_lifecycle_action_heartbeat_data)
+    allow(aws).to receive(:my_region).and_return('us-east-1')
+    allow(aws).to receive(:autoscaling).and_return(autoscaling)
+
+    expect(autoscaling).to receive(:record_lifecycle_action_heartbeat).with({
+      instance_id: 'i-987654321',
+      lifecycle_hook_name: 'hook',
+      auto_scaling_group_name: 'group'
+    }).and_call_original
+    expect(aws.record_lifecycle_action_heartbeat(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group', instance_id: 'i-987654321')).to eq(Aws::EmptyStructure.new)
+  end
+
+  it 'raises an ArgumentError when instance_id and lifecycle_action_token are not provided' do
+    autoscaling.stub_responses(:record_lifecycle_action_heartbeat, record_lifecycle_action_heartbeat_data)
+    allow(aws).to receive(:my_region).and_return('us-east-1')
+    allow(aws).to receive(:autoscaling).and_return(autoscaling)
+
+    expect {
+      aws.record_lifecycle_action_heartbeat(lifecycle_hook_name: 'hook', auto_scaling_group_name: 'group')
+    }.to raise_error(ArgumentError)
+  end
 end

data/spec/ec2_spec.rb

@@ -47,6 +47,16 @@ describe MovableInk::AWS::EC2 do
       expect(aws.private_ipv4).to eq('10.0.0.1')
     end
 
+    context 'instance_tags' do
+      it 'returns the tags of the current instance' do
+        ec2.stub_responses(:describe_tags, tag_data)
+        allow(aws).to receive(:my_region).and_return('us-east-1')
+        allow(aws).to receive(:instance_id).and_return('i-12345')
+        allow(aws).to receive(:ec2).and_return(ec2)
+        expect(aws.instance_tags).to eq(tag_data.tags)
+      end
+    end
+
     context "thopter" do
       let(:thopter_data) { ec2.stub_data(:describe_instances, reservations: [
         instances: [

metadata

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