kitchen-ec2 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b62273c1ee5fb17313f193f401ddef8298c801
-  data.tar.gz: fd9d69df55c2f0e669e00cf41b050ac41b2f8492
+  metadata.gz: 21b2743d4aad92b8fb4f5d02d3619c0b1b83c6eb
+  data.tar.gz: 6dc57776d894c34fad0da0701e4c6d4a59076698
 SHA512:
-  metadata.gz: 6962df92e7ffd49fb287f84d325950484729e777bc54c90380fd8e699caa273631e8003ca597de9cb274020519f187d65c23e916eaa3f2be9a0c8cb34774d7dd
-  data.tar.gz: 47489808c46515f9e0541e7fe060b90bf7f94012398765d49ad20037c9eca1dc2e61b18bed6badf2cbf2434cb0d5a3c036a50e738f90f497dbf175ef3463ffb0
+  metadata.gz: 3358dc9d1df3053b5f6efaf4f4ec2673f46eb3b81a1b81d080a22f92203bf851abe1133429a16dd5d78adf0ca1cf5d62298c632b011b58d1ce3d9651e4dcc950
+  data.tar.gz: 430c0e2766480db4d1053afa73f2b609d9379e283d139fe2e6a36cfbf9f21e386ab0853ec26b417ec5fcfda6e640775b0b31a5af5c80c6f58961d4457498bd62

data/.cane

@@ -1,2 +1,2 @@
---abc-max 30
+--abc-max 40
 --style-measure 100

data/CHANGELOG.md

@@ -1,8 +1,18 @@
-## 0.9.2 / 2015-05-26
+## 0.9.3 / 2015-05-29
 
 ### Bug Fixes
 
-* Pull Request [#131][]: Adding back support for a proxy via config `http_proxy` which defaults to `ENV['HTTP_PROXY']`
+* Pull Request [#140][]: Wait for an instance to pass existence check before tagging it
+
+### New Features
+
+### Improvements
+
+## 0.9.2 / 2015-05-27
+
+### Bug Fixes
+
+* Pull Request [#131][]: Adding back support for a proxy via config `http_proxy` which defaults to `ENV[‘HTTPS_PROXY’] || ENV['HTTP_PROXY']`
 * Pull Request [#128][]: 
     * Fixes [#121][]: Fixing error `Network interfaces and an instance-level security groups may not be specified on the same request` 
     * Fixes [#127][]: User Data content should be base64 encoded when passed to aws sdk 
@@ -143,6 +153,7 @@
 [#127]: https://github.com/test-kitchen/kitchen-ec2/issues/127
 [#128]: https://github.com/test-kitchen/kitchen-ec2/issues/128
 [#131]: https://github.com/test-kitchen/kitchen-ec2/issues/131
+[#140]: https://github.com/test-kitchen/kitchen-ec2/issues/140
 [@Atalanta]: https://github.com/Atalanta
 [@Igorshp]: https://github.com/Igorshp
 [@JamesAwesome]: https://github.com/JamesAwesome

data/lib/kitchen/driver/ec2.rb

@@ -188,6 +188,10 @@ module Kitchen
           server = submit_server
         end
         info("Instance <#{server.id}> requested.")
+        ec2.client.wait_until(
+          :instance_exists,
+          :instance_ids => [server.id]
+        )
         tag_server(server)
 
         state[:server_id] = server.id
@@ -234,6 +238,7 @@ module Kitchen
           ec2.client.cancel_spot_instance_requests(
             :spot_instance_request_ids => [state[:spot_request_id]]
           )
+          state.delete(:spot_request_id)
         end
         info("EC2 instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)

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.2"
+    EC2_VERSION = "0.9.3"
   end
 end

data/spec/kitchen/driver/ec2_spec.rb

@@ -32,6 +32,12 @@ describe Kitchen::Driver::Ec2 do
   let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
   let(:transport)     { Kitchen::Transport::Dummy.new }
   let(:state_file)    { double("state_file") }
+  let(:generator)     { instance_double(Kitchen::Driver::Aws::InstanceGenerator) }
+  # There is too much name overlap I let creep in - my `client` is actually
+  # a wrapper around the actual ec2 client
+  let(:actual_client) { double("actual ec2 client") }
+  let(:client)        { double(Kitchen::Driver::Aws::Client, :client => actual_client) }
+  let(:server) { double("aws server object") }
 
   let(:driver) { Kitchen::Driver::Ec2.new(config) }
 
@@ -48,6 +54,11 @@ describe Kitchen::Driver::Ec2 do
     )
   end
 
+  before do
+    allow(Kitchen::Driver::Aws::InstanceGenerator).to receive(:new).and_return(generator)
+    allow(Kitchen::Driver::Aws::Client).to receive(:new).and_return(client)
+  end
+
   it "driver api_version is 2" do
     expect(driver.diagnose_plugin[:api_version]).to eq(2)
   end
@@ -159,4 +170,87 @@ describe Kitchen::Driver::Ec2 do
     end
   end
 
+  describe "#submit_server" do
+    it "submits the server request" do
+      expect(generator).to receive(:ec2_instance_data).and_return({})
+      expect(client).to receive(:create_instance).with(:min_count => 1, :max_count => 1)
+      driver.submit_server
+    end
+  end
+
+  describe "#submit_spot" do
+    let(:state) { {} }
+    let(:response) {
+      { :spot_instance_requests => [{ :spot_instance_request_id => "id" }] }
+    }
+
+    it "submits the server request" do
+      expect(generator).to receive(:ec2_instance_data).and_return({})
+      expect(actual_client).to receive(:request_spot_instances).with(
+        :spot_price => "", :launch_specification => {}
+      ).and_return(response)
+      expect(actual_client).to receive(:wait_until)
+      expect(client).to receive(:get_instance_from_spot_request).with("id")
+      driver.submit_spot(state)
+      expect(state).to eq(:spot_request_id => "id")
+    end
+  end
+
+  describe "#tag_server" do
+    it "tags the server" do
+      config[:tags] = { :key1 => :value1, :key2 => :value2 }
+      expect(server).to receive(:create_tags).with(
+        :tags => [
+          { :key => :key1, :value => :value1 },
+          { :key => :key2, :value => :value2 }
+        ]
+      )
+      driver.tag_server(server)
+    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
+    end
+
+    context "when state has a normal server_id" do
+      let(:state) { { :server_id => "id", :hostname => "name" } }
+
+      context "the server is already destroyed" do
+        it "does nothing" do
+          expect(client).to receive(:get_instance).with("id").and_return nil
+          driver.destroy(state)
+          expect(state).to eq({})
+        end
+      end
+
+      it "destroys the server" do
+        expect(client).to receive(:get_instance).with("id").and_return(server)
+        expect(instance).to receive_message_chain("transport.connection.close")
+        expect(server).to receive(:terminate)
+        driver.destroy(state)
+        expect(state).to eq({})
+      end
+    end
+
+    context "when state has a spot request" do
+      let(:state) { { :server_id => "id", :hostname => "name", :spot_request_id => "spot" } }
+
+      it "destroys the server" do
+        expect(client).to receive(:get_instance).with("id").and_return(server)
+        expect(instance).to receive_message_chain("transport.connection.close")
+        expect(server).to receive(:terminate)
+        expect(actual_client).to receive(:cancel_spot_instance_requests).with(
+          :spot_instance_request_ids => ["spot"]
+        )
+        driver.destroy(state)
+        expect(state).to eq({})
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen