kitchen-ec2 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1e378058d18afcc07e2f59a986588f9e05887f
-  data.tar.gz: 2e902c288551eab23b6f0ed314dd7616277a13de
+  metadata.gz: 3a4c3c1651c87e7efe1021c8c7f42eea85b1bd50
+  data.tar.gz: 4f9beb18601e10e003b579da74f2920061040543
 SHA512:
-  metadata.gz: ef7beeddeeca20586ef7800e42c841b530f04fc2bc16098e79478e37654770c1bf163ea9a9e3707827d3f060eda2b71886eb50d7b3123740932d060dcac0297f
-  data.tar.gz: 3bd25b6b3654267dfe2262a796659e647749f57fd1095551e414ded3c5fc5f327965eb0f2b719369e290c94536ed5ff6fd2aef265340e84af9927c44495f8253
+  metadata.gz: 0a8da55831097f198d69c3de6c0474cc9a85aedbaf15b96180a198c9ce3455ef5ce8081f75aeecb80a211ca0d2002118f39a1e5b23ae83d3f41aa692d7adcf01
+  data.tar.gz: 5aa911a240efb08e0fce0d17adab20a7851fd8ec4ec1718459739e8ad5a0a264f10e7c4267b1fb0cdbb231d3973aec9b7067570f5364ed3074c7273900b4e8fc

data/.rubocop.yml

@@ -2,6 +2,9 @@ Style/FileName:
   Exclude:
     - 'data/**/*'
 
+Style/Lambda:
+  Enabled: false
+
 Style/Next:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.9.4 / 2015-06-05
+
+### Bug Fixes
+
+* Pull Request [#151][]: Fixing a regression where we are fetching the hostname from an old server object even after waiting for it to update, causing us to get back an invalid hostname
+
+### New Features
+
+### Improvements
+
 ## 0.9.4 / 2015-06-03
 
 ### Bug Fixes
@@ -165,6 +175,7 @@
 [#131]: https://github.com/test-kitchen/kitchen-ec2/issues/131
 [#140]: https://github.com/test-kitchen/kitchen-ec2/issues/140
 [#142]: https://github.com/test-kitchen/kitchen-ec2/issues/142
+[#151]: https://github.com/test-kitchen/kitchen-ec2/issues/151
 [@Atalanta]: https://github.com/Atalanta
 [@Igorshp]: https://github.com/Igorshp
 [@JamesAwesome]: https://github.com/JamesAwesome

data/lib/kitchen/driver/ec2.rb

@@ -201,7 +201,6 @@ module Kitchen
         wait_until_ready(server, state)
 
         info("EC2 instance <#{state[:server_id]}> ready.")
-        state[:hostname] = hostname(server)
         instance.transport.connection(state).wait_until_ready
         create_ec2_json(state)
         debug("ec2:create '#{state[:hostname]}'")
@@ -317,24 +316,34 @@ module Kitchen
       end
 
       def wait_until_ready(server, state)
+        wait_with_destroy(server, state, "to become ready") do |aws_instance|
+          hostname = hostname(aws_instance, config[:interface])
+          # We aggressively store the hostname so if the process fails here
+          # we still have it, even if it will change later
+          state[:hostname] = hostname
+          # Euca instances often report ready before they have an IP
+          aws_instance.exists? &&
+            aws_instance.state.name == "running" &&
+            hostname != "0.0.0.0"
+        end
+      end
+
+      def wait_with_destroy(server, state, status_msg, &block)
         wait_log = proc do |attempts|
           c = attempts * config[:retryable_sleep]
           t = config[:retryable_tries] * config[:retryable_sleep]
-          info "Waited #{c}/#{t}s for instance <#{state[:server_id]}> to become ready."
+          info "Waited #{c}/#{t}s for instance <#{state[:server_id]}> #{status_msg}."
         end
         begin
           server.wait_until(
             :max_attempts => config[:retryable_tries],
             :delay => config[:retryable_sleep],
-            :before_attempt => wait_log
-          ) do |s|
-            hostname = hostname(s, config[:interface])
-            # Euca instances often report ready before they have an IP
-            s.exists? && s.state.name == "running" && !hostname.nil? && hostname != "0.0.0.0"
-          end
+            :before_attempt => wait_log,
+            &block
+          )
         rescue ::Aws::Waiters::Errors::WaiterFailed
           error("Ran out of time waiting for the server with id [#{state[:server_id]}]" \
-            " to become ready, attempting to destroy it")
+            " #{status_msg}, attempting to destroy it")
           destroy(state)
           raise
         end

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "0.9.4"
+    EC2_VERSION = "0.9.5"
   end
 end

data/spec/kitchen/driver/ec2_spec.rb

@@ -38,6 +38,7 @@ describe Kitchen::Driver::Ec2 do
   let(:actual_client) { double("actual ec2 client") }
   let(:client)        { double(Kitchen::Driver::Aws::Client, :client => actual_client) }
   let(:server) { double("aws server object") }
+  let(:state) { {} }
 
   let(:driver) { Kitchen::Driver::Ec2.new(config) }
 
@@ -223,9 +224,83 @@ describe Kitchen::Driver::Ec2 do
     end
   end
 
+  describe "#wait_until_ready" do
+    let(:hostname) { "0.0.0.0" }
+    let(:msg) { "to become ready" }
+    let(:aws_instance) { double("aws instance") }
+
+    before do
+      config[:interface] = :i
+      expect(driver).to receive(:wait_with_destroy).with(server, state, msg).and_yield(aws_instance)
+      expect(driver).to receive(:hostname).with(aws_instance, :i).and_return(hostname)
+    end
+
+    after do
+      expect(state[:hostname]).to eq(hostname)
+    end
+
+    it "first checks instance existence" do
+      expect(aws_instance).to receive(:exists?).and_return(false)
+      expect(driver.wait_until_ready(server, state)).to eq(false)
+    end
+
+    it "second checks instance state" do
+      expect(aws_instance).to receive(:exists?).and_return(true)
+      expect(aws_instance).to receive_message_chain("state.name").and_return("nope")
+      expect(driver.wait_until_ready(server, state)).to eq(false)
+    end
+
+    it "third checks hostname" do
+      expect(aws_instance).to receive(:exists?).and_return(true)
+      expect(aws_instance).to receive_message_chain("state.name").and_return("running")
+      expect(driver.wait_until_ready(server, state)).to eq(false)
+    end
+
+    context "when it exists, has a valid state and a valid hostname" do
+      let(:hostname) { "host" }
+
+      it "returns true" do
+        expect(aws_instance).to receive(:exists?).and_return(true)
+        expect(aws_instance).to receive_message_chain("state.name").and_return("running")
+        expect(driver.wait_until_ready(server, state)).to eq(true)
+      end
+    end
+  end
+
+  describe "#wait_with_destroy" do
+    let(:tries) { 111 }
+    let(:sleep) { 222 }
+    let(:msg) { "msg" }
+    given_block = lambda do; end
+
+    before do
+      config[:retryable_sleep] = sleep
+      config[:retryable_tries] = tries
+    end
+
+    it "calls wait and exits successfully if there is no error" do
+      expect(server).to receive(:wait_until) do |args, &block|
+        expect(args[:max_attempts]).to eq(tries)
+        expect(args[:delay]).to eq(sleep)
+        expect(block).to eq(given_block)
+        expect(driver).to receive(:info).with(/#{msg}/)
+        args[:before_attempt].call(0)
+      end
+      driver.wait_with_destroy(server, state, msg, &given_block)
+    end
+
+    it "attempts to destroy the instance if the waiter fails" do
+      expect(server).to receive(:wait_until).and_raise(::Aws::Waiters::Errors::WaiterFailed)
+      expect(driver).to receive(:destroy).with(state)
+      expect(driver).to receive(:error).with(/#{msg}/)
+      expect {
+        driver.wait_with_destroy(server, state, msg, &given_block)
+      }.to raise_error(::Aws::Waiters::Errors::WaiterFailed)
+    end
+  end
+
   describe "#destroy" do
     context "when state[:server_id] is nil" do
-      let(:state) { {} }
       it "returns nil" do
         expect(driver.destroy(state)).to eq(nil)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen